Commit Graph

3998 Commits

Author SHA1 Message Date
Kim Gardner 3dde285776 Merge branch 'master' into l10n-de 2018-02-12 18:30:02 -05:00
Kim Gardner 85d67dba19 Merge branch 'master' into fallback-lang 2018-02-12 17:52:52 -05:00
Wyatt Johnson ae881df7f3 added fallback en for missing translations 2018-02-12 15:50:36 -07:00
Kim Gardner 33dd2e5c0a Merge branch 'master' into l10n-de 2018-02-12 17:46:38 -05:00
Fabian Neumann 39b34d624a Register DE locales in i18n framework. 2018-02-12 13:18:00 +01:00
Facu 4b2aa04ef6 error msg when suspenden user try to post 2018-02-11 23:37:33 -03:00
Kim Gardner 22467ac123 Merge branch 'master' into admin-user-details 2018-02-08 11:26:11 -05:00
Wyatt Johnson 3c04e6c7ec Merge branch 'master' into patch-1 2018-02-07 10:40:14 -07:00
Wyatt Johnson 77723e3fb3 Merge branch 'master' into patch-2 2018-02-07 10:32:34 -07:00
Leandro bba14f502a Merge branch 'admin-user-details' of https://github.com/leeeandroo/talk into admin-user-details 2018-02-07 09:14:28 +01:00
Leandro 44913864eb remove identification changes on UserDetails 2018-02-07 09:12:39 +01:00
Matt Montgomery 3c66401546 Providers username for subscription fields 2018-02-06 16:29:25 -07:00
Kim Gardner a5c08129ce Merge branch 'master' into admin-user-details 2018-02-06 14:20:26 -05:00
Kim Gardner 7c859ad4c3 Merge branch 'master' into patch-2 2018-02-06 14:20:00 -05:00
Kim Gardner b9cfddc5c0 Merge branch 'master' into keep-drafts 2018-02-06 14:06:57 -05:00
Kim Gardner caa588f11d Merge branch 'master' into keep-drafts 2018-02-06 11:36:31 -05:00
Matt Montgomery 9c139eb703 Fixes prettier/prettier linting error 2018-02-05 17:46:10 -07:00
Matt Montgomery c289ed149f Adds logout for non-admin users 2018-02-05 17:17:51 -07:00
Matt Montgomery 05d80a0549 Use translate-able sign_out 2018-02-05 17:03:44 -07:00
Kim Gardner 8bef21274d Merge branch 'master' into admin-user-details 2018-02-05 11:31:28 -05:00
Chi Vinh Le cb077a87dc Remove semicolon 2018-02-05 17:22:13 +01:00
Kim Gardner 6d662e4469 Merge branch 'master' into admin-user-details 2018-02-05 10:59:42 -05:00
Chi Vinh Le aec0251c4f Fix zen mode 2018-02-02 15:50:43 +01:00
Chi Vinh Le ac67b0484b Better fix 2018-02-02 12:12:58 +01:00
Chi Vinh Le edac21a4f4 Fix Flag Menu not working 2018-02-02 11:52:42 +01:00
Leandro f75924e683 translate ViewOptions componenet 2018-02-02 10:34:46 +01:00
Leandro 30cd16fd56 make user details texts translatable and change email to identification 2018-02-02 10:22:16 +01:00
Nat Welch 219fcdddea Change text wrapping of Stories table 2018-02-01 13:26:34 -05:00
Chi Vinh Le 4464183b42 Linting 2018-02-01 18:25:35 +01:00
Kiwi ed8d9e985c Merge branch 'master' into keep-drafts 2018-02-01 18:19:30 +01:00
Kiwi 894141619c Merge branch 'master' into keep-drafts 2018-02-01 17:50:06 +01:00
Chi Vinh Le 7e135cef47 Add a little comment 2018-02-01 17:46:06 +01:00
Chi Vinh Le 34726e2c4e Implement DraftArea 2018-02-01 17:29:53 +01:00
Wyatt Johnson 13e6645f26 Merge branch 'master' into remove-auth-data 2018-02-01 09:15:54 -07:00
Chi Vinh Le dc5a3e43a6 If we are not in iFrame just use localStorage 2018-02-01 13:53:15 +01:00
Chi Vinh Le 2e59f64738 Pass sessionStorage to context 2018-02-01 13:34:03 +01:00
Chi Vinh Le 91e08cb117 Rename storage to localStorage in context 2018-02-01 13:28:28 +01:00
Chi Vinh Le 118301c2b4 Implement a session storage 2018-02-01 12:25:51 +01:00
Chi Vinh Le d6ddd9c195 Clearly remove auth data from storage 2018-02-01 12:13:33 +01:00
Wyatt Johnson 596c214f1c allowed moderators to configure asset 2018-01-31 13:41:07 -07:00
Wyatt Johnson c4cddefcff abstracted config to service 2018-01-31 11:25:43 -07:00
Wyatt Johnson 062ce58cf8 ensure dynamic imports use proper path/url 2018-01-31 10:57:01 -07:00
Wyatt Johnson 0f9387dbb9 Merge branch 'master' into user-perms 2018-01-30 11:03:42 -07:00
Wyatt Johnson ec54376a53 blocked user actions in username change process 2018-01-30 11:00:48 -07:00
Chi Vinh Le a59464e45d Merge branch 'notify-on-edit' of ssh://github.com/coralproject/talk into notify-on-edit 2018-01-30 18:20:59 +01:00
Chi Vinh Le feeaa8ee8b Better todo descr 2018-01-30 18:19:31 +01:00
Kiwi 1c4b8a0a67 Merge branch 'master' into notify-on-edit 2018-01-30 18:10:47 +01:00
Kiwi e77e62236c Merge branch 'master' into fix-ie11-sideactions 2018-01-30 17:57:04 +01:00
Chi Vinh Le 3d57122a65 Add IE CSS fixes 2018-01-30 17:56:15 +01:00
Kiwi bd2c4d4bfc Merge branch 'master' into notify-on-edit 2018-01-30 17:37:15 +01:00