Commit Graph

8345 Commits

Author SHA1 Message Date
Belen Curcio a626dfafc8 Refactor Admin Side queries 2017-11-15 13:53:32 -03:00
Chi Vinh Le e02537df13 Fix mutation syntax 2017-11-15 17:53:24 +01:00
Belen Curcio b4aeee9433 Client Refactor 2017-11-15 13:21:20 -03:00
Kim Gardner 81d90cb138 Merge pull request #1161 from coralproject/break-word-2
Support long words for my and featured comments
2017-11-15 12:46:49 +00:00
Chi Vinh Le e4a359e0b4 Add mutation to framework 2017-11-15 13:38:02 +01:00
Chi Vinh Le 2882dfbadb Fix flexbox overflowing 2017-11-15 13:34:29 +01:00
Chi Vinh Le f2b9db9dbc Support long words for my and featured comments 2017-11-15 13:07:33 +01:00
Belen Curcio e8e103020c Merge branch 'user-status-refactor' of github.com:coralproject/talk into mod-improv 2017-11-14 13:54:21 -03:00
Kim Gardner c563a13e7c Merge pull request #1160 from coralproject/break-word
Break long words in comment
2017-11-14 16:31:55 +00:00
Belen Curcio ff6e41f2e1 styling 2017-11-14 13:13:02 -03:00
Belen Curcio 5976595871 Merge branch 'master' of github.com:coralproject/talk 2017-11-14 13:03:10 -03:00
Belen Curcio aabd152314 Account History 2017-11-14 13:01:13 -03:00
Belen Curcio 6a17d04570 Merge branch 'master' of github.com:coralproject/talk into mod-improv 2017-11-14 13:00:20 -03:00
Belen Curcio 32547a214b Missing proptypes 2017-11-14 11:56:23 -03:00
Chi Vinh Le 8a4a7d3589 Break long words in comment 2017-11-14 15:37:26 +01:00
Chi Vinh Le 5073e60df5 Translate 2017-11-14 14:05:30 +01:00
Chi Vinh Le 5a71db2568 Undo to previous status + Live updates 2017-11-14 13:58:18 +01:00
Kiwi ac0acea22b Merge pull request #1149 from devonJS/undo-reject
undo reject comment on stream
2017-11-14 12:49:48 +01:00
Wyatt Johnson ef40e9dce5 spelling 2017-11-13 16:08:20 -07:00
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
Wyatt Johnson ecf02f454c staff members cannot be flagged 2017-11-13 15:57:54 -07:00
Wyatt Johnson 9f823c0b11 added action counts for users 2017-11-13 15:46:49 -07:00
Belen Curcio 6198c9e730 Merge branch 'master' of github.com:coralproject/talk 2017-11-13 12:34:44 -03:00
Kiwi 9ac06281e9 Merge branch 'master' into undo-reject 2017-11-13 14:00:21 +01:00
Kim Gardner 78e5cb7aa6 Merge branch 'master' into bump-version-3-8-0 2017-11-13 12:49:47 +00:00
Kiwi 882bf57bbc Merge pull request #1152 from coralproject/user-status
More e2e tests - User Status
2017-11-10 21:16:59 +01:00
Chi Vinh Le 789fb3dfce Disable bs on this branch 2017-11-10 20:59:01 +01:00
Belen Curcio 819b1c597c refactor: working tests 2017-11-10 13:04:46 -03:00
Belen Curcio 38148ad51c Adding post animation test 2017-11-10 12:09:55 -03:00
Belen Curcio 8f6ff46244 passing suspendUserDialog to the adminPage scope 2017-11-10 11:16:35 -03:00
Belen Curcio 4727c52de4 camelCase lodash 2017-11-10 10:48:12 -03:00
Belen Curcio f461d27810 Merge branch 'master' of github.com:coralproject/talk into user-status 2017-11-10 10:46:53 -03:00
Belen Curcio fbc5a9d74b moderate 2017-11-10 10:45:26 -03:00
Belen Curcio 6ff4994d0d lodash.camelcase 2017-11-10 10:33:55 -03:00
Belen Curcio c793a840ea Merge branch 'user-status' of github.com:coralproject/talk into user-status 2017-11-10 10:27:28 -03:00
Belen Curcio ebda51dc0f Adding suspension test 2017-11-10 10:26:54 -03:00
Belen Curcio b0573749ee Adding classes and missingproptypes 2017-11-10 10:26:34 -03:00
Chi Vinh Le 933903de2f Remove IE 64bit from ci until they fix the keyboard input issues 2017-11-10 14:05:43 +01:00
Kim Gardner 4373c382e1 Merge pull request #1151 from coralproject/feature/fix-email-config-docs
Fix incorrect email configuration in docs
2017-11-10 12:02:22 +00:00
Kim Gardner af6787bc0f Merge branch 'master' into feature/fix-email-config-docs 2017-11-10 11:37:15 +00:00
Chi Vinh Le dd1fbf30ca Add navigateAndLogin 2017-11-10 10:51:30 +01:00
Chi Vinh Le a5aa59e255 Merge branch 'master' into user-status 2017-11-10 10:09:29 +01:00
Kiwi 19b8d0a6ea Merge pull request #1150 from coralproject/e2e-v2
e2e v2
2017-11-10 10:08:27 +01:00
Chi Vinh Le bcf8370359 Temporarily enable bs testing on this branch 2017-11-10 10:04:22 +01:00
Wyatt Johnson 0da0b1a37e Merge branch 'master' into feature/fix-email-config-docs 2017-11-09 16:23:24 -07:00
Wyatt Johnson 401d8a423d added emails for status changes 2017-11-09 16:07:46 -07:00
Chi Vinh Le 31ee8139b6 Use visible were suitable and wait for drawer to dissappear 2017-11-09 23:32:03 +01:00
Wyatt Johnson 51977dcf54 Merge branch 'master' into bump-version-3-8-0 2017-11-09 15:10:24 -07:00
Wyatt Johnson d80401a49b Merge branch 'next' into user-status-refactor 2017-11-09 14:59:47 -07:00