Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-02 | 1 | -1/+1 |
| | |||||
* | Merge pull request #10104 from owncloud/s3-overwrite | Lukas Reschke | 2014-10-01 | 2 | -43/+52 |
|\ | | | | | Fix S3 copy and rename overwriting target directory | ||||
| * | Skip test for unsuported feature for amazon s3 | Robin Appelman | 2014-09-17 | 1 | -0/+4 |
| | | |||||
| * | Fix copy overwrite for amazon s3 | Robin Appelman | 2014-09-17 | 1 | -12/+4 |
| | | |||||
| * | Fix amazon s3 rename overwrite | Robin Appelman | 2014-09-17 | 1 | -2/+10 |
| | | |||||
| * | Fix AmazonS3 rmdir on the root | Robin Appelman | 2014-09-17 | 2 | -38/+43 |
| | | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-10-01 | 2 | -0/+3 |
| | | |||||
* | | Use SVG previews for public sharing | Lukas Reschke | 2014-09-30 | 2 | -23/+31 |
| | | | | | | | | Fixes https://github.com/owncloud/core/pull/11367#issuecomment-57306037 and https://github.com/owncloud/core/issues/9218 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-30 | 3 | -0/+14 |
| | | |||||
* | | Merge pull request #11337 from danbartram/better_encryption_recovery_labels | Lukas Reschke | 2014-09-29 | 2 | -4/+8 |
|\ \ | | | | | | | Add clickable labels to encryption recovery radios | ||||
| * | | Add clickable labels to encryption recovery radios | Dan Bartram | 2014-09-27 | 2 | -4/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add clickable radio button labels to the encryption recovery settings pages: * settings-admin * settings-personal Pressing on the radio button text now toggles the state of the radio button. | ||||
* | | | Merge pull request #11347 from mark0n/create_empty_config | Lukas Reschke | 2014-09-29 | 2 | -0/+52 |
|\ \ \ | | | | | | | | | Add a CLI command that creates an empty LDAP config | ||||
| * | | | Add a CLI command that creates an empty LDAP config | Martin Konrad | 2014-09-29 | 2 | -0/+52 |
| | | | | | | | | | | | | | | | | | | | | This is needed to configure the user_ldap app without using the wizard (e.g. using tools like Puppet). | ||||
* | | | | Merge pull request #10107 from owncloud/sharing_group_shares | Lukas Reschke | 2014-09-29 | 8 | -48/+243 |
|\ \ \ \ | | | | | | | | | | | [sharing] group shares | ||||
| * | | | | some small fixed, suggested by scrutinizer | Bjoern Schiessle | 2014-09-29 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | throw a exception if we can't handle the provided path | Bjoern Schiessle | 2014-09-29 | 4 | -3/+75 |
| | | | | | |||||
| * | | | | call \OCP\Share::getItemsSharedWithUser() to get exclude list, this way all ↵ | Bjoern Schiessle | 2014-09-25 | 2 | -6/+61 |
| | | | | | | | | | | | | | | | | | | | | checks are executed, e.g. to check if the share is really visible | ||||
| * | | | | some small fixes | Bjoern Schiessle | 2014-09-25 | 2 | -4/+4 |
| | | | | | |||||
| * | | | | clear share table after each test run | Bjoern Schiessle | 2014-09-24 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | unit tests for grouping of shares pointing to the same source | Bjoern Schiessle | 2014-09-22 | 2 | -35/+74 |
| | | | | | |||||
| * | | | | group shares and combine permissions | Bjoern Schiessle | 2014-09-22 | 3 | -3/+29 |
| | | | | | |||||
* | | | | | Merge pull request #11321 from owncloud/ldap-fix-memberof-detection | Lukas Reschke | 2014-09-29 | 1 | -2/+4 |
|\ \ \ \ \ | | | | | | | | | | | | | dn needs to be fetched to be able to detect memberOf support | ||||
| * | | | | | dn needs to be fetched to be able to detect memberOf support | Arthur Schiwon | 2014-09-26 | 1 | -2/+4 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-29 | 3 | -0/+6 |
| |_|/ / / |/| | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-28 | 6 | -5/+36 |
| |_|/ / |/| | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-27 | 3 | -0/+3 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-26 | 3 | -0/+3 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-25 | 16 | -4/+43 |
| | | | |||||
* | | | Show a proper error message when trying to scan the filesystem for a non ↵ | Robin Appelman | 2014-09-24 | 1 | -1/+5 |
| | | | | | | | | | | | | existing user | ||||
* | | | Check for blacklisted characters | Lukas Reschke | 2014-09-23 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/11264 (This should in future get moved to the mountpoint class - but that is something for @icewind1991 ;-)) | ||||
* | | | Merge pull request #11109 from owncloud/nstamm-patch-1 | Jan-Christoph Borchardt | 2014-09-23 | 1 | -1/+8 |
|\ \ \ | | | | | | | | | DragnDrop Upload text style | ||||
| * | | | adjust text size and opacity of drag'n'drop upload text style | Jan-Christoph Borchardt | 2014-09-23 | 1 | -0/+4 |
| | | | | |||||
| * | | | DragnDrop Upload text style | Nicolas Stamm | 2014-09-16 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | The 8px margin was uggly. | ||||
* | | | | Merge pull request #11234 from owncloud/fix-icon-classes | Jan-Christoph Borchardt | 2014-09-23 | 6 | -11/+20 |
|\ \ \ \ | | | | | | | | | | | Fix icon classes, disappeared delete icon | ||||
| * | | | | force show the loading icon in list for deletion, not only on hover | Jan-Christoph Borchardt | 2014-09-22 | 1 | -0/+9 |
| | | | | | |||||
| * | | | | correct progress-icon to icon-loading-small | Jan-Christoph Borchardt | 2014-09-22 | 4 | -10/+10 |
| | | | | | |||||
| * | | | | correct delete-icon to icon-delete, fix #11128 | Jan-Christoph Borchardt | 2014-09-22 | 5 | -11/+11 |
| | | | | | |||||
* | | | | | Merge pull request #11137 from owncloud/enc-pregfix | Vincent Petry | 2014-09-23 | 10 | -113/+384 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix share key pattern matching | ||||
| * | | | | | Fix share key finding algorithm in various cases | Vincent Petry | 2014-09-23 | 10 | -113/+384 |
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of inaccurate pattern matching, use the list of users who we know have access to the file to build the list of share keys. This covers the following cases: - Move/copy files into a subfolder within a share - Unsharing from a user - Deleting files directlry / moving share keys to trashbin | ||||
* | | | | | Merge pull request #11032 from owncloud/harden-redirect | Lukas Reschke | 2014-09-23 | 1 | -2/+7 |
|\ \ \ \ \ | | | | | | | | | | | | | Do only follow HTTP and HTTPS redirects | ||||
| * | | | | | Do only follow HTTP and HTTPS redirects | Lukas Reschke | 2014-09-22 | 1 | -2/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not want to follow redirects to other protocols since they might allow an adversary to bypass network restrictions. (i.e. a redirect to ftp:// might be used to access files of a FTP server which might be in a secure zone and not be reachable from the net but from the ownCloud server) Get final redirect manually using get_headers() Migrate to HTTPHelper class and add unit tests | ||||
* | | | | | | Merge pull request #11224 from owncloud/fix_recovery_admin_user | Lukas Reschke | 2014-09-23 | 1 | -5/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | first check if a private key exists, if not it is always a recovery szenario | ||||
| * | | | | | | first check if a private key exists, if not it is always a recovery szenario | Bjoern Schiessle | 2014-09-22 | 1 | -5/+4 |
| | | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-09-23 | 3 | -0/+3 |
| |_|_|/ / / |/| | | | | | |||||
* | | | | | | Merge pull request #11186 from owncloud/trash-fixdoubledeleteracecondition | Vincent Petry | 2014-09-22 | 1 | -0/+26 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Added extra check to avoid deleting key folders | ||||
| * | | | | | Added extra check to avoid deleting key folders | Vincent Petry | 2014-09-19 | 1 | -0/+26 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever a delete operation is called twice in a row, it could happen that the first call already deleted the file. The second call would return an empty $ownerPath because the file does not exist. That empty $ownerPath would run the key deletion operation on the wrong path. This fix adds checks in many places to make sure we don't use $ownerPath when it's empty or null. | ||||
* | | | | | | Merge pull request #11167 from owncloud/env-movetomountreenableproxy | Morris Jobke | 2014-09-22 | 1 | -0/+1 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | Reenable file proxy when renaming between mount points | ||||
| * | | | | | Reenable file proxy when renaming between mount points | Vincent Petry | 2014-09-18 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When moving a folder into another mount point, $renamedFiles is empty because that goes over a different mechanism. In such case, this fix makes sure that the file proxy is reenable to avoid breaking the subsequent files that are being moved. | ||||
* | | | | | | fix button text l10n | Volkan Gezer | 2014-09-22 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | files_sharing: add route for ajax/publicpreview | Georg Ehrke | 2014-09-21 | 1 | -0/+2 |
| | | | | | |