Commit Graph

1482 Commits

Author SHA1 Message Date
Wyatt Johnson edf9ced454 Added PID support 2017-01-25 11:11:33 -07:00
David Jay f023d1de08 Merge branch 'master' into e2e-env-fix 2017-01-23 12:07:12 -05:00
Riley Davis 54e5a18546 Merge pull request #250 from coralproject/registration-fix
found the bang
v0.0.2
2017-01-19 14:31:34 -07:00
Riley Davis a7094efda6 Merge branch 'master' into registration-fix 2017-01-19 14:27:49 -07:00
David Erwin c207a59c18 Merge pull request #248 from coralproject/registration-fix
Registration fix
2017-01-19 16:24:49 -05:00
riley 9f4c30f466 found the bang 2017-01-19 14:23:57 -07:00
David Erwin fa53327571 Merge branch 'master' into registration-fix 2017-01-19 15:20:52 -05:00
Kim Gardner 70a1525058 Merge pull request #242 from coralproject/design-pass-adm
Design Pass Admin
2017-01-19 12:31:48 -05:00
Riley Davis 07e24496da allow uppercase displaynames at creation 2017-01-18 13:13:02 -07:00
Riley Davis f07026d6dd hide uppercase login 2017-01-18 12:57:07 -07:00
David Jay f8e55ddc8b Merge branch 'master' of github.com:coralproject/talk into e2e-env-fix 2017-01-18 12:44:44 -05:00
David Jay 074630e628 Updating usernames and passwords to new standards. 2017-01-18 12:43:09 -05:00
Belén Curcio 7140723570 Merge branch 'master' into design-pass-adm 2017-01-18 14:40:09 -03:00
Riley Davis b4ca90a05d Merge pull request #247 from coralproject/prevent-server-restart
add nodemon config to prevent server restart while developing front end
2017-01-18 10:14:34 -07:00
David Jay b59512d2b8 Allowing e2e to run with only node_env=test. 2017-01-18 12:12:49 -05:00
Riley Davis f9bc623764 make a hidden file 2017-01-18 10:10:47 -07:00
Riley Davis 810cc002c9 add nodemon config to prevent server restart while developing front end 2017-01-18 10:02:15 -07:00
David Erwin c03f85d4b6 Merge pull request #246 from coralproject/my-comment-fix-part-deux
fix my comments
2017-01-18 10:49:33 -05:00
Riley Davis 14fd5e4451 does a null check 2017-01-17 15:12:19 -07:00
Riley Davis 8588cab228 Merge pull request #245 from coralproject/revert-244-my-comments-fix
Revert "My Comment bug fix"
2017-01-17 14:59:37 -07:00
Riley Davis af71059948 Revert "My Comment bug fix" 2017-01-17 14:53:28 -07:00
Riley Davis dc866437ff Merge pull request #244 from coralproject/my-comments-fix
My Comment bug fix
2017-01-17 14:26:49 -07:00
Belen Curcio b5afd9cbeb çhanges 2017-01-17 16:39:05 -03:00
Belen Curcio 3640a93a2f Changes 2017-01-17 16:25:47 -03:00
Riley Davis 1b50cb06d4 gotta commit something to see changes 2017-01-17 11:38:15 -07:00
Belen Curcio 6d826e9115 Working Stream 2017-01-17 12:47:06 -03:00
David Erwin 5fff644e7d Merge pull request #230 from coralproject/bug-comment-number
Fixes comment number change when clicking the "Settings" tab.
2017-01-17 10:37:33 -05:00
David Erwin 249a8f78dc Merge branch 'master' into bug-comment-number 2017-01-17 10:03:34 -05:00
David Erwin 5408036eb3 Merge pull request #231 from coralproject/bugfix-flagged-actions
Removed 'rejected' and 'approved' comments from flagged queue.
2017-01-17 10:01:19 -05:00
David Erwin 04e3f12c87 Merge branch 'master' into bugfix-flagged-actions 2017-01-17 09:52:26 -05:00
David Erwin d5137ba1c1 Merge pull request #236 from coralproject/password-length-test
show password error when input length < 8
2017-01-17 09:51:34 -05:00
David Erwin e41acffcf0 Merge branch 'master' into password-length-test 2017-01-17 09:47:42 -05:00
Gabriela Rodríguez Berón 5a22e99282 Merge branch 'master' into bug-comment-number 2017-01-13 15:25:27 -08:00
Gabriela Rodríguez Berón 77b52a2454 Merge branch 'master' into bugfix-flagged-actions 2017-01-13 15:10:42 -08:00
Gabriela Rodríguez Berón 05180394c7 Merge pull request #234 from coralproject/preserve-comment-view-state
Adjusted stream to preserve comment view state
2017-01-13 15:10:01 -08:00
Gabriela Rodríguez Berón 4f013c50e6 Merge branch 'master' into bugfix-flagged-actions 2017-01-13 15:05:54 -08:00
Wyatt Johnson da0ca97483 Added comment for SIGUSR2 2017-01-13 16:02:49 -07:00
Gabriela Rodríguez Berón 53a403cddb Merge branch 'master' into preserve-comment-view-state 2017-01-13 14:29:50 -08:00
Gabriela Rodríguez Berón 06812edcd2 Merge pull request #218 from coralproject/unique-username
Unique username
2017-01-13 14:29:36 -08:00
Gabriela Rodríguez Berón 1accc54238 Merge branch 'master' into unique-username 2017-01-13 14:21:42 -08:00
Wyatt Johnson 05c055c3d2 Merge branch 'master' into preserve-comment-view-state 2017-01-13 15:20:49 -07:00
gaba 06ab33343f Errors needs to use APIError. 2017-01-13 14:15:31 -08:00
David Jay 3cc120cd25 Merge pull request #237 from coralproject/bizarro-world
do not render tab content unless they're active
2017-01-13 17:05:36 -05:00
Riley Davis 44a06aef46 do not render tab content unless they're active 2017-01-13 14:33:01 -07:00
Belen Curcio f0cc82cb6d Changes 2017-01-13 18:16:46 -03:00
David Jay 8632cd9b67 Merge pull request #233 from coralproject/my-comments-part-deux-the-commenting
don't show unpublished comments in My Comments
2017-01-13 16:15:50 -05:00
David Jay 5f58ca6b5d Merge branch 'master' into my-comments-part-deux-the-commenting 2017-01-13 16:08:39 -05:00
Belen Curcio cae101627f Merge branch 'master' of github.com:coralproject/talk into design-pass-adm 2017-01-13 17:14:51 -03:00
Belen Curcio e69262c665 Community Section Ready 2017-01-13 17:11:46 -03:00
Riley Davis 7295d78523 typos 2017-01-13 11:13:28 -07:00