wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-15 11:26:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,677 Commits 10 Branches 125 Tags
3beb62f837fca4fdcd8ccdd9ce304719508fba76
Commit Graph
2567 Commits
Author SHA1 Message Date
Chi Vinh Le 3beb62f837 Merge branch 'master' into bug-killing-spree 
Conflicts:
	client/coral-admin/src/routes/Moderation/components/UserDetail.js
 2017-06-21 21:47:01 +07:00
Chi Vinh Le 57ecba6f33 Remove unessecary binds 2017-06-21 21:36:27 +07:00
Kim GardnerandGitHub e2f94aa141 Merge branch 'master' into show-version-in-nav 2017-06-21 14:29:49 +01:00
Kim Gardner 74fff2f1ac Add all stories link to story search dropdown 2017-06-21 14:14:33 +01: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
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
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 646b5be8c8 Show version in nav 2017-06-20 10:48:01 +01:00
Kim GardnerandGitHub 672e36c66c Merge branch 'master' into fixes 2017-06-20 09:54:38 +01:00
Kim GardnerandGitHub 38a53d61f3 Merge branch 'master' into fixes 2017-06-20 09:53:24 +01:00
Kim GardnerandGitHub 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
KiwiandGitHub 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
IAmSamHankins e7eb300e12 search input box styling 2017-06-16 15:47:45 -04:00
IAmSamHankins 614f31d0da styling of search results bar 2017-06-16 15:39:24 -04:00
Belen Curcio 367c570747 ModQueue query 2017-06-16 16:21:39 -03:00
Samantha HankinsandGitHub 4ce38d429e Merge branch 'master' into action-focus-states 2017-06-16 15:06:11 -04:00
IAmSamHankins dcee2a4438 adjust comment stream sizing to allow for chrome focus state 2017-06-16 15:00:42 -04:00
Belen Curcio 4403decbe9 Handling dropdown on Esc <3 2017-06-16 15:50:58 -03:00
Belen Curcio e30d5a9c62 Sizing 2017-06-16 15:41:32 -03:00
Belen Curcio fe94a5a6d1 Limit 10 2017-06-16 15:08:10 -03:00
Belén CurcioandGitHub f0b6679141 Merge branch 'master' into search-stories 2017-06-16 14:50:05 -03:00
Max Eddy 64174b97af Cleanup 2017-06-16 13:04:27 -04:00
Max Eddy fe0c581ea9 Note logout action as well for onAuthChanged event. 2017-06-16 13:04:27 -04:00
Max Eddy 4982d8a9ad Use REST API result for check login message. 2017-06-16 13:04:27 -04:00