Commit Graph

3340 Commits

Author SHA1 Message Date
Kim Gardner 764d562497 Merge branch 'master' into ReadersNotifications 2017-10-10 18:18:58 +01:00
Belen Curcio 0d66e42313 Merge branch 'viewing-options' of github.com:coralproject/talk into viewing-options 2017-10-10 13:16:37 -03:00
Belen Curcio 154949ff47 Update 2017-10-10 13:12:55 -03:00
Kim Gardner 6a2b6bb845 Merge branch 'master' into ReadersNotifications 2017-10-10 13:07:37 +01:00
Kim Gardner c0a54b6538 Merge branch 'master' into viewing-options 2017-10-10 13:06:18 +01:00
Belén Curcio 29c7c9e810 Merge branch 'master' into viewing-options 2017-10-10 00:18:03 -03:00
PepeFranco c81d9c0bd1 Added notifications when flagging failed 2017-10-09 21:59:47 -05:00
Tyler Brewer 48c291a9c3 Merge branch 'master' into fix-shortcut-icon 2017-10-09 11:01:26 -04:00
Gerardo Galvez e4ff48ea88 Merge branch 'moderate-shortcuts' of https://github.com/gerardogalvez/talk into moderate-shortcuts 2017-10-06 20:20:48 -05:00
Gerardo Galvez cbd7337dbc Add spanish translations and cleaner way to get the activeTabIndex 2017-10-06 20:19:30 -05:00
Belén Curcio c7bf3c1a3c Merge branch 'master' into moderate-shortcuts 2017-10-06 18:07:30 -03:00
Tyler Brewer bb78ba9b0b Merge branch 'master' into fix-shortcut-icon 2017-10-06 16:09:59 -04:00
kamos1 e95e0381c2 remove removeNewLine and add .trim to length variable 2017-10-06 13:25:32 -06:00
kamos1 8ab31d7009 add trim to prevent empty spaces, tabs and other whitespace characters 2017-10-06 13:19:37 -06:00
kamos1 57f8a64cf4 fix issue 1037 2017-10-06 12:24:58 -06:00
Kim Gardner 387316849a Merge branch 'master' into moderate-shortcuts 2017-10-06 17:34:46 +01:00
Kim Gardner 26c1d22ec3 Merge branch 'master' into fix-shortcut-icon 2017-10-06 17:30:28 +01:00
Belen Curcio dbe6e675c9 Modal Keys should show on tablet 2017-10-06 13:02:18 -03:00
Belen Curcio 0f6bbb21a3 Fix drawer too 2017-10-06 11:05:38 -03:00
Belen Curcio c2cbf91cad Merge branch 'master' of github.com:coralproject/talk into viewing-options 2017-10-06 11:02:46 -03:00
Belen Curcio fe689c5888 Margin Top 2017-10-06 10:52:16 -03:00
Belen Curcio e1f5fe1f77 Responsive Ready 2017-10-06 10:50:48 -03:00
Belen Curcio 848c04539c Select working 2017-10-06 10:35:04 -03:00
Belen Curcio e4b225b4c2 ViewingOptions, Cards, Proptypes and MediaQueries 2017-10-06 10:10:08 -03:00
tylerbrewer2 a4591ecb55 fix hidden shortcut icon 2017-10-05 20:51:54 -04:00
Gerardo Gálvez 931b5ad3ac Merge branch 'master' into moderate-shortcuts 2017-10-05 17:18:18 -05:00
Gerardo Galvez c0bb5e5cb2 Add moderator shortcuts to open search and switch between queues. 2017-10-05 16:57:46 -05:00
Rishabh04-02 f1bad9e8f2 modifications - displaying time
modifications in displaying like X minutes Y seconds
2017-10-05 23:07:51 +05:30
Kim Gardner bc0a188c57 Merge branch 'master' into master 2017-10-05 17:06:41 +01:00
Belen Curcio 886df1cdca Now every section is full width :D 2017-10-05 08:21:17 -03:00
Belen Curcio 91a25fc3c1 max-width 2017-10-05 08:00:08 -03:00
Belén Curcio 474a3a12ef Merge branch 'master' into master 2017-10-05 07:34:49 -03:00
Belén Curcio 9b9e9c0292 Merge branch 'master' into fix-nav-width 2017-10-05 07:34:04 -03:00
Belén Curcio c72dfdddf3 Merge branch 'master' into max-resize-other-box 2017-10-05 07:25:09 -03:00
Kim Gardner ec74262089 Merge branch 'master' into fix-nav-width 2017-10-05 10:53:43 +01:00
Rishabh04-02 b3486ce614 displaying time in X minutes Y seconds 2017-10-05 10:48:12 +05:30
tylerbrewer2 85f9000a64 fix admin navigation width 2017-10-04 20:22:39 -04:00
PepeFranco 8d6f79ab79 Fixed typo from LAN to LANG 2017-10-04 16:16:07 -05:00
PepeFranco 841ab53ea7 Added env variable TALK_DEFAULT_LAN 2017-10-04 15:42:02 -05:00
Lance Ruegger 5147ca6b86 Add a max-width to the flag-reason text box to prevent cutoff 2017-10-04 11:04:47 -07:00
Wyatt Johnson 074fbca231 Revert "Revert "Es6 modules + tree shaking"" 2017-10-03 14:54:08 -06:00
Wyatt Johnson b5ab829f9b Revert "Es6 modules + tree shaking" 2017-10-03 14:36:36 -06:00
Chi Vinh Le 52595bb3f8 Merge branch 'master' into jest-unit-test 2017-10-03 22:48:14 +07:00
Kiwi 8b39613148 Merge branch 'master' into es6-modules-tree-shaking 2017-10-03 17:39:06 +02:00
Chi Vinh Le 79d312df50 Fix styling of edited marker 2017-10-03 22:25:37 +07:00
Chi Vinh Le 33920afc74 Port form chai to jest 2017-10-03 21:54:15 +07:00
Chi Vinh Le bd83e9e118 Add first Snapshot testing 2017-10-03 21:31:10 +07:00
Chi Vinh Le c1f7ef4f32 Introduce Jest Unit Testing framework 2017-10-03 21:08:02 +07:00
Kiwi d07c7de292 Merge branch 'master' into es6-modules-tree-shaking 2017-10-03 15:52:10 +02:00
Chi Vinh Le 942b65648b Adapt plugins-loader to es6 2017-10-03 20:43:19 +07:00