Commit Graph

4670 Commits

Author SHA1 Message Date
Chi Vinh Le f709057933 Require username to be different when editing it 2017-06-21 21:18:28 +07:00
Chi Vinh Le 6628e6d08d Correctly handle login with mixed case email 2017-06-21 20:34:33 +07:00
Chi Vinh Le 91fa7b2d8d Show correct login error messages in admin 2017-06-21 20:24:54 +07:00
Chi Vinh Le 4b063607ab Return the returns 2017-06-21 20:04:38 +07:00
Chi Vinh Le 9b26bc9d96 Fix Typo 2017-06-21 19:53:00 +07:00
Chi Vinh Le 38eaff5397 Don't render title when it's null 2017-06-21 19:41:22 +07:00
Chi Vinh Le 420513804c Show correct notification message when edit fails 2017-06-21 19:37:19 +07:00
Chi Vinh Le b0079c191b Remove non existant 'truthy' tests 2017-06-21 19:31:55 +07:00
Chi Vinh Le 9815248b8d Prevent errors being swallowed 2017-06-21 19:17:48 +07:00
Kim Gardner e16553419d Merge pull request #686 from coralproject/subscribe-mod-actions
Mod Queue Live Updates
2017-06-21 12:24:32 +01:00
Kiwi 40d7500a75 Merge branch 'master' into subscribe-mod-actions 2017-06-20 21:12:09 +07:00
Kim Gardner 3d27c4538a Merge pull request #691 from coralproject/bump-version-2-1-0
Bump version 2.1.0
2017-06-20 14:51:36 +01:00
Belén Curcio 679c6ce335 Merge branch 'master' into bump-version-2-1-0 2017-06-20 09:52:26 -03:00
Belén Curcio 71d2d0ab10 Merge pull request #692 from coralproject/update-readme
Update README
2017-06-20 09:52:14 -03:00
Chi Vinh Le 14311dc298 Merge branch 'master' into subscribe-mod-actions
Conflicts:
	client/coral-admin/src/routes/Moderation/components/Comment.js
2017-06-20 19:34:56 +07:00
Kim Gardner ea12c07cd4 Update README 2017-06-20 10:29:39 +01:00
Kim Gardner dca759a5e0 Bump version 2.1.0 2017-06-20 10:02:10 +01:00
Kim Gardner 018b35e42a Merge pull request #688 from coralproject/fixes
Bug-Fixes
2017-06-20 09:59:00 +01:00
Kim Gardner 672e36c66c Merge branch 'master' into fixes 2017-06-20 09:54:38 +01:00
Kim Gardner b3db231f09 Merge pull request #689 from coralproject/keyboard-shortcuts
Keyboard shortcuts
2017-06-20 09:53:49 +01:00
Kim Gardner 38a53d61f3 Merge branch 'master' into fixes 2017-06-20 09:53:24 +01:00
Kim Gardner fc15bcae4e Merge branch 'master' into keyboard-shortcuts 2017-06-20 09:46:04 +01:00
Kim Gardner 6959699ecc Merge pull request #690 from coralproject/admin-links
Settings Cog Links
2017-06-20 09:45:44 +01:00
Belen Curcio 99bb4b7198 New Links 2017-06-19 18:09:38 -03:00
Belen Curcio 12a5654fb8 Keyboard shorcuts working 2017-06-19 17:48:20 -03:00
Belen Curcio dad6534011 Fix close modal 2017-06-19 17:26:57 -03:00
Belen Curcio c36a0bc9e9 d approve and f reject 2017-06-19 17:23:57 -03:00
Belen Curcio 30a385e03b Linting 2017-06-19 17:09:49 -03:00
Belen Curcio 16ef833fd8 Ádding Copy component, and UserDetail fic 2017-06-19 16:17:50 -03:00
Chi Vinh Le 523f23269b Translate, pep up notifications 2017-06-20 01:38:38 +07:00
Kiwi 8dbc17c8d9 Merge branch 'master' into subscribe-mod-actions 2017-06-20 01:12:54 +07:00
Chi Vinh Le b8967dcdb4 More accurate loading detection 2017-06-20 01:09:37 +07:00
Chi Vinh Le 70276c3358 Fix subscription issues 2017-06-20 01:01:39 +07:00
Belen Curcio 1f2eca300a Report vbox 2017-06-19 14:55:58 -03:00
Belen Curcio 3c99b8e7fb Sign In Button Position 2017-06-19 14:35:26 -03:00
Belen Curcio 073fccebd3 Show likes 2017-06-19 14:30:56 -03:00
Belén Curcio 13e311de7f Merge pull request #684 from coralproject/action-focus-states
Action focus states
2017-06-19 14:09:22 -03:00
Belen Curcio cf93727f73 Merge branch 'master' of github.com:coralproject/talk into action-focus-states 2017-06-19 14:03:07 -03:00
Chi Vinh Le fbbd0fa027 Merge branch 'master' into subscribe-mod-actions
Conflicts:
	client/coral-admin/src/routes/Moderation/components/Moderation.js
	client/coral-admin/src/routes/Moderation/components/styles.css
	client/coral-admin/src/routes/Moderation/containers/Moderation.js
2017-06-19 23:52:10 +07:00
Kim Gardner 332679a7bc Merge pull request #680 from coralproject/search-stories
Search stories
2017-06-19 17:44:16 +01:00
Chi Vinh Le 0cd3921f44 Simplification 2017-06-19 21:29:33 +07:00
Chi Vinh Le f954d2be90 Better loading detection 2017-06-19 21:23:30 +07:00
Chi Vinh Le 2a28306ab2 Merge branch 'master' into subscribe-mod-actions 2017-06-19 21:17:33 +07:00
Chi Vinh Le e1bc1476ea Remove the need for querying all assets 2017-06-19 21:08:12 +07:00
Chi Vinh Le 853c1e407e Simplify args 2017-06-19 21:08:12 +07:00
Belen Curcio 77fddba841 removing overflow hidden 2017-06-19 11:05:16 -03:00
David Erwin 17d36c69d0 Merge branch 'master' into action-focus-states 2017-06-19 09:23:40 -04:00
Belén Curcio 1cf6161b06 Merge branch 'master' into search-stories 2017-06-18 20:14:35 -03:00
Andrew Losowsky 9ef7544788 Merge pull request #685 from coralproject/bump-version-2-0-1
Update version number
2017-06-16 17:41:51 -04:00
Kim Gardner dfccf962d4 Update version number 2017-06-16 17:30:09 -04:00