Commit Graph

115 Commits

Author SHA1 Message Date
David Jay ee187469e0 Moving FlagComment to seperate file. 2016-12-09 12:54:15 -05:00
David Jay f0108e1434 Fixing bug in addItem in commentStream. 2016-12-08 16:55:42 -05:00
David Jay b3d84d724f Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-08 14:36:02 -05:00
David Jay fc96c1ee91 Compressing variables from postAction into single object. 2016-12-08 14:27:31 -05:00
Belén Curcio 0c050bdec9 Merge branch 'master' into like-login-prompt 2016-12-08 15:53:16 -03:00
David Jay e91564f706 Merge branch 'master' of github.com:coralproject/talk into like-login-prompt 2016-12-08 13:49:15 -05:00
David Jay dd85fbb3e0 Adding other field. 2016-12-07 22:16:41 -05:00
David Jay 18f7b07198 Addressing setting bug caused by open thread feature. 2016-12-07 21:12:31 -05:00
David Jay a8805b464b Updating style. 2016-12-07 20:19:07 -05:00
David Jay 713cc0cda1 Posting actions to comment and user endpoints. 2016-12-07 19:01:02 -05:00
Riley Davis 260d1bd9f4 restoring the scroll to comment functionality 2016-12-06 16:29:40 -10:00
David Jay 507e89a301 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-06 18:19:45 -05:00
David Jay 9e69a453d9 Adding text to postAction in commentStream. 2016-12-06 18:14:53 -05:00
David Jay 5e8315c0d7 Styling popup menu. 2016-12-06 15:46:03 -05:00
David Jay ab43d1f0ac Showing first set of options in menu. 2016-12-05 17:38:13 -05:00
Belén Curcio 67aa261a56 Merge branch 'master' into stream-e2e 2016-12-05 19:34:57 -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
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 e528e0678f Merge branch 'master' into stream-e2e 2016-12-04 00:49:27 -05:00
David Jay ead66520e2 Adjusting height of login button to match current comment. 2016-12-02 17:01:06 -05:00
David Erwin f2273f1698 Merge branch 'master' into like-login-prompt 2016-12-02 15:58:54 -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 b1d0f8443f Updating infobox styling. 2016-12-02 12:47:18 -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
Belen Curcio 990782a542 Sign in a restricted rout 2016-12-01 11:17:07 -03: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
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
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
Riley Davis 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
Wyatt Johnson dafd849b0e Merge branch 'master' into stream-e2e 2016-11-29 10:48:16 -07:00
Wyatt Johnson 3c903ddd6d Merge branch 'master' into stream-e2e 2016-11-29 10:41:50 -07:00
Belen Curcio a5de52aeb9 merge 2016-11-29 13:57:14 -03:00
Belen Curcio 86faf504bb changes 2016-11-29 13:56:26 -03:00
Belen Curcio 55afe36e3b Renaming 2016-11-29 06:24:13 -03:00
Wyatt Johnson 29f378b863 Merge branch 'master' into bio 2016-11-28 17:20:58 -07: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
David Jay 823c223cf1 Adding settings to redux store from stream. 2016-11-28 17:11:37 -05:00
Belen Curcio 613a165325 merge 2016-11-28 17:40:22 -03:00
Belen Curcio d384a69111 Main Tabs 2016-11-28 15:56:14 -03:00
Wyatt Johnson b0f01cf00f Initial commit of asset queuing (#97)
* Initial commit of asset queuing

* Addresssing comments
2016-11-28 13:29:39 -05:00
Belen Curcio 5bb386e16a Structure 2016-11-28 14:25:30 -03:00