aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1091 from nextcloud/theming-title-previewLukas Reschke2016-08-271-0/+3
|\ | | | | Theming: Preview instance name in page title
| * Theming: Preview for page titleJulius Haertl2016-08-261-0/+3
| |
* | Merge pull request #1088 from nextcloud/core_tags_cleanupLukas Reschke2016-08-264-168/+0
|\ \ | |/ |/| Tag cleanup
| * Autoloader updateRoeland Jago Douma2016-08-262-2/+0
| |
| * Remove the core tag routes since they are brokenRoeland Jago Douma2016-08-262-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-loopJoas Schilling2016-08-269-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 passChristoph Wurst2016-08-249-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-syntaxRoeland Jago Douma2016-08-265-355/+10
|\ \ \ | | | | | | | | Fix the syntax of the federation ID share buttons
| * | | Reorder the buttons by importanceJoas Schilling2016-08-264-353/+8
| | | |
| * | | Fix more HTML "syntax"Joas Schilling2016-08-261-1/+1
| | | |
| * | | FIx the syntax of the buttonsJoas Schilling2016-08-261-1/+1
| | | |
* | | | Merge pull request #771 from nextcloud/theming-fixesRoeland Jago Douma2016-08-265-17/+146
|\ \ \ \ | |_|_|/ |/| | | Theming: Fix missing color usage
| * | | Make federadedfilesharing button match the theming valuesJulius Haertl2016-08-262-13/+23
| | | |
| * | | Theming: Adjust jquery ui elementsJulius Haertl2016-08-262-2/+46
| | | |
| * | | Theming: colorize primary buttonsJulius Haertl2016-08-262-2/+75
| | | |
| * | | Remove internal from getThemingDefaultsJulius Haertl2016-08-261-1/+0
| | | |
| * | | Theming: fix federated sharing button colorJulius Haertl2016-08-262-1/+4
| | | |
* | | | Merge pull request #1053 from nextcloud/set-quota-non-intLukas Reschke2016-08-261-1/+1
|\ \ \ \ | | | | | | | | | | fix setting quota to default or unlimited
| * | | | fix setting quota to default or unlimitedRobin Appelman2016-08-251-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #1077 from nextcloud/sharee_ocs_appframeworkLukas Reschke2016-08-263-93/+79
|\ \ \ \ | |_|_|/ |/| | | Sharee API to AppFramework
| * | | Sharee API to AppFrameworkRoeland Jago Douma2016-08-263-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-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