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
Belén Curcio and GitHub
e6b9cf4b7d
Merge pull request #120 from coralproject/bio
...
User Bio and Settings Tab
2016-12-01 13:07:25 -03: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
David Erwin and GitHub
17a8e4bb25
Merge branch 'master' into guides
2016-11-30 22:07:13 -05: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
David Jay
3f1f678fb2
Adding comment count test.
2016-11-30 17:49:08 -05:00
David Jay
fe4e9c5ea9
All e2e tests passing.
2016-11-30 17:38:23 -05:00
gaba
2dd3359cb6
Merge branch 'master' into ban-user
2016-11-30 13:31:59 -08:00
David Jay
c93bc67a40
Removing mocks from pree2e
2016-11-30 16:29:05 -05:00
David Jay
7503ba9ab3
Moving settings to mocks.
2016-11-30 16:27:03 -05:00
David Jay
2b0a503c6a
Adding mock functions to tests.
2016-11-30 16:18:54 -05:00
Gabriela Rodríguez Berón and GitHub
d3ff89fd25
Merge pull request #113 from coralproject/mod-queue-fix
...
Add user info to moderation queue
2016-11-30 12:54:15 -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
David Erwin and GitHub
ee03194a90
Merge branch 'master' into guides
2016-11-30 11:00:42 -05:00
Belen Curcio
6e7926ab30
Working bios
2016-11-30 12:41:50 -03:00
Belen Curcio
2607c608f5
D
...
ividing userData from userAuth
2016-11-30 10:20:03 -03:00
Belen Curcio
bd704bf2ce
User Settings, Restricted User, Banned User, Bio and User actions and Reducers
2016-11-30 08:42:25 -03:00
David Jay and GitHub
4486d3f3e9
Merge pull request #119 from coralproject/fetch-helper
...
implement coralApi fetch
2016-11-29 18:11:21 -05:00
Riley Davis
3e86bfdceb
false positive on user signed in
2016-11-29 15:58:05 -07:00
David Jay
fb977da01d
Adding mocks file.
2016-11-29 17:36:17 -05:00
Riley Davis and GitHub
257ecd3328
Merge branch 'master' into fetch-helper
2016-11-29 15:34:30 -07:00
Riley Davis and Dan Zajdband
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
Riley Davis
a7f94fce83
implement coralApi fetch
2016-11-29 14:44:37 -07:00
David Jay
b7ffd31ea4
Cleaning up tests after merge.
2016-11-29 16:37:39 -05:00
David Jay
9499e53021
Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix
2016-11-29 16:36:44 -05:00
gaba
8af9e14971
Recovered community admin.
2016-11-29 12:42:25 -08:00
David Jay and GitHub
3033abaa88
Merge pull request #117 from coralproject/moderation-settings-were-backwards
...
retreiving comments based on settings was backwards
2016-11-29 15:08:18 -05:00
gaba
a5f67e10d6
Reverts the work on ban in the coral-admin getting everything from master for it.
2016-11-29 11:35:55 -08:00
gaba
281d4f6552
Reverting
2016-11-29 11:17:27 -08:00
Riley Davis
9fcd7b8d3a
retreiving comments based on settings was backwards
2016-11-29 12:16:51 -07:00
gaba
27eb341fa8
Fix users and comments as a merge was weird before.
2016-11-29 10:56:44 -08:00
David Jay