summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2713-23/+147
|\
| * 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 #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-273-16/+98
| |\ \ \ | | |_|/ | |/| |
| | * | Add explicit delete permission to link sharesVincent Petry2016-06-243-16/+98
| * | | 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
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-276-0/+14
* | | | | 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 #190 from nextcloud/add-wnd-1Lukas Reschke2016-06-273-0/+182
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Add "Login credentials" and "User Provided"Lukas Reschke2016-06-213-0/+182
* | | | | | Merge remote-tracking branch 'upstream/master' into master-upstream-syncLukas Reschke2016-06-2674-86/+1087
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2612-0/+36
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-256-2/+120
| * | | | | 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
| | | |/ | | |/|
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-246-4/+68
| * | | 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
| * | | Merge pull request #25225 from owncloud/enc-revertversionsizeVincent Petry2016-06-221-1/+8
| |\ \ \
| | * | | Rollback version must also adjust cached sizeVincent Petry2016-06-221-1/+8
| * | | | Merge pull request #25223 from owncloud/external-list-default-optionsVincent Petry2016-06-221-1/+3
| |\ \ \ \
| | * | | | Hide more default options in occ files_external:listRobin Appelman2016-06-221-1/+3
| * | | | | Increase fed share timeout from 3 to 10 + unit testsVincent Petry2016-06-225-15/+30
| * | | | | Add timeouts to make the UI usable again when a remote share is unreachableJoas Schilling2016-06-224-5/+20
| | |/ / / | |/| | |
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2218-6/+150
| * | | | Fix null pointer exception in user_ldap (#25062)Jörn Friedrich Dreyer2016-06-211-1/+8
| * | | | Merge pull request #24505 from owncloud/ceph-wait-for-httpVincent Petry2016-06-211-0/+5
| |\ \ \ \
| | * | | | Wait for port being accessible in addition to the notify socketThomas Müller2016-06-171-0/+5
| * | | | | Contacts API: replace raw image data with url (#25081)Georg Ehrke2016-06-2111-39/+384
| | |/ / / | |/| | |
| * | | | fix broken unit test (#25198)Thomas Müller2016-06-211-1/+8
| | |/ / | |/| |
| * | | Filter out group shares for owner where owner is included (#25190)Vincent Petry2016-06-212-2/+132
* | | | changes emptycontent icon to drag-accept on file-dragVincent Chan2016-06-231-1/+2
| |_|/ |/| |
* | | Add "Global Auth" option to external storageRobin Appelman2016-06-219-3/+282
* | | Merge remote-tracking branch 'upstream/master' into master-sync-upstreamLukas Reschke2016-06-2170-153/+608
|\| |
| * | Catch exceptions while creating shared mounts (#25077)Robin Appelman2016-06-202-11/+25
| * | Don't send activity to non-admins when assigning invisible tags (#25192)Vincent Petry2016-06-201-0/+4
| * | Merge pull request #25173 from owncloud/fix_conversion_issuesVincent Petry2016-06-204-0/+6
| |\ \
| | * | Fix conversion issuesJuan Pablo Villafáñez2016-06-204-0/+6
| | |/
| * | Merge pull request #25162 from owncloud/password-login-forbidden-hintVincent Petry2016-06-203-7/+87
| |\ \
| | * | PasswordLoginForbidden must extend NotAuthenticatedVincent Petry2016-06-171-2/+2
| | * | throw PasswordLoginForbidden on DAVChristoph Wurst2016-06-173-3/+60
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-03 09:37:45 +0000