0c050bdec9
Merge branch 'master' into like-login-prompt
2016-12-08 15:53:16 -03:00
e91564f706
Merge branch 'master' of github.com:coralproject/talk into like-login-prompt
2016-12-08 13:49:15 -05:00
e56583e250
Merge branch 'master' into bugfix-for-permalink-path
2016-12-07 09:11:22 -10:00
260d1bd9f4
restoring the scroll to comment functionality
2016-12-06 16:29:40 -10:00
1201196566
un-sneaking in some stuff
2016-12-06 15:51:22 -10:00
f2ded3f2a7
replace things multiple times
2016-12-06 14:34:27 -10:00
31c87cb93f
make the translation function accept n arguments. ninja bugfix to permalink
2016-12-06 14:17:01 -10:00
f2c751f9f0
Merge branch 'master' into i18n-var
2016-12-06 13:41:44 -10:00
67aa261a56
Merge branch 'master' into stream-e2e
2016-12-05 19:34:57 -03:00
08e232c4fe
User Should still be able to see sign info even if its closed // moving comp
2016-12-05 19:28:47 -03:00
03b6ec4fe4
Lint
2016-12-05 19:18:29 -03:00
568e46f1e3
Added restricted wrapper
2016-12-05 17:02:21 -05:00
62cc489c21
Merge with master
2016-12-05 16:39:00 -05:00
95ec57c64d
Added default message on thread
2016-12-05 11:11:21 -05:00
4be258c63d
Added simple open/close flow
2016-12-05 11:02:39 -05:00
e528e0678f
Merge branch 'master' into stream-e2e
2016-12-04 00:49:27 -05:00
60d4793111
Adds a variable to the possible translations.
2016-12-02 16:12:24 -08:00
ead66520e2
Adjusting height of login button to match current comment.
2016-12-02 17:01:06 -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
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
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
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
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
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
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
Belén Curcio