Commit Graph

3544 Commits

Author SHA1 Message Date
Belén Curcio 67aa261a56 Merge branch 'master' into stream-e2e 2016-12-05 19:34:57 -03:00
Belen Curcio 08e232c4fe User Should still be able to see sign info even if its closed // moving comp 2016-12-05 19:28:47 -03:00
Belen Curcio 03b6ec4fe4 Lint 2016-12-05 19:18:29 -03:00
Dan Zajdband 568e46f1e3 Added restricted wrapper 2016-12-05 17:02:21 -05:00
Dan Zajdband 62cc489c21 Merge with master 2016-12-05 16:39:00 -05:00
David Jay a9bc90619d Adding popup on report button click. 2016-12-05 15:59:16 -05:00
Dan Zajdband 95ec57c64d Added default message on thread 2016-12-05 11:11:21 -05:00
Dan Zajdband 4be258c63d Added simple open/close flow 2016-12-05 11:02:39 -05:00
Kim Gardner e528e0678f Merge branch 'master' into stream-e2e 2016-12-04 00:49:27 -05: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 60d4793111 Adds a variable to the possible translations. 2016-12-02 16:12:24 -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
David Jay ead66520e2 Adjusting height of login button to match current comment. 2016-12-02 17:01:06 -05:00
David Erwin e6a32c91a2 Merge branch 'master' into wordlist 2016-12-02 16:02:44 -05:00
David Erwin f2273f1698 Merge branch 'master' into like-login-prompt 2016-12-02 15:58:54 -05:00
David Jay 0eca9eeadc Prompting login when a loggout out user likes or comments. 2016-12-02 15:45:26 -05:00
David Jay b1d0f8443f Updating infobox styling. 2016-12-02 12:47:18 -05:00
gaba 1cda5b9099 Restrict content in the comment stream when banned. 2016-12-02 08:00:26 -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 b5b0cd9b12 Adding banned word notification on post. 2016-12-01 21:32:08 -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
David Jay e5fe91af8b Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e 2016-12-01 18:25:08 -05:00
David Jay a118d263ea Cleaning url regex in commentstream. 2016-12-01 16:23:33 -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
David Jay d853b1f912 Merging master into stream-e2e 2016-12-01 14:36:47 -05:00
Belen Curcio 647fb06c99 HandleSave on Submit 2016-12-01 12:58:37 -03:00
Belen Curcio 990782a542 Sign in a restricted rout 2016-12-01 11:17:07 -03: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
David Jay b2b9b0ec42 Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e 2016-11-30 17:55:39 -05:00
gaba 2dd3359cb6 Merge branch 'master' into ban-user 2016-11-30 13:31:59 -08:00
David Jay 34671fb327 Fixing filter in moderation queue. 2016-11-30 15:38:43 -05:00
David Jay 03db1de41a Removing log statement. 2016-11-30 15:15:58 -05:00
Dan Zajdband bf3b028370 Close comments: WIP 2016-11-30 15:09:42 -05:00
Belen Curcio d90a158298 Bio Tooltips 2016-11-30 17:09:34 -03:00
gaba a30388682e Merge branch 'master' into ban-user 2016-11-30 11:26:44 -08:00
gaba ba47250933 Understanding reducers 2016-11-30 11:12:09 -08:00
David Jay 17b79e1869 Adding user and action data to rejected and flagged comments. 2016-11-30 13:51:43 -05:00
David Jay 94d9f42aa5 Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix 2016-11-30 12:50:44 -05:00
Belen Curcio 6e7926ab30 Working bios 2016-11-30 12:41:50 -03:00