Commit Graph

3522 Commits

Author SHA1 Message Date
Wyatt Johnson e090ba9123 Merge branch 'next' into user-status-refactor 2017-11-13 16:06:16 -07:00
Wyatt Johnson 81f825d4b3 Merge branch 'master' into next 2017-11-13 16:01:11 -07:00
Belen Curcio 4727c52de4 camelCase lodash 2017-11-10 10:48:12 -03:00
Belen Curcio 6ff4994d0d lodash.camelcase 2017-11-10 10:33:55 -03:00
Belen Curcio b0573749ee Adding classes and missingproptypes 2017-11-10 10:26:34 -03:00
Wyatt Johnson d80401a49b Merge branch 'next' into user-status-refactor 2017-11-09 14:59:47 -07:00
Wyatt Johnson cb768d3190 Merge branch 'master' into next 2017-11-09 14:59:32 -07:00
Kiwi 9b18a78ce0 Merge branch 'master' into user-status 2017-11-09 19:20:06 +01:00
Chi Vinh Le e885178dfc Refactor 2 2017-11-09 19:03:01 +01:00
Chi Vinh Le 55e4aed511 Merge branch 'master' into user-status 2017-11-09 15:53:42 +01:00
Wyatt Johnson 18f5b0cc5e queue fix for sometimes null settings 2017-11-08 14:24:48 -07:00
Wyatt Johnson 0257e09a40 Merge branch 'next' into user-status-refactor 2017-11-08 13:52:48 -07:00
Wyatt Johnson 61df0e1eeb Merge branch 'master' into next 2017-11-08 13:49:21 -07:00
Chi Vinh Le 786e85686d Fix invalid regexp for ie 2017-11-08 18:57:06 +01:00
Belen Curcio 82e01eac00 Merge branch 'master' of github.com:coralproject/talk into user-status 2017-11-08 13:56:48 -03:00
Belen Curcio 5efdc9865f refacotr 2017-11-08 12:59:08 -03:00
Belen Curcio 54ac2985ba Adding classes 2017-11-08 12:23:29 -03:00
Belen Curcio a2470fa01b More 2017-11-07 16:43:58 -03:00
Belen Curcio 9b98e3cac9 missing classes 2017-11-07 15:20:14 -03:00
Wyatt Johnson 76a255fb7b initial pass at status support 2017-11-02 17:16:57 -06:00
Kim Gardner c0cb641df3 Merge branch 'master' into user-pending 2017-11-01 11:27:04 +00:00
Kiwi 3327604a58 Merge branch 'master' into queue_shortcuts 2017-11-01 12:04:03 +01:00
blackcathacker 903e70d641 updates per review 2017-10-31 17:10:25 -07:00
blackcathacker 21f6caa942 cleaner method chain per review 2017-10-31 16:50:35 -07:00
blackcathacker 07e6c15c3a add numbered shortcuts for mod queue 2017-10-30 23:08:33 -07:00
blackcathacker 05e91129f4 show staff instead of user badge when reported by staff 2017-10-30 22:16:59 -07:00
Kim Gardner 81c669d63f Merge branch 'master' into user-pending 2017-10-30 13:34:09 +00:00
Belen Curcio 302d30cde1 Adding missing classnames and proptypes, plus e2e testing covering userstatus 2017-10-30 08:54:32 -03:00
Belen Curcio 6d7afc7bbc Adding missing classes and props 2017-10-30 08:07:03 -03:00
Belen Curcio b6786f614e Adding missing props 2017-10-30 07:56:51 -03:00
Belen Curcio 34b58779e8 User PENDING status should not be able to post 2017-10-30 07:04:39 -03:00
blackcathacker 82a332c787 disable report button when comment already reported 2017-10-29 19:48:42 -07:00
Belen Curcio 59acdc5c02 new e2e test 2017-10-25 16:53:18 -03:00
Belen Curcio b06ae9001e Adding missing classes 2017-10-25 16:31:46 -03:00
Chi Vinh Le d472223ee3 Fix/Implement sorting for stories 2017-10-25 19:32:47 +02:00
Chi Vinh Le b4daf8fc98 Move searchValue to Redux 2017-10-25 19:19:59 +02:00
Chi Vinh Le e41c224e3d Remove unused 2017-10-25 19:14:25 +02:00
Chi Vinh Le 20b5525c48 Refactor and fix query 2017-10-25 19:07:14 +02:00
Chi Vinh Le 23da613f2b Declaratively set page 2017-10-25 18:02:18 +02:00
Chi Vinh Le df079d29bd Set current page declaratively for People 2017-10-25 17:38:58 +02:00
Kiwi e782df815b Merge branch 'master' into community-pagination- 2017-10-25 17:09:34 +02:00
Kim Gardner ed929fa2c6 Merge branch 'master' into viewing-options-bug 2017-10-25 14:32:07 +01:00
Kim Gardner 369e974a0c Merge branch 'master' into community-pagination- 2017-10-25 14:32:03 +01:00
Belen Curcio 833922f0aa Missing reference to the dropdownContainer class 2017-10-25 09:35:08 -03:00
Kiwi f6f9d380f1 Merge branch 'master' into iefixes 2017-10-25 14:22:06 +02:00
Chi Vinh Le 27eb159a75 Add special popup handling for ie 11 2017-10-25 13:04:41 +02:00
Kim Gardner b43b84acff Merge branch 'master' into community-pagination- 2017-10-24 18:05:53 +01:00
Chi Vinh Le 934b630ce2 Simplified Spinner for IE and Edge for Spinner (using css hacks) 2017-10-24 18:47:55 +02:00
Belen Curcio 812483931d ref 2017-10-24 13:13:44 -03:00
Wyatt Johnson 01c5bc4e26 Merge branch 'master' into email-verification 2017-10-24 10:09:52 -06:00