Commit Graph

34103 Commits

Author SHA1 Message Date
Christoph Wurst c93c5d142e
fix 2fa challenge page wording 2016-08-27 11:12:12 +02:00
Christoph Wurst dc57b89f37
reorder 2fa challenge HTML 2016-08-27 11:12:12 +02:00
Lukas Reschke c40df1d990 Merge pull request #1091 from nextcloud/theming-title-preview
Theming: Preview instance name in page title
2016-08-27 11:10:00 +02:00
Julius Haertl d7f0a970ae
Theming: Preview for page title 2016-08-26 18:21:05 +02:00
Lukas Reschke 56367d19ac Merge pull request #1088 from nextcloud/core_tags_cleanup
Tag cleanup
2016-08-26 17:55:30 +02:00
Joas Schilling 89c78bbce4 Merge pull request #1031 from nextcloud/2fa-infinite-redirect-loop
prevent infinite redirect loops if the there is no 2fa provider to pass
2016-08-26 16:03:05 +02:00
Roeland Jago Douma d3b2e4090e
Autoloader update 2016-08-26 15:46:58 +02:00
Roeland Jago Douma c20aef8795 Merge pull request #1085 from nextcloud/fix-ffs-sharing-syntax
Fix the syntax of the federation ID share buttons
2016-08-26 15:10:03 +02:00
Roeland Jago Douma 53725d4d15 Merge pull request #771 from nextcloud/theming-fixes
Theming: Fix missing color usage
2016-08-26 15:02:21 +02:00
Roeland Jago Douma 68ea287ed7
Remove the core tag routes since they are broken
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.
2016-08-26 15:00:18 +02:00
Lukas Reschke 00bb9294ed Merge pull request #1053 from nextcloud/set-quota-non-int
fix setting quota to default or unlimited
2016-08-26 14:56:53 +02:00
Lukas Reschke 63addaa6c6 Merge pull request #1077 from nextcloud/sharee_ocs_appframework
Sharee API to AppFramework
2016-08-26 14:56:12 +02:00
Joas Schilling 6b885bbc56
Reorder the buttons by importance 2016-08-26 14:16:27 +02:00
Joas Schilling 419c42b0aa
Fix more HTML "syntax" 2016-08-26 14:04:37 +02:00
Joas Schilling ab5a69b94d
FIx the syntax of the buttons 2016-08-26 13:59:50 +02:00
Marius Blüm 5c73596ce4 Merge pull request #1049 from nextcloud/theming-admin-improvements
Theming admin improvements
2016-08-26 13:37:25 +02:00
Lukas Reschke de6ab82766 Merge pull request #1080 from nextcloud/always_lazyroot
Always use the LazyRoot
2016-08-26 13:18:01 +02:00
Julius Haertl a7273f1658
Make federadedfilesharing button match the theming values 2016-08-26 12:52:16 +02:00
Roeland Jago Douma f805aff67c
Always use the LazyRoot 2016-08-26 12:13:34 +02:00
Julius Haertl 3d38cb9570
Theming: Hide undo button on default values 2016-08-26 12:08:12 +02:00
Julius Haertl d95aec2ed2
Theming: Add preview for login screen 2016-08-26 12:08:12 +02:00
Julius Haertl 218e2f7850
Theming: Adjust jquery ui elements 2016-08-26 12:07:52 +02:00
Julius Haertl 2b0ed6c27a
Theming: colorize primary buttons 2016-08-26 12:07:52 +02:00
Julius Haertl fdab008231
Remove internal from getThemingDefaults 2016-08-26 12:07:52 +02:00
Julius Haertl a7c5f1b3c4
Theming: fix federated sharing button color 2016-08-26 12:07:45 +02:00
Roeland Jago Douma 044d7c3bb7 Merge pull request #1026 from nextcloud/theming-extend-defaults
Theming: Add logo and background to ThemingDefaults
2016-08-26 11:53:24 +02:00
Roeland Jago Douma 2fdda01b4b
Sharee API to AppFramework
* Move to OCSController
* Move to Controller folder
* Use automatic DI
* Use function parameters
* Updated tests
2016-08-26 11:36:09 +02:00
Joas Schilling ad4cab130e Merge pull request #1069 from nextcloud/l10ntest_nodb
L10N tests do not require DB
2016-08-25 23:38:27 +02:00
Joas Schilling c6a9ec3169 Merge pull request #1065 from nextcloud/cappedcachetest_nodb
CappedMemoryCacheTest does not require DB
2016-08-25 23:38:17 +02:00
Lukas Reschke ccce3dc0b5 Merge pull request #1050 from nextcloud/fix-1048
fix internal links in security & setup warnings, resolves #1048
2016-08-25 22:44:23 +02:00
Roeland Jago Douma c5bdb4d4e8
L10N tests do not require DB
* Makes CI a bit more efficient
* Cleanup getMock warning
2016-08-25 22:41:23 +02:00
Roeland Jago Douma 04cffe6d81
CappedMemoryCacheTest does not require DB
Makes CI a bit more efficient
2016-08-25 22:32:39 +02:00
Joas Schilling 680d7f22bb Merge pull request #1036 from nextcloud/query-logger-stack
add stacktrace to query logger
2016-08-25 16:43:08 +02:00
Robin Appelman abb3127ff2 fix setting quota to default or unlimited 2016-08-25 15:55:30 +02:00
blizzz 00c767f0d5 Merge pull request #1046 from nextcloud/dep_getHTTPHelper
Do not use deprecated HTTPHelper
2016-08-25 13:52:56 +02:00
Arthur Schiwon 9b01574465
adjust js tests 2016-08-25 13:47:14 +02:00
Arthur Schiwon 44f3fcc187
fix internal links in security & setup warnings, resolves #1048 2016-08-25 13:24:50 +02:00
Lukas Reschke 15bda3c57d Merge pull request #1044 from nextcloud/master-add-cache-buster
Add cachebuster to icons.css
2016-08-25 05:58:01 +02:00
Roeland Jago Douma cae87d028d
Fix tests 2016-08-24 21:30:42 +02:00
Roeland Jago Douma a1ed8207e9
HTTPHelper is deprecated
Use the IClientService instead
2016-08-24 21:30:39 +02:00
Lukas Reschke 593f2f638e
Add cachebuster to icons.css 2016-08-24 20:59:17 +02:00
Robin Appelman 1c3b1e5797 add stacktrace to query logger 2016-08-24 14:37:15 +02:00
Roeland Jago Douma 42ef33661f Merge pull request #1033 from nextcloud/fix_theming_autoloader_magic
Fix theming autoloader magic
2016-08-24 14:16:48 +02:00
Lukas Reschke b124647e32 Merge pull request #936 from nextcloud/better-dav-display-names
Better dav display names
2016-08-24 13:46:18 +02:00
Lukas Reschke a27a8d733b Merge pull request #1024 from nextcloud/remove-password-reset-link-after-successful-login
Remove "password reset token" after successful login
2016-08-24 13:44:41 +02:00
Roeland Jago Douma 60974de97b
Require a ThemingDefaults class again 2016-08-24 13:22:44 +02:00
Roeland Jago Douma 4e1d501696
Dark autoloader magic for ThemingDefaults 2016-08-24 13:22:21 +02:00
Christoph Wurst 6af2efb679
prevent infinite redirect loops if the there is no 2fa provider to pass
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.
2016-08-24 10:49:23 +02:00
Joas Schilling c7c53aefb2
Use the lazy root to make tests pass 🙈 2016-08-24 09:52:05 +02:00
Roeland Jago Douma 8d8366762b Merge pull request #1030 from nextcloud/master_1013
[master] Do not error on NotFoundException
2016-08-24 09:25:29 +02:00