summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2742-252/+387
|\
| * Merge pull request #25273 from owncloud/ext-fixsessioncredentialsnolazyloadVincent Petry2016-06-271-0/+4
| |\
| | * Quickfix: do not lazy load auth mechanisms for ext storagesVincent Petry2016-06-271-0/+4
| * | Merge pull request #25237 from owncloud/search-filelistnextpageresultsVincent Petry2016-06-272-4/+29
| |\ \
| | * | Prerender file list pages to include search resultsVincent Petry2016-06-242-4/+29
| * | | Merge pull request #25261 from owncloud/app-password-login-nameVincent Petry2016-06-274-2/+28
| |\ \ \
| | * | | 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 owncloud/decryptall-keepencryptionenabledforsi...Christoph Wurst2016-06-271-0/+3
| |\ \ \
| | * | | Keep encryption enabled if decrypting for single userVincent Petry2016-06-241-0/+3
| | |/ /
| * | | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-2710-45/+214
| |\ \ \
| | * | | 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
| * | | | Merge pull request #25258 from owncloud/integritycheck-whennotinstalledVincent Petry2016-06-271-3/+12
| |\ \ \ \
| | * | | | 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 tokenVincent Petry2016-06-231-0/+2
| * | | | | | Merge pull request #25129 from owncloud/remove-ieVincent Petry2016-06-2710-203/+11
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | * | | | | 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 se...Robin Appelman2016-06-231-2/+2
| | |/ / / / /
| * | | | | | Merge pull request #25251 from owncloud/authtoken-assetpipelinefixVincent Petry2016-06-273-11/+11
| |\ \ \ \ \ \
| | * | | | | | Use OC.Backbone instead of Backbone directly in authtoken JS codeVincent Petry2016-06-233-11/+11
| | | |/ / / / | | |/| | | |
| * | | | | | Merge pull request #25154 from owncloud/token-login-check-loginnameVincent Petry2016-06-272-2/+41
| |\ \ \ \ \ \
| | * | | | | | check login name when authenticating with client tokenChristoph Wurst2016-06-242-2/+41
| | | |_|_|_|/ | | |/| | | |
| * | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2710-0/+32
* | | | | | | Merge pull request #233 from nextcloud/allow-users-to-change-global-credentialsMorris Jobke2016-06-272-3/+216
|\ \ \ \ \ \ \
| * | | | | | | Allow regular users to specify global credentials passwordLukas Reschke2016-06-272-3/+216
* | | | | | | | Merge pull request #221 from nextcloud/password_policy_eventsMorris Jobke2016-06-278-64/+142
|\ \ \ \ \ \ \ \
| * | | | | | | | verify user password on changeBjoern Schiessle2016-06-275-26/+95
| * | | | | | | | remove old hook, no longer neededBjoern Schiessle2016-06-272-32/+17
| * | | | | | | | check password for link sharesBjoern Schiessle2016-06-273-9/+33
| |/ / / / / / /
* | | | | | | | Merge pull request #190 from nextcloud/add-wnd-1Lukas Reschke2016-06-273-0/+182
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Add "Login credentials" and "User Provided"Lukas Reschke2016-06-213-0/+182
* | | | | | | | Merge pull request #226 from nextcloud/master-upstream-syncLukas Reschke2016-06-26247-657/+2501
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-26247-657/+2501
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2618-2/+114
| | * | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-258-2/+130
| | * | | | | | | Merge pull request #25259 from owncloud/search-fixsearchfromotherfilelistsChristoph Wurst2016-06-241-2/+9
| | |\ \ \ \ \ \ \
| | | * | | | | | | Hide search results after switching directoryVincent Petry2016-06-241-0/+7
| | | * | | | | | | Fix search result link for file results outside default listVincent Petry2016-06-241-2/+2
| | | | |/ / / / / | | | |/| | | | |
| | * | | | | | | Merge pull request #25257 from owncloud/comments-showerroronsaveChristoph Wurst2016-06-243-8/+12
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Show error message when posting an invalid commentVincent Petry2016-06-243-8/+12
| | | | |_|_|/ / | | | |/| | | |
| | * | | | | | Merge pull request #25171 from owncloud/files_external-list-allVincent Petry2016-06-245-10/+81
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | | * | | | | Add option to `occ files_external:list` to show all configured mountsRobin Appelman2016-06-235-10/+81
| | | | |_|_|/ | | | |/| | |
| | * | | | | Merge pull request #25239 from owncloud/setupchecks-preventreloadVincent Petry2016-06-241-2/+4
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | | * | | | Don't reload page in case of auth errors during setup checksVincent Petry2016-06-231-2/+4
| | * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2482-6/+336
| | | |_|_|/ | | |/| | |
| | * | | | Merge pull request #25238 from owncloud/files-trashlistnamecorruptionVincent Petry2016-06-232-0/+24
| | |\ \ \ \ | | | |_|/ / | | |/| | |
| | | * | | Fix trashed file name corruption when rerendering trashbin listVincent Petry2016-06-232-0/+24
| | | |/ /
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-03 09:42:23 +0000