Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1091 from nextcloud/theming-title-preview | Lukas Reschke | 2016-08-27 | 1 | -0/+3 |
|\ | | | | | Theming: Preview instance name in page title | ||||
| * | Theming: Preview for page title | Julius Haertl | 2016-08-26 | 1 | -0/+3 |
| | | |||||
* | | Merge pull request #1088 from nextcloud/core_tags_cleanup | Lukas Reschke | 2016-08-26 | 4 | -168/+0 |
|\ \ | |/ |/| | Tag cleanup | ||||
| * | Autoloader update | Roeland Jago Douma | 2016-08-26 | 2 | -2/+0 |
| | | |||||
| * | Remove the core tag routes since they are broken | Roeland Jago Douma | 2016-08-26 | 2 | -166/+0 |
| | | | | | | | | | | | | Private internal stuff that nobody *should* be using anyways. But on top of that already broken for a long time. So nobody could be using it even. | ||||
* | | Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop | Joas Schilling | 2016-08-26 | 9 | -15/+71 |
|\ \ | | | | | | | prevent infinite redirect loops if the there is no 2fa provider to pass | ||||
| * | | prevent infinite redirect loops if the there is no 2fa provider to pass | Christoph Wurst | 2016-08-24 | 9 | -15/+71 |
| | | | | | | | | | | | | | | | | | | | | | This fixes infinite loops that are caused whenever a user is about to solve a 2FA challenge, but the provider app is disabled at the same time. Since the session value usually indicates that the challenge needs to be solved before we grant access we have to remove that value instead in this special case. | ||||
* | | | Merge pull request #1085 from nextcloud/fix-ffs-sharing-syntax | Roeland Jago Douma | 2016-08-26 | 5 | -355/+10 |
|\ \ \ | | | | | | | | | Fix the syntax of the federation ID share buttons | ||||
| * | | | Reorder the buttons by importance | Joas Schilling | 2016-08-26 | 4 | -353/+8 |
| | | | | |||||
| * | | | Fix more HTML "syntax" | Joas Schilling | 2016-08-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | FIx the syntax of the buttons | Joas Schilling | 2016-08-26 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #771 from nextcloud/theming-fixes | Roeland Jago Douma | 2016-08-26 | 5 | -17/+146 |
|\ \ \ \ | |_|_|/ |/| | | | Theming: Fix missing color usage | ||||
| * | | | Make federadedfilesharing button match the theming values | Julius Haertl | 2016-08-26 | 2 | -13/+23 |
| | | | | |||||
| * | | | Theming: Adjust jquery ui elements | Julius Haertl | 2016-08-26 | 2 | -2/+46 |
| | | | | |||||
| * | | | Theming: colorize primary buttons | Julius Haertl | 2016-08-26 | 2 | -2/+75 |
| | | | | |||||
| * | | | Remove internal from getThemingDefaults | Julius Haertl | 2016-08-26 | 1 | -1/+0 |
| | | | | |||||
| * | | | Theming: fix federated sharing button color | Julius Haertl | 2016-08-26 | 2 | -1/+4 |
| | | | | |||||
* | | | | Merge pull request #1053 from nextcloud/set-quota-non-int | Lukas Reschke | 2016-08-26 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | fix setting quota to default or unlimited | ||||
| * | | | | fix setting quota to default or unlimited | Robin Appelman | 2016-08-25 | 1 | -1/+1 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1077 from nextcloud/sharee_ocs_appframework | Lukas Reschke | 2016-08-26 | 3 | -93/+79 |
|\ \ \ \ | |_|_|/ |/| | | | Sharee API to AppFramework | ||||
| * | | | Sharee API to AppFramework | Roeland Jago Douma | 2016-08-26 | 3 | -93/+79 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move to OCSController * Move to Controller folder * Use automatic DI * Use function parameters * Updated tests | ||||
* | | | | 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 |