Belén Curcio and GitHub
67aa261a56
Merge branch 'master' into stream-e2e
2016-12-05 19:34:57 -03:00
Belén Curcio and GitHub
e644b68f66
Merge pull request #127 from coralproject/close-comments
...
Adds the ability to close and open comments on an asset
2016-12-05 19:33:05 -03:00
Belen Curcio
08e232c4fe
User Should still be able to see sign info even if its closed // moving comp
2016-12-05 19:28:47 -03:00
Belen Curcio
03b6ec4fe4
Lint
2016-12-05 19:18:29 -03:00
Dan Zajdband
568e46f1e3
Added restricted wrapper
2016-12-05 17:02:21 -05:00
Dan Zajdband
62cc489c21
Merge with master
2016-12-05 16:39:00 -05:00
David Jay and GitHub
7c02ece881
Merge branch 'master' into stream-e2e
2016-12-05 12:42:26 -05:00
Dan Zajdband
95ec57c64d
Added default message on thread
2016-12-05 11:11:21 -05:00
Dan Zajdband
4be258c63d
Added simple open/close flow
2016-12-05 11:02:39 -05:00
Kim Gardner and GitHub
d85d15a55a
Merge pull request #84 from coralproject/guides
...
Add CONTRIBUTING.md first draft
2016-12-04 00:59:08 -05:00
Kim Gardner and GitHub
e528e0678f
Merge branch 'master' into stream-e2e
2016-12-04 00:49:27 -05:00
Kim Gardner and GitHub
2f965f2009
Merge branch 'master' into guides
2016-12-04 00:47:32 -05:00
David Erwin and GitHub
6990600c10
Merge pull request #124 from coralproject/like-login-prompt
...
Like/Flag Login Prompt
2016-12-02 16:02:34 -05:00
David Erwin and GitHub
f2273f1698
Merge branch 'master' into like-login-prompt
2016-12-02 15:58:54 -05:00
David Erwin and GitHub
9f9e80e647
Merge pull request #123 from coralproject/info-box-fix
...
Info box fix
2016-12-02 15:50:40 -05:00
David Jay
0eca9eeadc
Prompting login when a loggout out user likes or comments.
2016-12-02 15:45:26 -05:00
David Jay
c387df55f3
Removing .env-test
2016-12-02 12:52:43 -05:00
David Jay
b1d0f8443f
Updating infobox styling.
2016-12-02 12:47:18 -05:00
David Jay
8dad90104d
Returning infobox data in stream.
2016-12-02 12:26:31 -05:00
David Jay
94dd79b6a7
Updating test db logic.
2016-12-02 12:03:25 -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
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
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
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
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
