Commit Graph

6735 Commits

Author SHA1 Message Date
Kim Gardner 94d253fdbc Merge branch 'master' into bulk-approve-reject-actions 2017-10-18 14:18:41 +01:00
Kim Gardner 82d0d427ec Merge pull request #1101 from coralproject/bump-version-3-7-0
Update version 3.7.0
2017-10-18 11:12:47 +01:00
Facu 4b068b22b7 Merge branch 'master' into bulk-approve-reject-actions 2017-10-17 17:10:22 -03:00
Kim Gardner 840f3f7145 Merge branch 'master' into bump-version-3-7-0 2017-10-14 17:46:21 +01:00
Kim Gardner 1a8f954707 Merge pull request #1106 from coralproject/reject-rate-fix
Reject Rate Fixes
2017-10-14 17:09:05 +01:00
Kim Gardner 20cd38e47b Merge branch 'master' into reject-rate-fix 2017-10-14 16:58:47 +01: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
Kiwi 93f2c95700 Merge pull request #1082 from coralproject/dropdown
Dropdown and Option Component
2017-10-13 19:11:48 +02:00
Chi Vinh Le fce1d60d09 Increase contrast in viewing options 2017-10-14 00:06:18 +07:00
Chi Vinh Le f9967dbc48 Increase focus contrast 2017-10-13 23:47:53 +07:00
Chi Vinh Le 4fdb2d5af6 Merge branch 'dropdown' of ssh://github.com/coralproject/talk into dropdown 2017-10-13 23:22:59 +07:00
Chi Vinh Le 00512bfaf0 Support arrow keys 2017-10-13 23:22:07 +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
Chi Vinh Le 10cba651e6 Better accessbility 2017-10-13 22:39: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
Kim Gardner 3efd86a4cb Update version 3.7.0 2017-10-13 14:38:34 +01:00
Kiwi 299b083816 Merge pull request #1091 from Goyapa/dismiss-shortcuts-help-menu
Fix Shortcuts help menu doesn't dismiss forever.
2017-10-13 15:21:58 +02:00
Kiwi 7d2a0cf7cc Merge branch 'master' into dismiss-shortcuts-help-menu 2017-10-13 15:16:48 +02:00
Michael Macherey f6be48a4a8 Merge remote-tracking branch 'origin/master' into dismiss-shortcuts-help-menu 2017-10-13 14:05:04 +02:00
Michael Macherey 2dcab1fb12 add noop function, handle undefined 2017-10-13 14:00:28 +02:00
Belen Curcio 8f3aa789f5 Merge branch 'dropdown' of github.com:coralproject/talk into dropdown 2017-10-13 08:04:05 -03:00
Belen Curcio be6b1466c6 render label 2017-10-13 08:03:47 -03:00
Belén Curcio 7fd09c3534 Merge branch 'master' into dropdown 2017-10-13 07:59:17 -03:00
Kiwi 8102ef7157 Merge pull request #1078 from dagjaneiro/cannot-ignore-staff
Cannot ignore staff members
2017-10-13 12:57:02 +02:00
Kiwi 1edf320779 Merge branch 'master' into cannot-ignore-staff 2017-10-13 12:47:55 +02:00
Kiwi d8a443e790 Merge pull request #1100 from coralproject/fix-withMutation-hoc
Prevent calling updators when there is an error
2017-10-13 12:44:40 +02:00
Chi Vinh Le 2fd7829b88 Prevent calling updators when there is an error 2017-10-13 17:33:59 +07:00
Daniel Janeiro 27c6d830d9 Remove error handling code
Remove error handling code since the withMutation HoC already handles
errors for us.
2017-10-13 01:13:53 +01:00
Wyatt Johnson 5e74a044f3 Merge branch 'master' into cannot-ignore-staff 2017-10-12 15:38:18 -06: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 27ef2ad0d4 Find label based on value 2017-10-12 13:33:18 -03:00
Belen Curcio 798acaf320 Support for Keyboard and Accesibility 2017-10-12 13:18:07 -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 987acb64f5 Merge pull request #1097 from coralproject/configure-styling-fix
Fix configure styling issues
2017-10-12 16:51:43 +01:00
Kim Gardner 43d92e5b76 Merge branch 'master' into configure-styling-fix 2017-10-12 16:27:06 +01:00
Kim Gardner 618b8b5135 Merge pull request #1096 from coralproject/long-usernames
Handle really long usernames in Community > People page
2017-10-12 16:06:26 +01:00
Belen Curcio 36be112744 Keyboard accesible 2017-10-12 11:04:17 -03:00
Kiwi caac76bb3f Merge branch 'master' into configure-styling-fix 2017-10-12 16:04:07 +02:00
Chi Vinh Le 3035ba0bcf Fix configure styling issues 2017-10-12 20:57:34 +07:00
Belén Curcio 562586c130 Merge branch 'master' into long-usernames 2017-10-12 10:32:02 -03:00
Belen Curcio a7064bbfdb Adding missing proptypes and ellipsis 2017-10-12 10:29:23 -03:00
Kim Gardner 1b30327fe0 Merge pull request #1094 from coralproject/change-flagged-usernames-copy
Flagged Usernames --> Reported Usernames
2017-10-12 14:24:49 +01:00
Kim Gardner e1f7d1da99 Merge branch 'master' into change-flagged-usernames-copy 2017-10-12 14:17:35 +01:00
Kim Gardner bbfb4c8ae0 Merge pull request #1095 from coralproject/fix-typo
Fix some typos, copy, styling in Docs
2017-10-12 14:17:25 +01:00