0e2a7decd4
Adds ban/unban to cli. Fix ban user in the admin.
2016-12-07 14:55:49 -10:00
3463e09cab
Setting the showuserdialog in the reducer for comments.
2016-12-02 17:05:23 -08:00
eb916099bd
Merge
2016-12-02 16:52:16 -08:00
07e3a935ab
Show the Dialog.
2016-12-02 16:03:19 -08:00
d12693ae47
Adds a variable to the translation.
2016-12-02 16:02:50 -08:00
6990600c10
Merge pull request #124 from coralproject/like-login-prompt
...
Like/Flag Login Prompt
2016-12-02 16:02:34 -05:00
f2273f1698
Merge branch 'master' into like-login-prompt
2016-12-02 15:58:54 -05:00
9f9e80e647
Merge pull request #123 from coralproject/info-box-fix
...
Info box fix
2016-12-02 15:50:40 -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
8dad90104d
Returning infobox data in stream.
2016-12-02 12:26:31 -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
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
e6b9cf4b7d
Merge pull request #120 from coralproject/bio
...
User Bio and Settings Tab
2016-12-01 13:07:25 -03: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
2dd3359cb6
Merge branch 'master' into ban-user
2016-11-30 13:31:59 -08:00
d3ff89fd25
Merge pull request #113 from coralproject/mod-queue-fix
...
Add user info to moderation queue
2016-11-30 12:54:15 -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
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
4486d3f3e9
Merge pull request #119 from coralproject/fetch-helper
...
implement coralApi fetch
2016-11-29 18:11:21 -05: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
b7ffd31ea4
Cleaning up tests after merge.
2016-11-29 16:37:39 -05: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
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
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
9fcd7b8d3a
retreiving comments based on settings was backwards
2016-11-29 12:16:51 -07:00
27eb341fa8
Fix users and comments as a merge was weird before.
2016-11-29 10:56:44 -08:00
a375bf638a
Merge branch 'master' into ban-user
2016-11-29 10:42:46 -08:00
5485a446f3
Merge pull request #101 from coralproject/bio
...
Settings Structure and Coral UI Components
2016-11-29 10:41:40 -07:00
8218d0c18e
Merge branch 'master' into bio
2016-11-29 10:36:20 -07:00
cd61ae74b8
Merge pull request #108 from coralproject/asset-searching
...
Added asset searching
2016-11-29 10:06:00 -07:00
gaba