wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-13 17:45:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Commit Graph

  • 8588cab228 Merge pull request #245 from coralproject/revert-244-my-comments-fix Riley Davis 2017-01-17 14:59:37 -07:00
  • af71059948 Revert "My Comment bug fix" Riley Davis 2017-01-17 14:53:28 -07:00
  • dc866437ff Merge pull request #244 from coralproject/my-comments-fix Riley Davis 2017-01-17 14:26:49 -07:00
  • b5afd9cbeb çhanges Belen Curcio 2017-01-17 16:39:05 -03:00
  • 3640a93a2f Changes Belen Curcio 2017-01-17 16:25:47 -03:00
  • 1b50cb06d4 gotta commit something to see changes Riley Davis 2017-01-17 11:38:15 -07:00
  • 6d826e9115 Working Stream Belen Curcio 2017-01-17 12:47:06 -03:00
  • 5fff644e7d Merge pull request #230 from coralproject/bug-comment-number David Erwin 2017-01-17 10:37:33 -05:00
  • 249a8f78dc Merge branch 'master' into bug-comment-number David Erwin 2017-01-17 10:03:34 -05:00
  • 5408036eb3 Merge pull request #231 from coralproject/bugfix-flagged-actions David Erwin 2017-01-17 10:01:19 -05:00
  • 04e3f12c87 Merge branch 'master' into bugfix-flagged-actions David Erwin 2017-01-17 09:52:26 -05:00
  • d5137ba1c1 Merge pull request #236 from coralproject/password-length-test David Erwin 2017-01-17 09:51:34 -05:00
  • e41acffcf0 Merge branch 'master' into password-length-test David Erwin 2017-01-17 09:47:42 -05:00
  • 5a22e99282 Merge branch 'master' into bug-comment-number Gabriela Rodríguez Berón 2017-01-13 15:25:27 -08:00
  • 77b52a2454 Merge branch 'master' into bugfix-flagged-actions Gabriela Rodríguez Berón 2017-01-13 15:10:42 -08:00
  • 05180394c7 Merge pull request #234 from coralproject/preserve-comment-view-state Gabriela Rodríguez Berón 2017-01-13 15:10:01 -08:00
  • 4f013c50e6 Merge branch 'master' into bugfix-flagged-actions Gabriela Rodríguez Berón 2017-01-13 15:05:54 -08:00
  • da0ca97483 Added comment for SIGUSR2 Wyatt Johnson 2017-01-13 16:02:49 -07:00
  • 53a403cddb Merge branch 'master' into preserve-comment-view-state Gabriela Rodríguez Berón 2017-01-13 14:29:50 -08:00
  • 06812edcd2 Merge pull request #218 from coralproject/unique-username Gabriela Rodríguez Berón 2017-01-13 14:29:36 -08:00
  • 1accc54238 Merge branch 'master' into unique-username Gabriela Rodríguez Berón 2017-01-13 14:21:42 -08:00
  • 05c055c3d2 Merge branch 'master' into preserve-comment-view-state Wyatt Johnson 2017-01-13 15:20:49 -07:00
  • 06ab33343f Errors needs to use APIError. gaba 2017-01-13 14:15:31 -08:00
  • 3cc120cd25 Merge pull request #237 from coralproject/bizarro-world David Jay 2017-01-13 17:05:36 -05:00
  • dc63cc6bce Merge branch 'moderate-bio' of github.com:coralproject/talk into moderate-bio David Jay 2017-01-13 16:39:17 -05:00
  • 0131dd6b13 Merge branch 'master' of github.com:coralproject/talk into moderate-bio David Jay 2017-01-13 16:37:31 -05:00
  • 44a06aef46 do not render tab content unless they're active Riley Davis 2017-01-13 14:33:01 -07:00
  • f0cc82cb6d Changes Belen Curcio 2017-01-13 18:16:46 -03:00
  • 8632cd9b67 Merge pull request #233 from coralproject/my-comments-part-deux-the-commenting David Jay 2017-01-13 16:15:50 -05:00
  • 5f58ca6b5d Merge branch 'master' into my-comments-part-deux-the-commenting David Jay 2017-01-13 16:08:39 -05:00
  • cae101627f Merge branch 'master' of github.com:coralproject/talk into design-pass-adm Belen Curcio 2017-01-13 17:14:51 -03:00
  • e69262c665 Community Section Ready Belen Curcio 2017-01-13 17:11:46 -03:00
  • 7295d78523 typos Riley Davis 2017-01-13 11:13:28 -07:00
  • 041241d6b0 Merge branch 'master' into preserve-comment-view-state Wyatt Johnson 2017-01-13 10:33:17 -07:00
  • 9876e04454 Ban User box Belen Curcio 2017-01-13 13:54:45 -03:00
  • 712c53389b Banned Words and Suspect Belen Curcio 2017-01-13 13:07:45 -03:00
  • 9e5dbfd9cf Merge pull request #235 from coralproject/dev-env-docs Wyatt Johnson 2017-01-13 08:29:50 -07:00
  • 39a4d031c7 Adjusted for new wiki page Wyatt Johnson 2017-01-13 08:24:12 -07:00
  • 7c95781072 Update README.md David Erwin 2017-01-13 10:21:12 -05:00
  • f56e30c1a1 Updating docs for .env functionality David Erwin 2017-01-13 10:08:35 -05:00
  • c90230c115 Adjusted stream to preserve comment view state Wyatt Johnson 2017-01-12 17:55:08 -07:00
  • ad0f530fd3 don't return unpublished comments in My Comments section. add tests Riley Davis 2017-01-12 17:07:35 -07:00
  • 281a49dc74 Merge branch 'master' into bugfix-flagged-actions Wyatt Johnson 2017-01-12 16:29:32 -07:00
  • 1cc048d46e Merge branch 'master' into unique-username Gabriela Rodríguez Berón 2017-01-12 14:53:13 -08:00
  • 20f90572f5 Merge pull request #228 from coralproject/pending-queue-routes Riley Davis 2017-01-12 15:49:44 -07:00
  • 536a2165cc Merge branch 'master' into unique-username gaba 2017-01-12 14:47:45 -08:00
  • 1027b19a49 Added regex to look for the field that is duplicated. Not sure if there is a better way to do it. gaba 2017-01-12 14:43:36 -08:00
  • 5136fce4a3 Merge branch 'master' into pending-queue-routes Riley Davis 2017-01-12 15:34:13 -07:00
  • f3f5397459 Removing rejected and approved comments from flagged feed. David Jay 2017-01-12 17:32:48 -05:00
  • 0eefd3364b update tests Riley Davis 2017-01-12 15:25:36 -07:00
  • 361be84562 Merge branch 'master' into bug-comment-number David Jay 2017-01-12 16:49:16 -05:00
  • 3e0d56b942 Keeping hydrated comments in assets in COMMENTS_BY_USER_REQUEST. David Jay 2017-01-12 16:41:50 -05:00
  • 31b7dac48a Merge pull request #229 from coralproject/topic-220 Wyatt Johnson 2017-01-12 14:33:58 -07:00
  • ce01389809 Ádding Icon to Coral UI Button Belen Curcio 2017-01-12 18:20:42 -03:00
  • 6e89734e12 Moved errors to errors.js, std error msgs/types Wyatt Johnson 2017-01-12 14:08:52 -07:00
  • 44b41b031e lint Riley Davis 2017-01-12 14:03:58 -07:00
  • 87b350e3a9 Missing tab wrapper Belen Curcio 2017-01-12 17:56:00 -03:00
  • 1432cfba4a Updating signing dialog style to render as intended in Firefox. David Jay 2017-01-12 15:49:23 -05:00
  • c375d11e32 Coral UI - List and Item Belen Curcio 2017-01-12 17:47:45 -03:00
  • b66efb7f2a return flagged comments Riley Davis 2017-01-12 13:44:10 -07:00
  • f1272338cd re-use dispatch function Riley Davis 2017-01-12 13:30:53 -07:00
  • 3285a5ec29 add status to Comment. /comments/pending and /comments/rejected ONLY return the respective comments Riley Davis 2017-01-12 12:16:13 -07:00
  • acf3ad5e28 Some conflicts were added. gaba 2017-01-12 11:10:07 -08:00
  • 15e7ef6368 Adds an error const. gaba 2017-01-12 10:46:18 -08:00
  • 873ec09f62 Merge branch 'master' into unique-username gaba 2017-01-12 08:46:51 -08:00
  • 3d65231db5 Progress Belen Curcio 2017-01-12 13:27:37 -03:00
  • b957e75d68 Merge branch 'master' into moderate-bio Belén Curcio 2017-01-12 09:21:02 -03:00
  • 4a4affad70 More Design Tweaks Belen Curcio 2017-01-12 09:16:23 -03:00
  • 7101d99187 Merge branch 'master' of github.com:coralproject/talk into design-pass-adm Belen Curcio 2017-01-12 08:09:55 -03:00
  • 61bc87bafc Adding ALL moderation list. David Jay 2017-01-11 17:35:09 -05:00
  • 18b35e38a8 Merge pull request #227 from coralproject/flagged-queue-bugfix Riley Davis 2017-01-11 14:20:03 -07:00
  • 6ca7e92171 Merge branch 'master' into flagged-queue-bugfix Wyatt Johnson 2017-01-11 13:48:09 -07:00
  • 09e3889793 Updating action type from to for consistency. David Jay 2017-01-11 15:42:56 -05:00
  • 2a1ea01827 Merge pull request #226 from coralproject/dev-start David Jay 2017-01-11 15:14:59 -05:00
  • 10aaa037dc Added dev-start and --config flag Wyatt Johnson 2017-01-11 11:37:06 -07:00
  • 30c7539cde Merge branch 'moderate-bio' of github.com:coralproject/talk into moderate-bio David Jay 2017-01-11 13:14:44 -05:00
  • e8dc319a9a Merge branch 'master' of github.com:coralproject/talk into moderate-bio David Jay 2017-01-11 13:12:07 -05:00
  • 98a6ba5f1f Merge branch 'master' into moderate-bio David Jay 2017-01-11 12:32:25 -05:00
  • 5f215a95f9 Merge pull request #222 from coralproject/hide-passwords Wyatt Johnson 2017-01-11 10:22:28 -07:00
  • 9d7810f48c Merge branch 'master' into moderate-bio David Jay 2017-01-10 19:48:09 -05:00
  • 7a21879628 Merge branch 'master' into hide-passwords Wyatt Johnson 2017-01-10 14:53:26 -07:00
  • 2e4256bf4a Merge pull request #223 from coralproject/users-bug-fix Kim Gardner 2017-01-10 16:11:22 -05:00
  • 11f18c23cb Merge branch 'master' into users-bug-fix David Jay 2017-01-10 14:13:31 -05:00
  • 3a510168d3 design progress Belen Curcio 2017-01-10 16:12:15 -03:00
  • 8519d07c67 Cleaned user auth response Wyatt Johnson 2017-01-10 12:00:06 -07:00
  • d9147da8fc Making user action item_type 'users' for consistency. David Jay 2017-01-10 13:59:36 -05:00
  • e87a471eb9 Merge pull request #201 from coralproject/frontenddocs Kim Gardner 2017-01-10 11:44:03 -05:00
  • 6cf4011cde Merge branch 'master' into frontenddocs Kim Gardner 2017-01-10 11:40:03 -05:00
  • ca369dcb4a Header version Belen Curcio 2017-01-10 12:01:48 -03:00
  • a4e6638217 Tab bar, removing extra mdl js. It adds more events Belen Curcio 2017-01-10 10:55:03 -03:00
  • f76177c1db Merge pull request #214 from coralproject/bad-words Riley Davis 2017-01-09 18:13:18 -07:00
  • 7283feab6b Merge branch 'master' into bad-words Wyatt Johnson 2017-01-09 16:44:19 -07:00
  • f957e3c8ce Closing suspend user modal once user is suspended and e-mail is sent. David Jay 2017-01-09 18:33:12 -05:00
  • 8fa7561e20 Updating item_type for consitency. David Jay 2017-01-09 18:27:54 -05:00
  • 01d9fc313e Merge branch 'master' of github.com:coralproject/talk into moderate-bio David Jay 2017-01-09 18:20:44 -05:00
  • 296b941ee8 Merge pull request #221 from coralproject/email-confirm David Jay 2017-01-09 18:19:53 -05:00
  • 8601562418 Improving extraction of user e-mail address. David Jay 2017-01-09 18:18:19 -05:00
  • a2704e3099 Updating user email address. David Jay 2017-01-09 18:15:25 -05:00
  • 586ce941e5 Merge branch 'master' into email-confirm Wyatt Johnson 2017-01-09 16:10:46 -07:00
  • ec3a114e65 Added missing endpoint + fix for mailer Wyatt Johnson 2017-01-09 15:50:46 -07:00