wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-09 12:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,002 Commits 10 Branches 125 Tags
24cc86b1300a6f119595b3d5de6982e7cd274433
Commit Graph
183 Commits
Author SHA1 Message Date
Riley DavisandGitHub 749a5d9853 Merge branch 'master' into use-js-while-rendering 2016-12-12 07:34:36 -10:00
Riley DavisandGitHub c18f885277 Merge branch 'master' into use-js-while-rendering 2016-12-09 15:06:51 -10:00
Riley DavisandGitHub 9e353eaae8 Merge branch 'master' into simplify-community-page 2016-12-09 15:06:43 -10:00
Riley DavisandGitHub 84453ef7bd Merge branch 'master' into use-js-while-rendering 2016-12-09 14:53:56 -10:00
Riley Davis 0f7e4bd239 simplify Community page 2016-12-09 14:52:17 -10: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
David Jay faca09dbd2 Merge branch 'master' of github.com:coralproject/talk into update-users-api 2016-12-09 19:35:09 -05:00
David Jay d229d5a96f Updating route to davidjay. 2016-12-09 19:28:19 -05: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
Kim Gardner 5279ad3305 Typo 2016-12-09 13:01:54 -10:00
Riley Davis 1c2ef760ef remove cruft by pulling out some immutable.js stuff 2016-12-09 11:46:04 -10:00
Gabriela Rodríguez BerónandGitHub f29c0a3a09 Merge branch 'master' into ban-user 2016-12-09 10:43:55 -10:00
Riley Davis 44ae886af7 put some space between buttons on the banuserdialog 2016-12-09 10:08:55 -10:00
gaba d9b778fa74 A few translations for the spanish for this feature. 2016-12-09 09:19:08 -10:00
gaba 01dc4e4144 fix merge. 2016-12-09 08:30:30 -10:00
gaba 15557c16e2 Merge branch 'master' into ban-user 2016-12-09 08:28:46 -10:00
David Jay bfe188eb5c Cleaning up from merge. 2016-12-09 13:17:50 -05:00
David Jay e032a5521e Merge branch 'master' of github.com:coralproject/talk into wordlist 2016-12-09 13:05:11 -05:00
Dan Zajdband 09ba535d68 Merge with master 2016-12-09 10:17:55 -05:00
gaba 71d6b90993 SMall changes for PR. 2016-12-08 18:29:15 -10:00
gaba ecd3f5c347 IT removes duplicated code. 2016-12-08 18:19:00 -10:00
gaba 9bfac3872e Moves banUser to users actions instead of comments actions. 2016-12-08 18:16:17 -10:00
gaba 0df1b9a498 Remove file that is not being used anymore. 2016-12-08 16:37:05 -10:00
gaba 1eb204f822 Merge branch 'master' into ban-user 2016-12-08 13:28:12 -10:00
Riley Davis 4572d8e68e filter by premod status 2016-12-08 12:20:54 -10:00
gaba 953178a1e4 Adds a translation string in spanish. 2016-12-08 10:27:24 -10:00
Dan Zajdband fb392422ea Added textarea for closed message on admin 2016-12-08 12:44:02 -05: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 d12693ae47 Adds a variable to the translation. 2016-12-02 16:02:50 -08:00
gaba da7f39c9e9 Merge branch 'master' into ban-user 2016-12-02 07:58:46 -08:00
gaba 29f547d268 Trying to fix ban user dialog. 2016-12-02 06:35:55 -08:00
David Jay 0e75319c04 Moving banned wordlist text to translations. 2016-12-01 21:49:55 -05:00
David Jay 2cb439ccf8 Reloading banned word list from settings. 2016-12-01 21:12:13 -05:00
David Jay a91b73e94a Fixing bug when writing settings to state. 2016-12-01 20:26:48 -05:00
David Jay 827b94001a Changing save button color when settings are changed 2016-12-01 20:24:34 -05:00
David Jay a16faddac6 Adding banned word list. 2016-12-01 20:11:33 -05:00
David Jay 957837169f Moving configuration sections to seperate files. 2016-12-01 19:35:35 -05:00
David Jay ef58c439f2 Adding banned word list menu option. 2016-12-01 18:46:02 -05: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
gaba 443cd031d5 Ban button. 2016-11-30 19:20:07 -08:00
Belen Curcio c38c556002 merge 2016-11-30 20:11:22 -03:00
gaba 2dd3359cb6 Merge branch 'master' into ban-user 2016-11-30 13:31:59 -08:00