gaba
da7f39c9e9
Merge branch 'master' into ban-user
2016-12-02 07:58:46 -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
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
Belen Curcio
2607c608f5
D
...
ividing userData from userAuth
2016-11-30 10:20:03 -03: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
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
Riley Davis
9fcd7b8d3a
retreiving comments based on settings was backwards
2016-11-29 12:16:51 -07:00
gaba
a375bf638a
Merge branch 'master' into ban-user
2016-11-29 10:42:46 -08:00
Wyatt Johnson
ac17fc2cc6
Added asset settings + improved tests for routes
2016-11-29 10:01:52 -07:00
Wyatt Johnson and GitHub
cf93a48186
Merge branch 'master' into asset-searching
2016-11-28 17:21:06 -07:00
gaba
abedb36791
Merge branch 'master' into ban-user
2016-11-28 16:04:15 -08:00
David Jay
aa048365bd
Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix
2016-11-28 18:43:20 -05:00
Riley Davis and GitHub
01e7150dd1
Merge branch 'master' into return-all-settings
2016-11-28 16:26:00 -07:00
David Jay
c0a9ea9905
Returning all settings from api/v1/settings.
2016-11-28 18:19:07 -05:00
David Jay
461e80e260
Removing switch in steam endpoint.
2016-11-28 17:43:24 -05:00
David Jay
79cda54be2
Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix
2016-11-28 17:28:41 -05:00
David Jay
7cf05bbdca
Merge branch 'master' of https://github.com/coralproject/talk into settings-in-stream
2016-11-28 17:25:07 -05:00
Wyatt Johnson
ab46c020d9
Added asset searching
2016-11-28 15:01:13 -07:00
David Jay
ca5049feeb
Adding settings to stream.
2016-11-28 16:52:00 -05:00
Wyatt Johnson
616dd534d9
Moved kue redis connector
2016-11-28 14:05:06 -07:00
David Jay
8af300a9ec
Adding users, comments, and actions to endpoint and moving to store.
2016-11-28 15:51:15 -05:00
gaba
67d54be0d9
Remove space.
2016-11-28 12:11:05 -08:00
gaba
1ec7435ef4
Merge branch 'master' into ban-user
2016-11-28 11:41:31 -08:00
Wyatt Johnson and Dan Zajdband
b0f01cf00f
Initial commit of asset queuing ( #97 )
...
* Initial commit of asset queuing
* Addresssing comments
2016-11-28 13:29:39 -05:00
Wyatt Johnson and GitHub
b22a76536c
Merge branch 'master' into upsertting-actions
2016-11-28 10:21:03 -07:00
Wyatt Johnson
9d8968f1ce
Corrected action upserting functionality
2016-11-28 10:14:13 -07:00
David Erwin
cb31caed4b
Update comments
2016-11-25 11:47:00 -05:00
David Erwin
7a6ea34468
Remove the preview link
2016-11-25 10:42:38 -05:00
Wyatt Johnson
325162cb3e
Added authorization pieces + test functions
2016-11-22 17:15:14 -07:00
gaba
7dc7df2601
Merge branch 'master' into ban-user
2016-11-22 09:30:52 -08:00
Wyatt Johnson and GitHub
00a8c59c96
Merge branch 'master' into admin
2016-11-22 08:31:21 -07:00
Belen Curcio
8108ca09ef
Permissions, views and somestyling
2016-11-22 11:04:56 -03:00
David Jay and GitHub
06686105c4
Merge branch 'master' into connect-reset-to-fe
2016-11-21 19:06:04 -05:00
Riley Davis
ae1002fbbf
update to root url
2016-11-21 16:36:07 -07:00
Riley Davis
a0469301bb
add password reset form
2016-11-21 16:32:07 -07:00
David Jay
2b9caf8daf
Updating frontend to utilize new action delete endpoint.
2016-11-21 18:00:50 -05:00
gaba
3337e95a6c
Move the change status of the user to a ban the user func.
2016-11-21 12:18:19 -08:00
Wyatt Johnson
a45a5f7296
Updated test to verify middleware is working
2016-11-21 12:49:04 -07:00
Wyatt Johnson
7893d425ef
Updated tests
2016-11-21 12:42:42 -07:00
Wyatt Johnson
7cc311bd81
Added wordlist, cleaned comments api
2016-11-21 11:18:52 -07:00
Riley Davis
506c514799
request pw reset from ui
2016-11-18 15:09:13 -07:00
gaba
8bf8ed08aa
Merge branch 'master' into ban-user
2016-11-18 09:36:38 -08:00
gaba
2f6e0b04d6
Adds status to the user.
2016-11-18 09:29:14 -08:00
gaba