Commit Graph

4030 Commits

Author SHA1 Message Date
Belen Curcio 16eb93792b Merge branch 'master' of github.com:coralproject/talk into bugs-fix 2017-06-21 10:43:28 -03:00
Belen Curcio 1b1f2a3608 Changing moderation keys: d approve and f reject 2017-06-21 10:42:01 -03:00
Kim Gardner e2f94aa141 Merge branch 'master' into show-version-in-nav 2017-06-21 14:29:49 +01:00
Chi Vinh Le 91fa7b2d8d Show correct login error messages in admin 2017-06-21 20:24:54 +07:00
Kim Gardner 74fff2f1ac Add all stories link to story search dropdown 2017-06-21 14:14:33 +01: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 79346738d7 Have Moderate this Stream link also default to All 2017-06-21 13:01:23 +01:00
Chi Vinh Le 706a12d2e2 No MoreMore 2017-06-21 02:48:59 +07:00
Chi Vinh Le fc14e9d2fd Prevent double execution of fetchMore 2017-06-21 01:29:10 +07:00
Chi Vinh Le 49420e152e Click outside closes TopRightMenu, detect click outside iframe 2017-06-21 01:29:10 +07:00
Chi Vinh Le 644c291d7f Don't cut off long comment 2017-06-21 01:29:07 +07:00
Belen Curcio 942ea7b916 ButtonCopyToClipboard 2017-06-20 10:37:10 -03:00
Chi Vinh Le 4d53a72767 Always default to all queue 2017-06-20 20:00:00 +07:00
Chi Vinh Le 23fcba4ccc Don't show caret when logged out 2017-06-20 19:55:53 +07:00
Belen Curcio d97fb0a83f Refs by ReactDOMNode 2017-06-20 09:47:37 -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
Belen Curcio 7faa00c463 withCopyToClipboard 2017-06-20 09:05:01 -03:00
Belen Curcio d23d426567 Adding the translations 2017-06-20 08:37:53 -03:00
Belen Curcio fe8f3ae4bb Moving Copy component 2017-06-20 08:32:08 -03:00
Kim Gardner 646b5be8c8 Show version in nav 2017-06-20 10:48:01 +01:00
Kim Gardner 672e36c66c Merge branch 'master' into fixes 2017-06-20 09:54:38 +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
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
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
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
IAmSamHankins 6c5d94ec3b adjustments to letter spacing, and container positioning. 2017-06-16 16:40:17 -04:00