Commit Graph

4275 Commits

Author SHA1 Message Date
Wyatt Johnson b4e2712dfb Merge branch 'master' into fix_translation_staff 2018-04-19 08:59:29 -06:00
Tibo Beijen 43fa0d2b58 Added translation to staff label in comment stream. 2018-04-19 10:43:41 +02:00
Kim Gardner 06c2f328d1 Merge branch 'master' into fix-view-context-system-withheld 2018-04-18 16:44:08 -04:00
Kim Gardner 6d2c4d215d Merge branch 'master' into 155910162 2018-04-18 16:09:06 -04:00
Kim Gardner c4cbefeb81 Change to UserHistory in UserDetail.js 2018-04-18 16:02:39 -04:00
Kim Gardner d822d8343a Merge branch 'master' into 155836892 2018-04-18 15:54:07 -04:00
Kim Gardner 3e8abf554e Merge branch 'master' into 155910162 2018-04-18 15:35:21 -04:00
Clint Brown 3ae1051148 Add system withheld status to InactiveCommentLabel 2018-04-18 07:55:11 +10:00
Wyatt Johnson a257fdb623 removed deprecated not logged in ui for profile tab 2018-04-17 13:23:02 -06:00
Wyatt Johnson a6344d8e71 fixed proptype missing validation 2018-04-17 13:19:03 -06:00
Wyatt Johnson ec54db58dd Merge branch 'master' into no-tabs-logged-out 2018-04-17 13:11:32 -06:00
Belén Curcio d17c704f38 Merge branch 'master' into server-jest 2018-04-17 13:01:19 -03:00
Belén Curcio 1f719e3aa5 Merge branch 'master' into 155836892 2018-04-13 12:52:28 -03:00
Kit Westneat e5a2152cfd don't show profile tab if user is logged out 2018-04-12 17:52:49 -04:00
Wyatt Johnson bb11de562f Removed storage check 2018-04-12 13:24:56 -06:00
Wyatt Johnson 5125bb5d2d logic cleanup 2018-04-12 13:22:20 -06:00
Wyatt Johnson 1c87181b17 cleanups around storageAccess 2018-04-12 12:58:30 -06:00
Wyatt Johnson 142f463211 Storage Fixes
- Implements storage fixes (fixes #1520)
- Implements updates to locale
2018-04-12 12:47:09 -06:00
Wyatt Johnson 8042083f6c Merge branch 'master' into autocomplete-off 2018-04-12 10:46:04 -06:00
Wyatt Johnson 86385e0d86 Jest for server
- Introduced the Jest testing framework into our server side code so
plugins can now have tests that run
2018-04-11 19:02:38 -06:00
Wyatt Johnson edfe60b8e0 removed unused coral-docs 2018-04-10 15:52:10 -06:00
okbel 3fcad35492 autocomplete off 2018-04-09 16:27:02 -03:00
Belén Curcio f27c41b83c Merge branch 'master' into 155836892 2018-04-08 21:18:46 -03:00
okbel 9bbcb6a073 wip - inconcistencies with cache, considering refetching 2018-04-06 18:39:23 -03:00
okbel 48bfc2699b Merge branch 'master' of github.com:coralproject/talk into 155836892
* 'master' of github.com:coralproject/talk:
  PropTypes
  Removin actions, using routes, and continuing the transition when the user makes an action
  Adding size, and proptypes
  IfSlotIsNotEmpty Bug
  Style and translations
  SaveChangesDialog
  Spanish translations
  Adding translations
  alert route hook ready!
  Restore Links
  Save changes / discard changes dialohg
  router and state lifted
  routes
2018-04-06 17:59:25 -03:00
Belén Curcio cfe5b12abd Merge branch 'master' into safari-auth 2018-04-06 17:56:30 -03:00
Belén Curcio 2f7f6f4f53 Merge branch 'master' into #156312019 2018-04-05 17:27:44 -03:00
okbel f77493afb1 Merge branch '#156312019' of github.com:coralproject/talk into #156312019
* '#156312019' of github.com:coralproject/talk:
  IfSlotIsNotEmpty Bug
  allow plugin code from clients to be parsed by webpack
  Restore Links
  fix install buttons - making the click area bigger
  Scraper improvements
2018-04-05 17:25:30 -03:00
okbel 793b473681 PropTypes 2018-04-05 17:25:00 -03:00
okbel ad56d3b99a Removin actions, using routes, and continuing the transition when the user makes an action 2018-04-05 17:24:11 -03:00
Wyatt Johnson e6b8cd3220 fixes related to external auth 2018-04-05 14:19:11 -06:00
Wyatt Johnson ee163af833 Merge branch 'master' into slot-bug 2018-04-05 11:19:59 -06:00
Wyatt Johnson 8ec933e844 Merge branch 'master' into #156312019 2018-04-04 09:32:48 -06:00
okbel 0b6b85b2a5 Removing logs 2018-04-04 07:37:27 -03:00
okbel a6a0b3e931 Removing reloads 2018-04-04 07:33:50 -03:00
okbel 06f8926964 Avoiding refetching 2018-04-04 07:25:47 -03:00
okbel edbe49618a Adding size, and proptypes 2018-04-03 20:17:31 -03:00
okbel ef10ab8088 Renaming components and styles 2018-04-03 11:20:22 -03:00
okbel 1a39727e38 account history to user history 2018-04-03 10:29:07 -03:00
okbel c448d8d2cd Merge branch '#156312019' of github.com:coralproject/talk into #156312019
* '#156312019' of github.com:coralproject/talk:
  Removing plugin
  Removing plugin
  renaming slot :D
  renaming
  Remaining rename
  Give descriptive key for slot elements and use it instead of talkPluginName
  Styling
  adding it back
  re entering
  Ignoring
  with hasBlockers
  changes
  Styling and translations
  Adding checkbox, working on the translations
  wip
  Working on containers
  Removing styles from sign in
2018-04-03 10:23:12 -03:00
Wyatt Johnson fb3233cf01 IfSlotIsNotEmpty Bug 2018-04-02 17:01:49 -06:00
okbel e4358ac3a1 Style and translations 2018-04-02 16:09:47 -03:00
Belén Curcio 7720f1d178 Merge branch 'master' into #156312019 2018-04-02 14:38:21 -03:00
Kim Gardner 533cd3217d Merge branch 'master' into fix-install 2018-04-02 13:37:12 -04:00
okbel d16ce17e36 SaveChangesDialog 2018-04-02 14:35:09 -03:00
okbel 4ed04d1c39 Adding translations 2018-04-02 14:12:02 -03:00
okbel a509405f43 alert route hook ready! 2018-04-02 13:33:50 -03:00
okbel 394ebb8f2d Save changes / discard changes dialohg 2018-03-30 12:18:57 -03:00
okbel 6982509233 router and state lifted 2018-03-30 12:00:50 -03:00
okbel 06b64ad250 routes 2018-03-30 10:55:15 -03:00