summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* initial commit for the theming appBjoern Schiessle2016-06-276-0/+96
* 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
| | * | add PasswordLoginForbiddenExceptionChristoph Wurst2016-06-172-6/+29
| * | | Merge pull request #25159 from owncloud/share-app-initorderVincent Petry2016-06-201-3/+3
| |\ \ \
| | * | | Delay files_sharing's registerMountProvidersVincent Petry2016-06-171-3/+3
| * | | | Merge pull request #25010 from owncloud/gdrive-fix-testsVincent Petry2016-06-201-2/+2
| |\ \ \ \
| | * | | | Fix GDrive test rename overwrite folderVincent Petry2016-06-101-2/+2
| * | | | | Merge pull request #25161 from owncloud/fixgetsharefolderVincent Petry2016-06-202-5/+9
| |\ \ \ \ \
| | * | | | | Make getShareFolder use given view instead of static FSVincent Petry2016-06-172-5/+9
| | | |_|/ / | | |/| | |
| * | | | | Merge pull request #25120 from owncloud/settings_fix_checkbox_newlineVincent Petry2016-06-202-3/+7
| |\ \ \ \ \
| | * | | | | files_external: Keep checkbox and its label on one line #20032 #22655Markus Goetz2016-06-172-3/+7
| | | |_|_|/ | | |/| | |
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2010-2/+56
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-184-2/+68
| |/ / / /
| * / / / Changed global variable to localSergio Bertolín2016-06-171-1/+1
| |/ / /
| * | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-1718-4/+116