Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | FIx the syntax of the buttons | Joas Schilling | 2016-08-26 | 1 | -1/+1 |
| | |||||
* | Merge pull request #1049 from nextcloud/theming-admin-improvements | Marius Blüm | 2016-08-26 | 5 | -7/+78 |
|\ | | | | | Theming admin improvements | ||||
| * | Theming: Hide undo button on default values | Julius Haertl | 2016-08-26 | 2 | -2/+32 |
| | | |||||
| * | Theming: Add preview for login screen | Julius Haertl | 2016-08-26 | 5 | -5/+46 |
| | | |||||
* | | Merge pull request #1080 from nextcloud/always_lazyroot | Lukas Reschke | 2016-08-26 | 2 | -3/+3 |
|\ \ | |/ |/| | Always use the LazyRoot | ||||
| * | Always use the LazyRoot | Roeland Jago Douma | 2016-08-26 | 2 | -3/+3 |
| | | |||||
* | | Merge pull request #1026 from nextcloud/theming-extend-defaults | Roeland Jago Douma | 2016-08-26 | 3 | -12/+90 |
|\ \ | |/ |/| | Theming: Add logo and background to ThemingDefaults | ||||
| * | Use the lazy root to make tests pass 🙈 | Joas Schilling | 2016-08-24 | 3 | -6/+2 |
| | | |||||
| * | Theming: Add logo and background to ThemingDefaults | Julius Haertl | 2016-08-24 | 3 | -8/+90 |
| | | |||||
* | | Merge pull request #1069 from nextcloud/l10ntest_nodb | Joas Schilling | 2016-08-25 | 2 | -8/+16 |
|\ \ | | | | | | | L10N tests do not require DB | ||||
| * | | L10N tests do not require DB | Roeland Jago Douma | 2016-08-25 | 2 | -8/+16 |
| | | | | | | | | | | | | | | | * Makes CI a bit more efficient * Cleanup getMock warning | ||||
* | | | Merge pull request #1065 from nextcloud/cappedcachetest_nodb | Joas Schilling | 2016-08-25 | 1 | -2/+0 |
|\ \ \ | | | | | | | | | CappedMemoryCacheTest does not require DB | ||||
| * | | | CappedMemoryCacheTest does not require DB | Roeland Jago Douma | 2016-08-25 | 1 | -2/+0 |
| |/ / | | | | | | | | | | Makes CI a bit more efficient | ||||
* | | | Merge pull request #1050 from nextcloud/fix-1048 | Lukas Reschke | 2016-08-25 | 3 | -7/+8 |
|\ \ \ | |/ / |/| | | fix internal links in security & setup warnings, resolves #1048 | ||||
| * | | adjust js tests | Arthur Schiwon | 2016-08-25 | 1 | -4/+4 |
| | | | |||||
| * | | fix internal links in security & setup warnings, resolves #1048 | Arthur Schiwon | 2016-08-25 | 2 | -3/+4 |
| | | | |||||
* | | | Merge pull request #1036 from nextcloud/query-logger-stack | Joas Schilling | 2016-08-25 | 3 | -2/+33 |
|\ \ \ | | | | | | | | | add stacktrace to query logger | ||||
| * | | | add stacktrace to query logger | Robin Appelman | 2016-08-24 | 3 | -2/+33 |
| | | | | |||||
* | | | | Merge pull request #1046 from nextcloud/dep_getHTTPHelper | blizzz | 2016-08-25 | 8 | -32/+77 |
|\ \ \ \ | |_|/ / |/| | | | Do not use deprecated HTTPHelper | ||||
| * | | | Fix tests | Roeland Jago Douma | 2016-08-24 | 1 | -13/+44 |
| | | | | |||||
| * | | | HTTPHelper is deprecated | Roeland Jago Douma | 2016-08-24 | 7 | -19/+33 |
| | | | | | | | | | | | | | | | | Use the IClientService instead | ||||
* | | | | Merge pull request #1044 from nextcloud/master-add-cache-buster | Lukas Reschke | 2016-08-25 | 1 | -71/+71 |
|\ \ \ \ | |/ / / |/| | | | Add cachebuster to icons.css | ||||
| * | | | Add cachebuster to icons.css | Lukas Reschke | 2016-08-24 | 1 | -71/+71 |
|/ / / | |||||
* | | | Merge pull request #1033 from nextcloud/fix_theming_autoloader_magic | Roeland Jago Douma | 2016-08-24 | 2 | -7/+12 |
|\ \ \ | | | | | | | | | Fix theming autoloader magic | ||||
| * | | | Require a ThemingDefaults class again | Roeland Jago Douma | 2016-08-24 | 1 | -3/+2 |
| | | | | |||||
| * | | | Dark autoloader magic for ThemingDefaults | Roeland Jago Douma | 2016-08-24 | 1 | -4/+10 |
| | | | | |||||
* | | | | Merge pull request #936 from nextcloud/better-dav-display-names | Lukas Reschke | 2016-08-24 | 10 | -29/+83 |
|\ \ \ \ | | | | | | | | | | | Better dav display names | ||||
| * | | | | Better displaynames for shared address books | Joas Schilling | 2016-08-24 | 5 | -11/+44 |
| | | | | | |||||
| * | | | | Better displaynames for shared calendars | Joas Schilling | 2016-08-24 | 7 | -18/+39 |
| |/ / / | |||||
* | | | | Merge pull request #1024 from ↵ | Lukas Reschke | 2016-08-24 | 4 | -21/+44 |
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | nextcloud/remove-password-reset-link-after-successful-login Remove "password reset token" after successful login | ||||
| * | | | Move the reset token to core app | Joas Schilling | 2016-08-23 | 4 | -25/+25 |
| | | | | |||||
| * | | | Remove "password reset token" after successful login | Joas Schilling | 2016-08-23 | 2 | -0/+23 |
| | | | | |||||
* | | | | Merge pull request #1030 from nextcloud/master_1013 | Roeland Jago Douma | 2016-08-24 | 1 | -0/+4 |
|\ \ \ \ | |_|/ / |/| | | | [master] Do not error on NotFoundException | ||||
| * | | | Do not error on NotFoundException | Roeland Jago Douma | 2016-08-24 | 1 | -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-recursive | Lukas Reschke | 2016-08-23 | 6 | -125/+125 |
|\ \ \ | |_|/ |/| | | Fix shared storage recursive setup | ||||
| * | | prevent infinite recursion while getting storage from mount | Robin Appelman | 2016-08-23 | 3 | -12/+18 |
| | | | |||||
| * | | handle failed shares | Robin Appelman | 2016-08-22 | 1 | -1/+3 |
| | | | |||||
| * | | Lazy init shared storage | Robin Appelman | 2016-08-22 | 1 | -17/+9 |
| | | | |||||
| * | | reuse existing root id | Robin Appelman | 2016-08-22 | 1 | -1/+1 |
| | | | |||||
| * | | Allow jail wrappers to lazily initialize the source storage | Robin Appelman | 2016-08-22 | 1 | -41/+41 |
| | | | |||||
| * | | Allow storage wrappers to lazily initialize the source storage | Robin Appelman | 2016-08-22 | 1 | -55/+55 |
| | | | |||||
* | | | Merge pull request #995 from nextcloud/workflow-section | Lukas Reschke | 2016-08-23 | 8 | -13/+92 |
|\ \ \ | | | | | | | | | Workflow section + hidden empty sections | ||||
| * | | | Save the container with the app's namespace so we can resolve it | Joas Schilling | 2016-08-22 | 1 | -1/+2 |
| | | | | |||||
| * | | | fix wrong var name | Arthur Schiwon | 2016-08-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Move admin settings to workflow section | Joas Schilling | 2016-08-22 | 3 | -3/+3 |
| | | | | |||||
| * | | | adjust test | Arthur Schiwon | 2016-08-22 | 1 | -11/+6 |
| | | | | |||||
| * | | | enlist only registered sections that also have settings registered to | Arthur Schiwon | 2016-08-22 | 2 | -7/+29 |
| | | | | |||||
| * | | | add section to worklfowengine | Arthur Schiwon | 2016-08-22 | 2 | -1/+62 |
| | | | | |||||
* | | | | Merge pull request #1005 from nextcloud/fix_994 | Lukas Reschke | 2016-08-23 | 5 | -10/+103 |
|\ \ \ \ | |_|_|/ |/| | | | Do not error on maxUploadChange | ||||
| * | | | put file handling into a section again | Arthur Schiwon | 2016-08-22 | 1 | -16/+18 |
| | | | |