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
a5de52aeb9
merge
2016-11-29 13:57:14 -03:00
86faf504bb
changes
2016-11-29 13:56:26 -03:00
ea2ee68ed6
Test db clear ( #116 )
...
* Adding headers to stream request.
* Switching mongodb when node_env === test.
2016-11-29 11:44:54 -05:00
55afe36e3b
Renaming
2016-11-29 06:24:13 -03:00
29f378b863
Merge branch 'master' into bio
2016-11-28 17:20:58 -07:00
abedb36791
Merge branch 'master' into ban-user
2016-11-28 16:04:15 -08:00
5f2f70fd51
Fixing bug when adding users to redux.
2016-11-28 18:59:27 -05:00
aa048365bd
Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix
2016-11-28 18:43:20 -05:00
0e3cd001e9
merge master
2016-11-28 16:38:25 -07:00
d5ff0f8f28
keep it DRY. add getInit all over the place. update tests
2016-11-28 16:18:19 -07:00
79cda54be2
Merge branch 'master' of https://github.com/coralproject/talk into mod-queue-fix
2016-11-28 17:28:41 -05:00
7cf05bbdca
Merge branch 'master' of https://github.com/coralproject/talk into settings-in-stream
2016-11-28 17:25:07 -05:00
823c223cf1
Adding settings to redux store from stream.
2016-11-28 17:11:37 -05:00
144e716db9
Merge branch 'master' into ban-user
2016-11-28 13:00:56 -08:00
8af300a9ec
Adding users, comments, and actions to endpoint and moving to store.
2016-11-28 15:51:15 -05:00
613a165325
merge
2016-11-28 17:40:22 -03:00
67d9bc2e3a
Disable selection
2016-11-28 17:36:35 -03:00
31b0453e82
Merge branch 'master' into logout
2016-11-28 12:33:42 -08:00
6974f30c73
Merge branch 'master' into ban-user
2016-11-28 12:11:46 -08:00
25d53116f7
remove unused var
2016-11-28 12:49:29 -07:00
1ec7435ef4
Merge branch 'master' into ban-user
2016-11-28 11:41:31 -08:00
d384a69111
Main Tabs
2016-11-28 15:56:14 -03:00
0d7014f77a
add helpers to talk-adapter
2016-11-28 11:50:25 -07:00
98c6ef5162
Merge branch 'master' into config-auth-fix
2016-11-28 11:30:28 -07:00
b0f01cf00f
Initial commit of asset queuing ( #97 )
...
* Initial commit of asset queuing
* Addresssing comments
2016-11-28 13:29:39 -05:00
ee0e0ea9ed
import belen's fetch helpers
2016-11-28 11:17:41 -07:00
c0eb202858
small refactor on items actions
2016-11-28 10:57:15 -07:00
d10870c6bb
dispatch update for adding comemnts
2016-11-28 10:54:10 -07:00
1dc7db9081
Structure
2016-11-28 14:43:43 -03:00
5bb386e16a
Structure
2016-11-28 14:25:30 -03:00
4d916be170
Working tabs
2016-11-27 20:54:41 -03:00
3ebdca33f3
Logout func
2016-11-27 19:37:17 -03:00
28520bfd4a
add get comments by user endpoint. refactor getStream to be functional programming
2016-11-23 17:14:51 -07:00
71d4ddf030
create comment history class
2016-11-23 13:28:20 -07:00
e9fdb2cc00
Merge branch 'issue-89' into ban-user
2016-11-22 17:20:53 -08:00
e5c02c4274
The field is action_type and not action.
2016-11-22 17:14:24 -08:00
Belen Curcio