Commit Graph
1413 Commits
Author SHA1 Message Date
Belén Curcio 6d3cdb176e Merge branch 'master' into community-pagination- 2017-10-24 00:23:53 -03:00
Belen Curcio 34334b8152 Pagination only shows when there are results to show 2017-10-24 00:18:03 -03:00
Belen Curcio 0b973f24ff Replacing paginate from Stories 2017-10-24 00:14:47 -03:00
Belen Curcio abff1c763a More styling 2017-10-24 00:12:18 -03:00
Belen Curcio 9f4a913655 Passing props 2017-10-24 00:03:35 -03:00
Belen Curcio d363c977dc Refactor 2017-10-23 23:47:43 -03:00
Kim Gardner 017d560421 Merge branch 'master' into bulk-approve-reject-actions 2017-10-23 15:52:20 +01:00
Facu 9c38bab83b notify error messages 2017-10-20 17:01:52 -03:00
Chi Vinh Le bef3e3e33c Turn off notifications for flagged and edited 2017-10-20 17:19:44 +02:00
Facu 011d8830fb Merge branch 'master' into bulk-approve-reject-actions 2017-10-19 14:12:08 -03:00
Facu 4b068b22b7 Merge branch 'master' into bulk-approve-reject-actions 2017-10-17 17:10:22 -03:00
Chi Vinh Le 8cf04c5c66 Use sections for install e2e 2017-10-17 16:58:50 +07:00
Kim Gardner 606871e4b7 Merge branch 'master' into e2e-browserstack 2017-10-14 17:46:00 +01:00
Kim Gardner 20cd38e47b Merge branch 'master' into reject-rate-fix 2017-10-14 16:58:47 +01:00
Belen Curcio 887dd3825c Missing propTypes and classes 2017-10-13 21:13:59 -03:00
Belen Curcio adae679bc7 Merge branch 'e2e-browserstack' of github.com:coralproject/talk into e2e-browserstack 2017-10-13 21:12:26 -03:00
Belen Curcio bdbffba902 Missing propTypes and classes 2017-10-13 21:07:09 -03:00
Wyatt Johnson 2ec1d3fa51 Reject Rate Fixes
- Corrected query to select all statuses (default was accepted/none)
- Fixed up some missing prop-types
- Improved count code
2017-10-13 11:26:02 -06:00
Chi Vinh Le fce1d60d09 Increase contrast in viewing options 2017-10-14 00:06:18 +07:00
Belén Curcio 37148f69d5 Merge branch 'master' into dropdown 2017-10-13 13:02:56 -03:00
Chi Vinh Le 08d6eadbb7 Fix Stories Dropdown handlers 2017-10-13 22:53:53 +07:00
Facu 1660d6c1d1 Merge remote-tracking branch 'origin/master' into bulk-approve-reject-actions 2017-10-13 11:46:26 -03:00
Facu 9d36426a1b format UserDetail css 2017-10-13 11:41:47 -03:00
Belén Curcio 8e72381081 Merge branch 'master' into e2e-browserstack 2017-10-13 10:56:37 -03:00
Belen Curcio cac6eecde2 Missing propTypes and classes 2017-10-13 10:53:44 -03:00
Michael Macherey f6be48a4a8 Merge remote-tracking branch 'origin/master' into dismiss-shortcuts-help-menu 2017-10-13 14:05:04 +02:00
Facu e0e481373b bulk approve/reject actions for moderators 2017-10-12 17:59:04 -03:00
Michael Macherey 8e466befb4 Fix Shortcuts help menu doesn't dismiss forever. 2017-10-12 20:30:23 +02:00
Belen Curcio c98cb02a4a Adding dropdown to ViewOptions 2017-10-12 13:52:17 -03:00
Belen Curcio 351ebc9105 Find label based on value 2017-10-12 13:40:43 -03:00
Belen Curcio 21122016da Adding tabIndex to clickable buttons 2017-10-12 13:07:14 -03:00
Belen Curcio c9ae622ec3 merge conflicts 2017-10-12 13:00:16 -03:00
Kim Gardner 43d92e5b76 Merge branch 'master' into configure-styling-fix 2017-10-12 16:27:06 +01:00
Belen Curcio 36be112744 Keyboard accesible 2017-10-12 11:04:17 -03:00
Chi Vinh Le 3035ba0bcf Fix configure styling issues 2017-10-12 20:57:34 +07:00
Belen Curcio a7064bbfdb Adding missing proptypes and ellipsis 2017-10-12 10:29:23 -03:00
Kim Gardner a48bfbaa69 Merge branch 'master' into dropdown 2017-10-11 09:49:19 +01:00
Chi Vinh Le 7b76450eb5 Merge branch 'master' into refactor-configure
Conflicts:
	client/coral-admin/src/routes/Configure/components/Configure.css
	client/coral-admin/src/routes/Moderation/components/Moderation.js
2017-10-11 14:17:36 +07:00
Kim Gardner 4548134e3f Merge branch 'master' into dropdown 2017-10-10 18:18:34 +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
Belen Curcio 7fcc7753f8 Update 2017-10-10 12:50:31 -03:00
Belen Curcio f2ea269f7a Merge branch 'master' of github.com:coralproject/talk into dropdown 2017-10-10 12:26:29 -03:00
Kim Gardner c0a54b6538 Merge branch 'master' into viewing-options 2017-10-10 13:06:18 +01:00
Chi Vinh Le 61604a7d07 Export ConfigureCard in plugin-api 2017-10-10 17:06:45 +07:00
Chi Vinh Le dfcb9e24df Refactor components 2017-10-10 17:00:25 +07:00
Belen Curcio 7b38bac525 Stories Dropdown, Proptypes and tiny refactor 2017-10-10 03:18:28 -03:00
Belen Curcio 16847f9fec Translations and PropTypes 2017-10-10 02:48:12 -03:00
Belén Curcio 29c7c9e810 Merge branch 'master' into viewing-options 2017-10-10 00:18:03 -03:00
Chi Vinh Le 21342b8b81 Fix title styling 2017-10-09 23:56:16 +07:00