ead66520e2
Adjusting height of login button to match current comment.
2016-12-02 17:01:06 -05:00
e6a32c91a2
Merge branch 'master' into wordlist
2016-12-02 16:02:44 -05:00
f2273f1698
Merge branch 'master' into like-login-prompt
2016-12-02 15:58:54 -05:00
0eca9eeadc
Prompting login when a loggout out user likes or comments.
2016-12-02 15:45:26 -05:00
b1d0f8443f
Updating infobox styling.
2016-12-02 12:47:18 -05:00
1cda5b9099
Restrict content in the comment stream when banned.
2016-12-02 08:00:26 -08:00
da7f39c9e9
Merge branch 'master' into ban-user
2016-12-02 07:58:46 -08:00
29f547d268
Trying to fix ban user dialog.
2016-12-02 06:35:55 -08:00
0e75319c04
Moving banned wordlist text to translations.
2016-12-01 21:49:55 -05:00
b5b0cd9b12
Adding banned word notification on post.
2016-12-01 21:32:08 -05:00
2cb439ccf8
Reloading banned word list from settings.
2016-12-01 21:12:13 -05:00
a91b73e94a
Fixing bug when writing settings to state.
2016-12-01 20:26:48 -05:00
827b94001a
Changing save button color when settings are changed
2016-12-01 20:24:34 -05:00
a16faddac6
Adding banned word list.
2016-12-01 20:11:33 -05:00
957837169f
Moving configuration sections to seperate files.
2016-12-01 19:35:35 -05:00
ef58c439f2
Adding banned word list menu option.
2016-12-01 18:46:02 -05:00
e5fe91af8b
Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e
2016-12-01 18:25:08 -05:00
a118d263ea
Cleaning url regex in commentstream.
2016-12-01 16:23:33 -05:00
c83f8eb188
Onclick action.
2016-12-01 13:11:44 -08:00
15eb946f00
Trying to get the Dialog up.
2016-12-01 13:05:10 -08:00
d853b1f912
Merging master into stream-e2e
2016-12-01 14:36:47 -05:00
647fb06c99
HandleSave on Submit
2016-12-01 12:58:37 -03:00
990782a542
Sign in a restricted rout
2016-12-01 11:17:07 -03:00
443cd031d5
Ban button.
2016-11-30 19:20:07 -08:00
c38c556002
merge
2016-11-30 20:11:22 -03:00
b2b9b0ec42
Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e
2016-11-30 17:55:39 -05:00
2dd3359cb6
Merge branch 'master' into ban-user
2016-11-30 13:31:59 -08:00
34671fb327
Fixing filter in moderation queue.
2016-11-30 15:38:43 -05:00
03db1de41a
Removing log statement.
2016-11-30 15:15:58 -05:00
bf3b028370
Close comments: WIP
2016-11-30 15:09:42 -05:00
d90a158298
Bio Tooltips
2016-11-30 17:09:34 -03:00
a30388682e
Merge branch 'master' into ban-user
2016-11-30 11:26:44 -08:00
ba47250933
Understanding reducers
2016-11-30 11:12:09 -08:00
17b79e1869
Adding user and action data to rejected and flagged comments.
2016-11-30 13:51:43 -05:00
94d9f42aa5
Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix
2016-11-30 12:50:44 -05:00
6e7926ab30
Working bios
2016-11-30 12:41:50 -03:00
2607c608f5
D
...
ividing userData from userAuth
2016-11-30 10:20:03 -03:00
bd704bf2ce
User Settings, Restricted User, Banned User, Bio and User actions and Reducers
2016-11-30 08:42:25 -03:00
3e86bfdceb
false positive on user signed in
2016-11-29 15:58:05 -07:00
257ecd3328
Merge branch 'master' into fetch-helper
2016-11-29 15:34:30 -07:00
ef172cabfc
Scroll to comment ( #92 )
...
* host pym locally
* host pym. fix some permalink styles
* get url from parent document
* reset copy dialog timeout
* use pym.parentUrl instead of depending on the parent document
* use a simpler method to find the url
* add some horrible setInterval code
* add some awesome polling
* merge master
* bail out of comment look up after 10 seconds
* re-update permalink attrs
* re-add my listeners to article.ejs
* allow for overriding the talk db name in an environment var
2016-11-29 17:19:56 -05:00
a7f94fce83
implement coralApi fetch
2016-11-29 14:44:37 -07:00
9499e53021
Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix
2016-11-29 16:36:44 -05:00
8af9e14971
Recovered community admin.
2016-11-29 12:42:25 -08:00
a5f67e10d6
Reverts the work on ban in the coral-admin getting everything from master for it.
2016-11-29 11:35:55 -08:00
281d4f6552
Reverting
2016-11-29 11:17:27 -08:00
a375bf638a
Merge branch 'master' into ban-user
2016-11-29 10:42:46 -08:00
dafd849b0e
Merge branch 'master' into stream-e2e
2016-11-29 10:48:16 -07:00
3c903ddd6d
Merge branch 'master' into stream-e2e
2016-11-29 10:41:50 -07:00
8218d0c18e
Merge branch 'master' into bio
2016-11-29 10:36:20 -07:00
David Jay