Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #25262 from owncloud/fed-sharing-error | Vincent Petry | 2016-07-01 | 3 | -28/+93 |
|\ | | | | | Only save federated share after remote server is notified | ||||
| * | Log reason why we removed the fed share | Robin Appelman | 2016-06-27 | 1 | -0/+1 |
| | | |||||
| * | Handle exceptions thrown while trying to notify remote server of a fed share | Robin Appelman | 2016-06-27 | 2 | -27/+91 |
| | | |||||
| * | better detect errors in fed sharing response | Robin Appelman | 2016-06-24 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #25276 from owncloud/delete-own-session-token | Vincent Petry | 2016-07-01 | 3 | -12/+70 |
|\ \ | | | | | | | prevent users from deleting their own session token | ||||
| * | | prevent users from deleting their own session token | Christoph Wurst | 2016-06-28 | 3 | -12/+70 |
| | | | |||||
* | | | Add all properties while creating a subscription (#25318) | Thomas Citharel | 2016-07-01 | 2 | -11/+22 |
| | | | | | | | | | Fixes #24469 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-07-01 | 8 | -0/+126 |
| | | | |||||
* | | | Merge pull request #25304 from owncloud/local-karma | Vincent Petry | 2016-06-30 | 1 | -13/+1 |
|\ \ \ | | | | | | | | | Always use local karma | ||||
| * | | | always use local karma | Hendrik Leppelsack | 2016-06-29 | 1 | -13/+1 |
| | | | | |||||
* | | | | Merge pull request #25310 from owncloud/search-preventinfiniteloop | Vincent Petry | 2016-06-30 | 1 | -2/+5 |
|\ \ \ \ | | | | | | | | | | | Prevent infinite loop in search auto-nextpage | ||||
| * | | | | Prevent infinite loop in search auto-nextpage | Vincent Petry | 2016-06-30 | 1 | -2/+5 |
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When loading the next page of search results, make sure that the loop can end if there are no more elements in case the total doesn't match. Also added a check to avoid recomputing the search results whenever the setFilter() is called with the same value. This happens when navigating away to another folder, the search field gets cleared automatically and it calls FileList.setFilter(''). | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-30 | 8 | -2/+32 |
| | | | | |||||
* | | | | fix version stringv9.1.0RC1 | Daniel Molkentin | 2016-06-29 | 1 | -1/+1 |
| | | | | |||||
* | | | | 9.1.0 RC 1 | Daniel Molkentin | 2016-06-29 | 1 | -2/+2 |
| | | | | |||||
* | | | | Various database migration fixes (#25209) | Thomas Müller | 2016-06-29 | 12 | -4/+1692 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * String columns with a length higher then 4000 are converted into a CLOB columns automagically - we have to respect this when migrating * Adding schema migration tests to prevent unnecessary and non-sense migration steps Fix Oracle autoincrement and unsigned handling * Fix sqlite integer type for autoincrement * Use lower case table names - fixes pg * Fix postgres with default -1 - this only affect pg 9.4 servers - 9.5 seems to work fine | ||||
* | | | | Merge pull request #25288 from owncloud/fix-versionrevertperms | Vincent Petry | 2016-06-29 | 4 | -2/+78 |
|\ \ \ \ | | | | | | | | | | | Hide revert button when no permission to revert | ||||
| * | | | | Hide revert button when no permission to revert | Vincent Petry | 2016-06-28 | 4 | -2/+78 |
| | |/ / | |/| | | |||||
* | | | | get only vcards which match both the address book id and the vcard uri (#25294) | Björn Schießle | 2016-06-29 | 2 | -1/+5 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-29 | 44 | -10/+486 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-06-28 | 148 | -138/+686 |
| | | | |||||
* | | | Fix getting the certificate bundle for dav external storage (#25274) | Robin Appelman | 2016-06-27 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | | * Fix getting the certificate bundle for dav external storages * Log the original exception in dav external storage | ||||
* | | | Login hooks (#25260) | Christoph Wurst | 2016-06-27 | 2 | -41/+65 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix login hooks * adjust user session tests * fix login return value of successful token logins * trigger preLogin hook earlier; extract method 'loginWithPassword' * call postLogin hook earlier; add PHPDoc | ||||
* | | | handle unavailable fed shares while testing for availability (#25277) | Robin Appelman | 2016-06-27 | 2 | -5/+20 |
| | | | | | | | | | | | | | | | | | | * More explicit http status codes * handle unavailable fed shares while testing for availability | ||||
* | | | fix a ImageExportPlugin Test (#25215) | Georg Ehrke | 2016-06-27 | 2 | -8/+15 |
| | | | |||||
* | | | 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 |
| | | | | | |