wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-06-30 09:42:04 +08:00
Code Issues Packages Projects Releases Wiki Activity
4,512 Commits 10 Branches 125 Tags
09d74e8fd6fca67c032c6fdfdb07679bf77e1020
Commit Graph

2470 Commits

Author SHA1 Message Date
Kiwi 8d24dcd58d Merge branch 'master' into port-perm-checks 2017-06-09 17:49:18 +07:00
Chi Vinh Le c7ca3c5e4a Reset websocket after successful login 2017-06-09 17:26:42 +07:00
Kiwi 66c9e0e232 Merge branch 'master' into port-perm-checks 2017-06-09 16:59:48 +07:00
Wyatt Johnson 140f980c14 Merge branch 'master' into subscription-fixes 2017-06-08 15:09:37 -06:00
Wyatt Johnson 32708e9098 submscription fixes 2017-06-08 15:08:18 -06:00
Chi Vinh Le 428246cbe2 Make it work without iframe 2017-06-09 01:16:39 +07:00
Chi Vinh Le 1153c52c2c Correct optimistic response 2017-06-09 00:31:29 +07:00
Chi Vinh Le 995dd9fd60 Correct fragment names 2017-06-09 00:31:19 +07:00
Chi Vinh Le 57747e8f13 Make mutations extendable 2017-06-09 00:22:58 +07:00
Chi Vinh Le 9b839b76f5 Don't assume response name pattern 2017-06-08 23:55:37 +07:00
Belen Curcio 283c13fae8 Ádding typenames to update the store 2017-06-08 12:43:02 -03:00
Belen Curcio 8d5085b7a3 Merge branch 'master' of github.com:coralproject/talk into 142993479-tags 2017-06-08 12:39:10 -03:00
Belen Curcio f6798af74d Lint 2017-06-08 12:37:37 -03:00
Belen Curcio 1f261f5216 Fully working 2017-06-08 12:35:42 -03:00
Kim Gardner 177edf8ed8 Merge branch 'master' into port-perm-checks 2017-06-08 11:10:05 -04:00
Belen Curcio 82a72e506f Off-topic and Staff working 2017-06-08 12:04:33 -03:00
Belen Curcio 15b5dc2236 Linting 2017-06-08 11:58:38 -03:00
Belen Curcio 38077cf3cf Missing fragment 2017-06-08 11:56:38 -03:00
Belen Curcio ef43ba3a35 new merge conflicts to master 2017-06-08 11:55:06 -03:00
Chi Vinh Le d61ede2396 Fix bugs related to reply box 2017-06-08 18:44:07 +07:00
Chi Vinh Le fb39446c6a Port perm checks to the new framework 2017-06-08 18:28:46 +07:00
Kim Gardner 801d0a92af Merge branch 'master' into comment-stream-cleanup 2017-06-07 17:07:39 -04:00
Belen Curcio 63a35cbceb Merge issues 2017-06-07 16:38:36 -03:00
Kim Gardner 14a35033da Merge branch 'master' into comment-stream-cleanup 2017-06-07 14:33:29 -04:00
Chi Vinh Le 4e56406c37 Fix tabsize in css 2017-06-08 00:49:18 +07:00
Chi Vinh Le 66e4f02a1a Selectors, resolving merge errors, better class names, removing comment reducer 2017-06-08 00:29:05 +07:00
IAmSamHankins c3d76c6a4f messaging style updates, and update to translation files. 2017-06-07 12:55:40 -04:00
Belen Curcio c8534a91a6 Merge branch 'off-topic-features' of github.com:coralproject/talk into off-topic-features 2017-06-07 13:53:54 -03:00
Belen Curcio 87ddfea689 indexes css 2017-06-07 13:53:33 -03:00
Belén Curcio 830441c531 Merge branch 'master' into off-topic-features 2017-06-07 13:24:58 -03:00
Belen Curcio 847a30ff92 Adding correct classNames 2017-06-07 13:19:36 -03:00
Riley Davis 9f4df35c3a percents have to be multiplied by 100 2017-06-07 10:15:50 -06:00
Belen Curcio f6ad9c9373 Adding camelcase for plugin reducers 🎉 <3 2017-06-07 13:14:52 -03:00
Belen Curcio 8872248d63 Addiing Stable API Architecture 2017-06-07 13:10:17 -03:00
Chi Vinh Le 7a2fd95eca Merge branch 'master' into off-topic-features 
Conflicts:
	client/coral-embed-stream/src/components/Comment.css
	client/coral-embed-stream/src/components/Comment.js
	client/coral-embed-stream/src/components/Stream.js
	client/coral-embed-stream/src/reducers/index.js
	client/coral-framework/helpers/plugins.js
 2017-06-07 22:37:06 +07:00
Belen Curcio d7dfae89a3 Global classNames, and more 2017-06-07 12:05:53 -03:00
Belen Curcio 4725f07757 Viewing Options state and name conventions 2017-06-07 09:53:53 -03:00
Belen Curcio e24f6ca9f1 Renaming to commentClassNames 2017-06-07 09:28:12 -03:00
Chi Vinh Le ceb99cf205 Better refetch detection 2017-06-07 17:45:33 +07:00
Belen Curcio b5c9e92cc6 Adding streamBox slot and coral-plugin-viewing-options 🎉 2017-06-06 20:42:42 -03:00
IAmSamHankins cc76517ba8 minor copy changes in Configure tab on stream, and style updates to banned user message on stream 2017-06-06 17:37:14 -04:00
Belen Curcio 6f909c3451 Containers and Components structure 2017-06-06 18:21:03 -03:00
Riley Davis 2384ae4baa move edit comment config 2017-06-06 14:49:07 -06:00
Belen Curcio 1c7ad9a8ac Plugin reducers working again with reducer name 2017-06-06 17:29:56 -03:00
Belen Curcio c3360aa020 Plugin reducers working again 2017-06-06 17:23:35 -03:00
Belen Curcio 4aa7900769 Not connecting comment Component to the Store 2017-06-06 17:09:13 -03:00
Riley Davis 8af0d929c2 Merge branch 'master' into bulk-actions 2017-06-06 13:15:04 -06:00
Riley Davis 4e19d5eecf don't have functions re-created every render 2017-06-06 13:11:31 -06:00
Riley Davis 5465563856 reload and clear selections 2017-06-06 12:52:26 -06:00
Belen Curcio b5a64bd2f9 Filter State 2017-06-06 15:45:56 -03:00