summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FIx the syntax of the buttonsJoas Schilling2016-08-261-1/+1
|
* Merge pull request #1049 from nextcloud/theming-admin-improvementsMarius Blüm2016-08-265-7/+78
|\ | | | | Theming admin improvements
| * Theming: Hide undo button on default valuesJulius Haertl2016-08-262-2/+32
| |
| * Theming: Add preview for login screenJulius Haertl2016-08-265-5/+46
| |
* | Merge pull request #1080 from nextcloud/always_lazyrootLukas Reschke2016-08-262-3/+3
|\ \ | |/ |/| Always use the LazyRoot
| * Always use the LazyRootRoeland Jago Douma2016-08-262-3/+3
| |
* | Merge pull request #1026 from nextcloud/theming-extend-defaultsRoeland Jago Douma2016-08-263-12/+90
|\ \ | |/ |/| Theming: Add logo and background to ThemingDefaults
| * Use the lazy root to make tests pass 🙈Joas Schilling2016-08-243-6/+2
| |
| * Theming: Add logo and background to ThemingDefaultsJulius Haertl2016-08-243-8/+90
| |
* | Merge pull request #1069 from nextcloud/l10ntest_nodbJoas Schilling2016-08-252-8/+16
|\ \ | | | | | | L10N tests do not require DB
| * | L10N tests do not require DBRoeland Jago Douma2016-08-252-8/+16
| | | | | | | | | | | | | | | * Makes CI a bit more efficient * Cleanup getMock warning
* | | Merge pull request #1065 from nextcloud/cappedcachetest_nodbJoas Schilling2016-08-251-2/+0
|\ \ \ | | | | | | | | CappedMemoryCacheTest does not require DB
| * | | CappedMemoryCacheTest does not require DBRoeland Jago Douma2016-08-251-2/+0
| |/ / | | | | | | | | | Makes CI a bit more efficient
* | | Merge pull request #1050 from nextcloud/fix-1048Lukas Reschke2016-08-253-7/+8
|\ \ \ | |/ / |/| | fix internal links in security & setup warnings, resolves #1048
| * | adjust js testsArthur Schiwon2016-08-251-4/+4
| | |
| * | fix internal links in security & setup warnings, resolves #1048Arthur Schiwon2016-08-252-3/+4
| | |
* | | Merge pull request #1036 from nextcloud/query-logger-stackJoas Schilling2016-08-253-2/+33
|\ \ \ | | | | | | | | add stacktrace to query logger
| * | | add stacktrace to query loggerRobin Appelman2016-08-243-2/+33
| | | |
* | | | Merge pull request #1046 from nextcloud/dep_getHTTPHelperblizzz2016-08-258-32/+77
|\ \ \ \ | |_|/ / |/| | | Do not use deprecated HTTPHelper
| * | | Fix testsRoeland Jago Douma2016-08-241-13/+44
| | | |
| * | | HTTPHelper is deprecatedRoeland Jago Douma2016-08-247-19/+33
| | | | | | | | | | | | | | | | Use the IClientService instead
* | | | Merge pull request #1044 from nextcloud/master-add-cache-busterLukas Reschke2016-08-251-71/+71
|\ \ \ \ | |/ / / |/| | | Add cachebuster to icons.css
| * | | 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
|\ \ \ | | | | | | | | Fix theming autoloader magic
| * | | 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 dav display names
| * | | | 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 ↵Lukas Reschke2016-08-244-21/+44
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/remove-password-reset-link-after-successful-login Remove "password reset token" after successful login
| * | | 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
|\ \ \ \ | |_|/ / |/| | | [master] Do not error on NotFoundException
| * | | Do not error on NotFoundExceptionRoeland Jago Douma2016-08-241-0/+4
|/ / / | | | | | | | | | | | | | | | | | | Since this exception can be thrown when a shared file is in the trashbin there is no need to spam the log like crazy. Fixes #938
* | | Merge pull request #1007 from nextcloud/shared-storage-non-recursiveLukas Reschke2016-08-236-125/+125
|\ \ \ | |_|/ |/| | Fix shared storage recursive setup
| * | 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
|\ \ \ | | | | | | | | Workflow section + hidden empty sections
| * | | 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
|\ \ \ \ | |_|_|/ |/| | | Do not error on maxUploadChange
| * | | put file handling into a section againArthur Schiwon2016-08-221-16/+18
| | | |