Commit Graph
306 Commits
Author SHA1 Message Date
David Jay 6d701ef49e Updating to detect new status format. 2016-12-08 13:25:18 -05:00
David Jay 8446c49c14 Fixing error when posting comment. 2016-12-08 13:08:18 -05:00
David Jay 17e4e57171 Merge branch 'wordlist' of github.com:coralproject/talk into wordlist 2016-12-06 12:54:39 -05:00
David Jay 582c0c0c9e Handling case where child and parent_id are undefined. 2016-12-06 12:53:35 -05:00
David JayandGitHub 3562d9f235 Merge branch 'master' into wordlist 2016-12-05 17:44:23 -05:00
Belén CurcioandGitHub 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 GardnerandGitHub e528e0678f Merge branch 'master' into stream-e2e 2016-12-04 00:49:27 -05:00
David ErwinandGitHub e6a32c91a2 Merge branch 'master' into wordlist 2016-12-02 16:02:44 -05:00
David ErwinandGitHub 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 0e75319c04 Moving banned wordlist text to translations. 2016-12-01 21:49:55 -05:00
David Jay b5b0cd9b12 Adding banned word notification on post. 2016-12-01 21:32:08 -05:00
David Jay 2cb439ccf8 Reloading banned word list from settings. 2016-12-01 21:12:13 -05:00
David Jay a91b73e94a Fixing bug when writing settings to state. 2016-12-01 20:26:48 -05:00
David Jay 827b94001a Changing save button color when settings are changed 2016-12-01 20:24:34 -05:00
David Jay a16faddac6 Adding banned word list. 2016-12-01 20:11:33 -05:00
David Jay 957837169f Moving configuration sections to seperate files. 2016-12-01 19:35:35 -05:00
David Jay ef58c439f2 Adding banned word list menu option. 2016-12-01 18:46:02 -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 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
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 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
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
Riley Davis 3e86bfdceb false positive on user signed in 2016-11-29 15:58:05 -07:00
Riley DavisandGitHub 257ecd3328 Merge branch 'master' into fetch-helper 2016-11-29 15:34:30 -07:00
Riley DavisandDan 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
Riley Davis a7f94fce83 implement coralApi fetch 2016-11-29 14:44:37 -07: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
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
Riley DavisandGitHub 8218d0c18e Merge branch 'master' into bio 2016-11-29 10:36:20 -07:00
Belen Curcio a5de52aeb9 merge 2016-11-29 13:57:14 -03:00