summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Remove unused core wrappersRoeland Jago Douma2016-08-251-20/+0
* AvatarController cleanupRoeland Jago Douma2016-08-253-96/+106
* Merge pull request #1036 from nextcloud/query-logger-stackJoas Schilling2016-08-253-2/+33
|\
| * add stacktrace to query loggerRobin Appelman2016-08-243-2/+33
* | Merge pull request #1046 from nextcloud/dep_getHTTPHelperblizzz2016-08-258-32/+77
|\ \
| * | Fix testsRoeland Jago Douma2016-08-241-13/+44
| * | HTTPHelper is deprecatedRoeland Jago Douma2016-08-247-19/+33
* | | Merge pull request #1044 from nextcloud/master-add-cache-busterLukas Reschke2016-08-251-71/+71
|\ \ \ | |/ / |/| |
| * | Add cachebuster to icons.cssLukas Reschke2016-08-241-71/+71
|/ /
* | Merge pull request #1033 from nextcloud/fix_theming_autoloader_magicRoeland Jago Douma2016-08-242-7/+12
|\ \
| * | Require a ThemingDefaults class againRoeland Jago Douma2016-08-241-3/+2
| * | Dark autoloader magic for ThemingDefaultsRoeland Jago Douma2016-08-241-4/+10
* | | Merge pull request #936 from nextcloud/better-dav-display-namesLukas Reschke2016-08-2410-29/+83
|\ \ \
| * | | Better displaynames for shared address booksJoas Schilling2016-08-245-11/+44
| * | | Better displaynames for shared calendarsJoas Schilling2016-08-247-18/+39
| |/ /
* | | Merge pull request #1024 from nextcloud/remove-password-reset-link-after-succ...Lukas Reschke2016-08-244-21/+44
|\ \ \ | |_|/ |/| |
| * | Move the reset token to core appJoas Schilling2016-08-234-25/+25
| * | Remove "password reset token" after successful loginJoas Schilling2016-08-232-0/+23
* | | Merge pull request #1030 from nextcloud/master_1013Roeland Jago Douma2016-08-241-0/+4
|\ \ \ | |_|/ |/| |
| * | Do not error on NotFoundExceptionRoeland Jago Douma2016-08-241-0/+4
|/ /
* | Merge pull request #1007 from nextcloud/shared-storage-non-recursiveLukas Reschke2016-08-236-125/+125
|\ \
| * | prevent infinite recursion while getting storage from mountRobin Appelman2016-08-233-12/+18
| * | handle failed sharesRobin Appelman2016-08-221-1/+3
| * | Lazy init shared storageRobin Appelman2016-08-221-17/+9
| * | reuse existing root idRobin Appelman2016-08-221-1/+1
| * | Allow jail wrappers to lazily initialize the source storageRobin Appelman2016-08-221-41/+41
| * | Allow storage wrappers to lazily initialize the source storageRobin Appelman2016-08-221-55/+55
* | | Merge pull request #995 from nextcloud/workflow-sectionLukas Reschke2016-08-238-13/+92
|\ \ \
| * | | Save the container with the app's namespace so we can resolve itJoas Schilling2016-08-221-1/+2
| * | | fix wrong var nameArthur Schiwon2016-08-221-1/+1
| * | | Move admin settings to workflow sectionJoas Schilling2016-08-223-3/+3
| * | | adjust testArthur Schiwon2016-08-221-11/+6
| * | | enlist only registered sections that also have settings registered toArthur Schiwon2016-08-222-7/+29
| * | | add section to worklfowengineArthur Schiwon2016-08-222-1/+62
* | | | Merge pull request #1005 from nextcloud/fix_994Lukas Reschke2016-08-235-10/+103
|\ \ \ \ | |_|_|/ |/| | |
| * | | put file handling into a section againArthur Schiwon2016-08-221-16/+18
| * | | Do not error on maxUploadChangeRoeland Jago Douma2016-08-225-23/+114
* | | | Merge pull request #1017 from nextcloud/cache-registered-autoloadersRoeland Jago Douma2016-08-231-0/+6
|\ \ \ \
| * | | | Cache registered autoloadersLukas Reschke2016-08-221-0/+6
* | | | | Merge pull request #956 from nextcloud/fix_952Lukas Reschke2016-08-233-79/+42
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | When requesting a permalink to an invalid file redirectRoeland Jago Douma2016-08-192-7/+10
| * | | | When using permalinks don't error out if file id can't be foundRoeland Jago Douma2016-08-193-75/+35
* | | | | Merge pull request #1015 from nextcloud/1012-masterLukas Reschke2016-08-222-0/+19
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | add testArthur Schiwon2016-08-221-0/+16
| * | | | hide parameters of tryLogin when loggingArthur Schiwon2016-08-221-0/+3
|/ / / /
* | | | Merge pull request #1006 from nextcloud/fix_theming_admin_diblizzz2016-08-221-2/+3
|\ \ \ \ | |_|_|/ |/| | |
| * | | fixes registering of theming settings where server return OC_Defaults instead...Arthur Schiwon2016-08-221-2/+3
|/ / /
* | | Merge pull request #965 from nextcloud/master-files-render-hidden-files-hiddenJoas Schilling2016-08-224-31/+82
|\ \ \
| * | | Fix hidden files handlingVincent Petry2016-08-194-31/+82
* | | | Merge pull request #1000 from nextcloud/mail_icon_shareRoeland Jago Douma2016-08-223-5/+5
|\ \ \ \ | |_|_|/ |/| | |