| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #255 from nextcloud/dav-permission-check | Björn Schießle | 2016-06-30 | 4 | -3/+96 |
| |\ | | | | | add some additonal permission checks to the webdav backend | ||||
| | * | fix error message | Bjoern Schiessle | 2016-06-30 | 1 | -1/+1 |
| | | | |||||
| | * | Fix tests | Lukas Reschke | 2016-06-30 | 1 | -0/+20 |
| | | | |||||
| | * | Add proper throws PHP docs | Lukas Reschke | 2016-06-30 | 1 | -2/+13 |
| | | | |||||
| | * | Add required $message parameter | Lukas Reschke | 2016-06-30 | 1 | -2/+2 |
| | | | |||||
| | * | Add integration tests | Lukas Reschke | 2016-06-30 | 2 | -0/+47 |
| | | | |||||
| | * | add some additonal permission checks to the webdav backend | Bjoern Schiessle | 2016-06-30 | 1 | -1/+16 |
| | | | |||||
| * | | Merge pull request #258 from nextcloud/set-disposition | Marius Blüm | 2016-06-30 | 2 | -2/+7 |
| |\ \ | | | | | | | Set content-type to "application/octet-stream" | ||||
| | * | | Set content-type to "application/octet-stream" | Lukas Reschke | 2016-06-30 | 2 | -2/+7 |
| | |/ | | | | | | | Some browsers such as Firefox on Microsoft Windows otherwise do offer to open the file directly which is kinda silly. | ||||
| * | | Merge pull request #253 from nextcloud/fix-versions | Morris Jobke | 2016-06-30 | 1 | -5/+11 |
| |\ \ | |/ |/| | check permissions before rollback | ||||
| | * | check permissions before rollback | Bjoern Schiessle | 2016-06-30 | 1 | -5/+11 |
| |/ | |||||
| * | Merge pull request #247 from nextcloud/l10n-fixes | Morris Jobke | 2016-06-30 | 1 | -1/+3 |
| |\ | | | | | Fix update notification text | ||||
| | * | Fix update notification text | Morris Jobke | 2016-06-29 | 1 | -1/+3 |
| | | | | | | | | | * thanks to ungesundes_halbwissen @ transifex | ||||
| * | | Merge pull request #206 from nextcloud/ci-mysql | Morris Jobke | 2016-06-30 | 4 | -6/+32 |
| |\ \ | | | | | | | Add mysql job to CI | ||||
| | * | | mysql only works with 3 byte UTF-8 | Morris Jobke | 2016-06-29 | 2 | -1/+9 |
| | | | | |||||
| | * | | fix mysql error handling | Morris Jobke | 2016-06-23 | 2 | -1/+1 |
| | | | | |||||
| | * | | Add mysql job to CI | Morris Jobke | 2016-06-23 | 2 | -6/+24 |
| | | | | |||||
| * | | | Merge pull request #248 from nextcloud/tx-fixes | Morris Jobke | 2016-06-29 | 1 | -16/+15 |
| |\ \ \ | | | | | | | | | Update transifex config | ||||
| | * | | | Update transifex config | Morris Jobke | 2016-06-29 | 1 | -16/+15 |
| | | |/ | |/| | |||||
| * | | | Merge pull request #245 from nextcloud/fix-243 | Morris Jobke | 2016-06-29 | 1 | -1/+1 |
| |\ \ \ | |/ / |/| | | targets 3rdparty submodule from Nc instead of oC | ||||
| | * | | targets 3rdparty submodule from Nc instead of oC | Vincent Chan | 2016-06-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #242 from nextcloud/fix-229 | Morris Jobke | 2016-06-29 | 2 | -1/+6 |
| |\ \ \ | |/ / |/| | | get only vcard which match both the address book id and the vcard uri | ||||
| | * | | get only vcard which match both the address book id and the vcard uri | Bjoern Schiessle | 2016-06-28 | 2 | -1/+6 |
| |/ / | |||||
| * | | Merge pull request #236 from nextcloud/master-sync-upstream | Morris Jobke | 2016-06-28 | 42 | -252/+387 |
| |\ \ | | | | | | | [Master] sync upstream | ||||
| | * \ | Merge remote-tracking branch 'upstream/master' into master-sync-upstream | Lukas Reschke | 2016-06-27 | 42 | -252/+387 |
| | |\ \ | |||||
| | | * \ | Merge pull request #25273 from owncloud/ext-fixsessioncredentialsnolazyload | Vincent Petry | 2016-06-27 | 1 | -0/+4 |
| | | |\ \ | | | | | | | | | | | Quickfix: do not lazy load auth mechanisms for ext storages | ||||
| | | | * | | Quickfix: do not lazy load auth mechanisms for ext storages | Vincent Petry | 2016-06-27 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some auth mechanisms like SessionCredentials need to register hooks early, so they cannot be lazy loaded. | ||||
| | | * | | | Merge pull request #25237 from owncloud/search-filelistnextpageresults | Vincent Petry | 2016-06-27 | 2 | -4/+29 |
| | | |\ \ \ | | | | | | | | | | | | | Prerender file list pages to include search results | ||||
| | | | * | | | Prerender file list pages to include search results | Vincent Petry | 2016-06-24 | 2 | -4/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When filtering the file list, if a result is on an unrendered page, make sure to call _nextPage() to prerender the pages in order to display all matching results. | ||||
| | | * | | | | Merge pull request #25261 from owncloud/app-password-login-name | Vincent Petry | 2016-06-27 | 4 | -2/+28 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | show which login name to use for the new app password | ||||
| | | | * | | | | fix layout | Christoph Wurst | 2016-06-24 | 3 | -6/+24 |
| | | | | | | | | |||||
| | | | * | | | | show which login name to use for the new app password | Christoph Wurst | 2016-06-24 | 3 | -0/+8 |
| | | | |/ / / | |||||
| | | * | | | | Merge pull request #25263 from ↵ | Christoph Wurst | 2016-06-27 | 1 | -0/+3 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/decryptall-keepencryptionenabledforsingleuser Keep encryption enabled if decrypting for single user | ||||
| | | | * | | | | Keep encryption enabled if decrypting for single user | Vincent Petry | 2016-06-24 | 1 | -0/+3 |
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When decrypting all files of a single user, the admin usually does not intend encryption to be suddenly disabled for everyone. This fix reenables encryption after decrypting for a single user. Decrypting for all users will still disable encryption globally. | ||||
| | | * | | | | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadperms | Vincent Petry | 2016-06-27 | 10 | -45/+214 |
| | | |\ \ \ \ | | | | | | | | | | | | | | | Add explicit delete permission to link shares | ||||
| | | | * | | | | Repair step to adjust link share delete permissions | Vincent Petry | 2016-06-24 | 3 | -1/+111 |
| | | | | | | | | |||||
| | | | * | | | | Add explicit delete permission to link shares | Vincent Petry | 2016-06-24 | 7 | -44/+103 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link shares always allowed deletion, however internally the permissions were stored as 7 which lacked delete permissions. This created an inconsistency in the Webdav permissions. This fix makes sure we include delete permissions in the share permissions, which now become 15. In case a client is still passing 7 for legacy reasons, it gets converted automatically to 15. | ||||
| | | * | | | | | Merge pull request #25258 from owncloud/integritycheck-whennotinstalled | Vincent Petry | 2016-06-27 | 1 | -3/+12 |
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | Make code integrity check work when OC is not installed yet | ||||
| | | | * | | | | | Make code integrity check work when OC is not installed yet | Vincent Petry | 2016-06-24 | 1 | -3/+12 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge pull request #25252 from owncloud/authtoken-removetooltipondisconnect | Morris Jobke | 2016-06-27 | 1 | -0/+2 |
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Remove tooltip when disconnecting token | ||||
| | | | * | | | | | | Remove tooltip when disconnecting token | Vincent Petry | 2016-06-23 | 1 | -0/+2 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge pull request #25129 from owncloud/remove-ie | Vincent Petry | 2016-06-27 | 10 | -203/+11 |
| | | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | | | Remove ie8+9 support | ||||
| | | | * | | | | | | remove ie8+9 support | Hendrik Leppelsack | 2016-06-23 | 10 | -203/+11 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Merge pull request #25247 from owncloud/fed-unshare-fail | Vincent Petry | 2016-06-27 | 1 | -2/+2 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove a fed share from the local table before trying to notify the remote server | ||||
| | | | * | | | | | | | Remove a fed share from the local table before trying to notify the remote ↵ | Robin Appelman | 2016-06-23 | 1 | -2/+2 |
| | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | server | ||||
| | | * | | | | | | | Merge pull request #25251 from owncloud/authtoken-assetpipelinefix | Vincent Petry | 2016-06-27 | 3 | -11/+11 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Use OC.Backbone instead of Backbone directly in authtoken JS code | ||||
| | | | * | | | | | | | Use OC.Backbone instead of Backbone directly in authtoken JS code | Vincent Petry | 2016-06-23 | 3 | -11/+11 |
| | | | | |/ / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | Fixes asset pipeline issue with the auth token in personal page | ||||
| | | * | | | | | | | Merge pull request #25154 from owncloud/token-login-check-loginname | Vincent Petry | 2016-06-27 | 2 | -2/+41 |
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | check login name when authenticating via token and basic auth | ||||
| | | | * | | | | | | | check login name when authenticating with client token | Christoph Wurst | 2016-06-24 | 2 | -2/+41 |
| | | | | |_|_|_|/ / | | | |/| | | | | | |||||
| | | * | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-27 | 10 | -0/+32 |
| | | | | | | | | | | |||||
 |
index : nextcloud-server.git | |
| Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server | www-data |
| summaryrefslogtreecommitdiffstats |