summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #25262 from owncloud/fed-sharing-errorVincent Petry2016-07-013-28/+93
|\ | | | | Only save federated share after remote server is notified
| * Log reason why we removed the fed shareRobin Appelman2016-06-271-0/+1
| |
| * Handle exceptions thrown while trying to notify remote server of a fed shareRobin Appelman2016-06-272-27/+91
| |
| * better detect errors in fed sharing responseRobin Appelman2016-06-241-1/+1
| |
* | Merge pull request #25276 from owncloud/delete-own-session-tokenVincent Petry2016-07-013-12/+70
|\ \ | | | | | | prevent users from deleting their own session token
| * | prevent users from deleting their own session tokenChristoph Wurst2016-06-283-12/+70
| | |
* | | Add all properties while creating a subscription (#25318)Thomas Citharel2016-07-012-11/+22
| | | | | | | | | Fixes #24469
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-018-0/+126
| | |
* | | Merge pull request #25304 from owncloud/local-karmaVincent Petry2016-06-301-13/+1
|\ \ \ | | | | | | | | Always use local karma
| * | | always use local karmaHendrik Leppelsack2016-06-291-13/+1
| | | |
* | | | Merge pull request #25310 from owncloud/search-preventinfiniteloopVincent Petry2016-06-301-2/+5
|\ \ \ \ | | | | | | | | | | Prevent infinite loop in search auto-nextpage
| * | | | Prevent infinite loop in search auto-nextpageVincent Petry2016-06-301-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 transifexJenkins for ownCloud2016-06-308-2/+32
| | | |
* | | | fix version stringv9.1.0RC1Daniel Molkentin2016-06-291-1/+1
| | | |
* | | | 9.1.0 RC 1Daniel Molkentin2016-06-291-2/+2
| | | |
* | | | Various database migration fixes (#25209)Thomas Müller2016-06-2912-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-versionrevertpermsVincent Petry2016-06-294-2/+78
|\ \ \ \ | | | | | | | | | | Hide revert button when no permission to revert
| * | | | Hide revert button when no permission to revertVincent Petry2016-06-284-2/+78
| | |/ / | |/| |
* | | | get only vcards which match both the address book id and the vcard uri (#25294)Björn Schießle2016-06-292-1/+5
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2944-10/+486
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-28148-138/+686
| | |
* | | Fix getting the certificate bundle for dav external storage (#25274)Robin Appelman2016-06-272-2/+7
| | | | | | | | | | | | | | | | | | * Fix getting the certificate bundle for dav external storages * Log the original exception in dav external storage
* | | Login hooks (#25260)Christoph Wurst2016-06-272-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 Appelman2016-06-272-5/+20
| | | | | | | | | | | | | | | | | | * More explicit http status codes * handle unavailable fed shares while testing for availability
* | | fix a ImageExportPlugin Test (#25215)Georg Ehrke2016-06-272-8/+15
| | |
* | | Merge pull request #25273 from owncloud/ext-fixsessioncredentialsnolazyloadVincent Petry2016-06-271-0/+4
|\ \ \ | | | | | | | | Quickfix: do not lazy load auth mechanisms for ext storages
| * | | Quickfix: do not lazy load auth mechanisms for ext storagesVincent Petry2016-06-271-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-filelistnextpageresultsVincent Petry2016-06-272-4/+29
|\ \ \ \ | | | | | | | | | | Prerender file list pages to include search results
| * | | | Prerender file list pages to include search resultsVincent Petry2016-06-242-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-nameVincent Petry2016-06-274-2/+28
|\ \ \ \ | | | | | | | | | | show which login name to use for the new app password
| * | | | fix layoutChristoph Wurst2016-06-243-6/+24
| | | | |
| * | | | show which login name to use for the new app passwordChristoph Wurst2016-06-243-0/+8
| |/ / /
* | | | Merge pull request #25263 from ↵Christoph Wurst2016-06-271-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/decryptall-keepencryptionenabledforsingleuser Keep encryption enabled if decrypting for single user
| * | | | Keep encryption enabled if decrypting for single userVincent Petry2016-06-241-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-includedeletewithuploadpermsVincent Petry2016-06-2710-45/+214
|\ \ \ \ | | | | | | | | | | Add explicit delete permission to link shares
| * | | | Repair step to adjust link share delete permissionsVincent Petry2016-06-243-1/+111
| | | | |
| * | | | Add explicit delete permission to link sharesVincent Petry2016-06-247-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-whennotinstalledVincent Petry2016-06-271-3/+12
|\ \ \ \ \ | | | | | | | | | | | | Make code integrity check work when OC is not installed yet
| * | | | | Make code integrity check work when OC is not installed yetVincent Petry2016-06-241-3/+12
| | | | | |
* | | | | | Merge pull request #25252 from owncloud/authtoken-removetooltipondisconnectMorris Jobke2016-06-271-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove tooltip when disconnecting token
| * | | | | | Remove tooltip when disconnecting tokenVincent Petry2016-06-231-0/+2
| | | | | | |
* | | | | | | Merge pull request #25129 from owncloud/remove-ieVincent Petry2016-06-2710-203/+11
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | Remove ie8+9 support
| * | | | | | remove ie8+9 supportHendrik Leppelsack2016-06-2310-203/+11
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #25247 from owncloud/fed-unshare-failVincent Petry2016-06-271-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 Appelman2016-06-231-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | server
* | | | | | Merge pull request #25251 from owncloud/authtoken-assetpipelinefixVincent Petry2016-06-273-11/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Use OC.Backbone instead of Backbone directly in authtoken JS code
| * | | | | | Use OC.Backbone instead of Backbone directly in authtoken JS codeVincent Petry2016-06-233-11/+11
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fixes asset pipeline issue with the auth token in personal page
* | | | | | Merge pull request #25154 from owncloud/token-login-check-loginnameVincent Petry2016-06-272-2/+41
|\ \ \ \ \ \ | | | | | | | | | | | | | | check login name when authenticating via token and basic auth
| * | | | | | check login name when authenticating with client tokenChristoph Wurst2016-06-242-2/+41
| | |_|_|_|/ | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2710-0/+32
| | | | | |