wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-23 13:10:20 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,561 Commits 10 Branches 125 Tags
71f219c0c4e8c789cd850d3b88fc75fa3dadcac6
Commit Graph
96 Commits
Author SHA1 Message Date
Belen Curcio 3640a93a2f Changes 2017-01-17 16:25:47 -03:00
Belen Curcio e69262c665 Community Section Ready 2017-01-13 17:11:46 -03:00
Belen Curcio 9876e04454 Ban User box 2017-01-13 13:54:45 -03:00
Belen Curcio 4a4affad70 More Design Tweaks 2017-01-12 09:16:23 -03:00
Belen Curcio 3a510168d3 design progress 2017-01-10 16:12:15 -03:00
Belen Curcio ca369dcb4a Header version 2017-01-10 12:01:48 -03:00
Belen Curcio a4e6638217 Tab bar, removing extra mdl js. It adds more events 2017-01-10 10:55:03 -03:00
Belen Curcio be293a03de Header 2017-01-09 19:17:21 -03:00
Belen Curcio 4f4ecd8dfb header 2017-01-09 18:07:02 -03:00
Belen Curcio 1acc92a1f2 Header Changes 2017-01-09 12:45:41 -03:00
Wyatt Johnson 4eb7c72ae2 Merge branch 'master' into email-confirm 2017-01-05 18:45:06 -07:00
gaba e2a032d4a5 Merge branch 'master' into csrf 2017-01-03 16:25:05 -03:00
gaba 950340d5e7 Fix lint. 2017-01-03 15:18:39 -03:00
Riley Davis a1def6f950 missing state for the wordlist. 2017-01-03 10:33:25 -07:00
Dan Zajdband 759e74a88d coral-admin: Fixed check for component unmount removing a listener when there is no object 2017-01-03 10:46:55 -03:00
gaba 111e83a1e6 Removes plugin csrf 2017-01-03 08:41:28 -03:00
gaba 8e6aa23d32 More CSRF in front-end. 2016-12-23 13:07:16 -08:00
gaba ec3e9d1cd4 Merge branch 'master' into csrf 2016-12-22 14:23:01 -08:00
gaba 54d0096dd1 More CSRF in forms. 2016-12-22 14:17:09 -08:00
Riley Davis 9d1d109ec0 Merge branch 'master' 
Conflicts:
	client/coral-admin/src/reducers/index.js
 2016-12-22 12:28:55 -07:00
riley f5b8c0bbba fix lint 2016-12-21 11:19:17 -07:00
David Jay a490aaeaf0 Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-20 17:02:24 -08:00
Riley Davis 9315337ce6 suspect words are marked up 2016-12-20 16:56:16 -07:00
Riley Davis ef0055e689 highlight suspect words 2016-12-20 16:42:16 -07:00
Riley Davis 652a41971b Merge branch 'master' 
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
 2016-12-20 14:51:36 -07:00
Riley Davis 11d8b2cd91 update a comment's status 2016-12-20 12:39:57 -07:00
Riley Davis 8849dcbf5c add propTypes to CommentList 2016-12-20 10:29:49 -07:00
David Jay 4d508f6afa Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-19 13:41:43 -05:00
Belen Curcio f52a1668b0 Test logouts and approves after commenting 2016-12-18 19:07:31 -03:00
Wyatt Johnson 7f12741c13 added comments to linter 2016-12-16 16:46:15 -07:00
David Jay 8f1a6a777c Merge branch 'master' of github.com:coralproject/talk into admin-asset-list 2016-12-16 17:22:32 -05:00
Dan ZajdbandandGitHub decdfad39b Adding show shortcuts button and minor fixes (#177) 
* Adding show shortcuts button and minor fixes

* Lint

* Unwrapping the showComments method
 2016-12-16 12:32:09 -05:00
David Jay fe2487dea5 Add streams option and sidebar. 2016-12-14 15:02:26 -05:00
Riley Davis 7bfd9e2e71 remove lodash implementation 2016-12-09 14:48:29 -10:00
Riley Davis 74c4d812cd less changes 2016-12-09 14:39:16 -10:00
Riley Davis 7186c2b060 have moderation queue use proper mapStateToProps 2016-12-09 14:38:29 -10:00
Riley Davis b05f4cfb16 remove logs 2016-12-09 14:25:24 -10:00
Riley Davis 7732aa4abe typo 2016-12-09 14:20:46 -10:00
Riley Davis a80dd953c8 update ModerationQueue and CommentStream to not use immutable.js deep in the stack 2016-12-09 14:13:48 -10:00
Riley Davis 1c2ef760ef remove cruft by pulling out some immutable.js stuff 2016-12-09 11:46:04 -10:00
Riley Davis 44ae886af7 put some space between buttons on the banuserdialog 2016-12-09 10:08:55 -10:00
gaba 71d6b90993 SMall changes for PR. 2016-12-08 18:29:15 -10:00
gaba 0df1b9a498 Remove file that is not being used anymore. 2016-12-08 16:37:05 -10:00
gaba 0e2a7decd4 Adds ban/unban to cli. Fix ban user in the admin. 2016-12-07 14:55:49 -10:00
gaba 3463e09cab Setting the showuserdialog in the reducer for comments. 2016-12-02 17:05:23 -08:00
gaba eb916099bd Merge 2016-12-02 16:52:16 -08:00
gaba 07e3a935ab Show the Dialog. 2016-12-02 16:03:19 -08:00
gaba 29f547d268 Trying to fix ban user dialog. 2016-12-02 06:35:55 -08:00
gaba c83f8eb188 Onclick action. 2016-12-01 13:11:44 -08:00
gaba 15eb946f00 Trying to get the Dialog up. 2016-12-01 13:05:10 -08:00