Commit Graph

  • 5b35d3b61d update to TALK_SMTP_CONNECTION_URL riley 2016-11-16 15:38:42 -07:00
  • 9a894c1981 merge master riley 2016-11-16 15:36:44 -07:00
  • 6e932b840e merge master. load reset password template from a view Riley Davis 2016-11-16 15:32:44 -07:00
  • d389680224 Utilizing test db for e2e tests. David Jay 2016-11-16 17:18:17 -05:00
  • 967472ea74 udpate smtp module to take a full smtp connection string riley 2016-11-16 14:38:29 -07:00
  • e027a162d6 remove sendgrid shim and use connection string riley 2016-11-16 14:00:33 -07:00
  • bc3f9bb0b4 Adds status to the user and tests on setStatus. gaba 2016-11-16 12:44:34 -08:00
  • 81299e8add better error reporting. log when env variable is unset riley 2016-11-16 13:20:07 -07:00
  • bd47495b63 User Email Availability check Belen Curcio 2016-11-16 16:55:47 -03:00
  • 7165b179bc Merge pull request #72 from coralproject/user-documentation Gabriela Rodríguez Berón 2016-11-16 11:36:27 -08:00
  • 11d59a8eab Merge branch 'master' into user-documentation Gabriela Rodríguez Berón 2016-11-16 11:32:45 -08:00
  • 784a50a5f3 Merge pull request #73 from coralproject/language-fix Gabriela Rodríguez Berón 2016-11-16 11:28:46 -08:00
  • e6f546217e Merge branch 'master' into language-fix Gabriela Rodríguez Berón 2016-11-16 11:17:41 -08:00
  • ecf975479d Merge branch 'master' into password-reset Riley Davis 2016-11-16 12:11:44 -07:00
  • 9942d6eee4 remove reference riley 2016-11-16 12:09:47 -07:00
  • d5a1c0a174 Merge branch 'master' into user-documentation Wyatt Johnson 2016-11-16 12:01:14 -07:00
  • 1795fc8863 remove log Riley Davis 2016-11-16 12:00:44 -07:00
  • 861550b4c6 Fixing notification langauge. David Jay 2016-11-16 14:00:21 -05:00
  • 0755a0783e Added documentation to the user model + abstracted it Wyatt Johnson 2016-11-16 11:59:32 -07:00
  • fa8036ac3f merge master riley 2016-11-16 11:58:01 -07:00
  • 73f1d63c7f Merge pull request #69 from coralproject/multi-assets David Jay 2016-11-16 13:57:12 -05:00
  • 7df7279323 endpoints for updating password Riley Davis 2016-11-16 11:49:58 -07:00
  • 9976464300 Posting comment in e2e test. David Jay 2016-11-16 13:44:30 -05:00
  • af76e65246 Posting comment in e2e test. David Jay 2016-11-16 13:43:36 -05:00
  • 9a2eacabb3 Adding faux multi-article functionality David Erwin 2016-11-16 12:25:33 -05:00
  • a5b8856905 Add moderation link to sample page David Erwin 2016-11-16 12:00:46 -05:00
  • 085828fbd0 Merge pull request #66 from coralproject/site-wide-comments David Erwin 2016-11-16 10:51:24 -05:00
  • e6ff70784d Merge branch 'master' into site-wide-comments David Erwin 2016-11-16 10:48:28 -05:00
  • 0f8f59dcfd Merge pull request #68 from coralproject/comment-box David Erwin 2016-11-16 10:48:18 -05:00
  • b55d3768ff Merge master into site-wide-comments David Erwin 2016-11-16 10:43:35 -05:00
  • 7968839826 It adds translations for the admin and fix CSS. gaba 2016-11-16 03:07:27 -08:00
  • ff2c3cf30b Hide the textfield when not enable. gaba 2016-11-15 20:31:24 -08:00
  • 621550e261 Null, not empty string. gaba 2016-11-15 15:31:54 -08:00
  • 3abc0692bb At the top, not the bottom. gaba 2016-11-15 15:31:12 -08:00
  • c86e1e8d47 create and decode jwt Riley Davis 2016-11-15 16:21:25 -07:00
  • 4137758bfd Merge branch 'master' into comment-box gaba 2016-11-15 15:21:08 -08:00
  • d24c7c0bc2 Struggling with hiding elements. gaba 2016-11-15 15:18:17 -08:00
  • 399ba72e0e It changes translations to json file. It adds infobox setting. gaba 2016-11-15 15:15:41 -08:00
  • 0bfa68e699 Merge pull request #67 from coralproject/webpack-fix Gabriela Rodríguez Berón 2016-11-15 12:44:21 -08:00
  • 954f6d9ee3 Sign in with local account Belen Curcio 2016-11-15 17:41:41 -03:00
  • 721c041332 Added fix for webpack building Wyatt Johnson 2016-11-15 13:33:02 -07:00
  • e5898118e1 Merged master into password-reset riley 2016-11-15 13:11:02 -07:00
  • bada782b28 Merge pull request #63 from coralproject/like-button Riley Davis 2016-11-15 13:09:28 -07:00
  • d1ea85468e Addressing issue when deleting actions. David Jay 2016-11-15 14:46:08 -05:00
  • a886123c62 Merge branch 'like-button' of https://github.com/coralproject/talk into like-button David Jay 2016-11-15 14:39:58 -05:00
  • eabce87f99 Merged branch master into password-reset Riley Davis 2016-11-15 12:34:43 -07:00
  • fbf27a9d75 Resolving 500 error when deleting an action. David Jay 2016-11-15 14:24:38 -05:00
  • 7ecd60fbf7 Merge branch 'master' into like-button Riley Davis 2016-11-15 12:15:13 -07:00
  • 688f3c1cb7 Merge pull request #65 from coralproject/add/change-role Riley Davis 2016-11-15 12:00:40 -07:00
  • a0accfd993 Fixed infoBoxEnabled name Dan Zajdband 2016-11-15 13:26:39 -05:00
  • 08d672ed46 Changes model and add admin. gaba 2016-11-15 10:11:37 -08:00
  • 2438161ad9 Removed extra return Dan Zajdband 2016-11-15 12:54:25 -05:00
  • 1bd816dab3 Merged conflicts Dan Zajdband 2016-11-15 12:40:48 -05:00
  • 27261cc515 Added fix for returning a new array Dan Zajdband 2016-11-15 12:37:05 -05:00
  • 4fd41704c0 Moving preview to embed code. David Jay 2016-11-15 12:31:30 -05:00
  • 366e072280 Linting Issues Belen Curcio 2016-11-14 23:35:33 -03:00
  • 14405b22aa Stripping out protocol and query from asset url. David Jay 2016-11-14 20:02:01 -05:00
  • 44292a81ad Moving init and responsehandler to shared functions, updating all routes to return valid JSON. David Jay 2016-11-14 17:09:20 -05:00
  • e53ac55e6b Linting Dan Zajdband 2016-11-14 17:03:31 -05:00
  • 16fa3e46f5 Loading comment stream based on parent URL. David Jay 2016-11-14 16:51:54 -05:00
  • 69ea37a520 removing mock Belen Curcio 2016-11-14 18:48:08 -03:00
  • 9c41adf224 Added enum check for the user model Dan Zajdband 2016-11-14 16:44:21 -05:00
  • 688fbd0bf6 Sending asset_url to backend and retreiving stream with asset. David Jay 2016-11-14 16:40:04 -05:00
  • 765b674cf9 Cleanup, and UserBox with Logout Belen Curcio 2016-11-14 18:35:21 -03:00
  • 223887616d feature(coral-admin): Add users role change Dan Zajdband 2016-11-14 16:20:56 -05:00
  • 1a7b716820 Updating stream endpoint to expect asset_url and to return asset. David Jay 2016-11-14 15:51:17 -05:00
  • c1271d4d1b mailer module v1 Riley Davis 2016-11-14 13:31:47 -07:00
  • 7f151c86a7 Ádding dispatcher for FacebookCallback Belen Curcio 2016-11-14 17:28:36 -03:00
  • 6fa40c3f9b Adding model tests for assets. David Jay 2016-11-14 15:11:25 -05:00
  • 494b7d808b Addressing lint error. David Jay 2016-11-14 13:02:08 -05:00
  • 7d9b24c5b9 start adding mail settings Riley Davis 2016-11-14 10:44:33 -07:00
  • ef2d67a940 Coral-UI, Coral Auth with Reducers, Helpers and Validation Belen Curcio 2016-11-14 13:06:48 -03:00
  • 9341caa4d5 Auth Actions Belen Curcio 2016-11-14 13:04:44 -03:00
  • e7d114d5df Close and Cancel actions Belen Curcio 2016-11-12 13:27:04 -03:00
  • dab93547b5 Handling Views Belen Curcio 2016-11-12 12:54:27 -03:00
  • eb752e6f73 Handling Views Belen Curcio 2016-11-12 12:38:02 -03:00
  • d6dc3a8ba1 Sign up steps and Login Belen Curcio 2016-11-12 12:21:33 -03:00
  • f14353d464 SignIn Dialog Belen Curcio 2016-11-12 00:12:54 -03:00
  • 984b2acac4 Ádding Traslations and Same Origin Requests Belen Curcio 2016-11-11 22:38:15 -03:00
  • 8abec63620 Merge branch 'master' of https://github.com/coralproject/talk into like-button David Jay 2016-11-11 19:20:37 -05:00
  • b629cf359f Removing likes and flags on second click. David Jay 2016-11-11 19:07:15 -05:00
  • 103acd4bce Continue with Facebook Funtionalit Belen Curcio 2016-11-11 20:18:22 -03:00
  • c72e504af8 Merge branch 'master' of github.com:coralproject/talk into passport Belen Curcio 2016-11-11 19:43:49 -03:00
  • 7df9e9ed15 Merge branch 'passport' of github.com:coralproject/talk into passport Belen Curcio 2016-11-11 19:42:20 -03:00
  • 4bea5e5914 Adding route to delete actions. David Jay 2016-11-11 17:06:29 -05:00
  • 80e12d2e30 Added photo support Wyatt Johnson 2016-11-11 14:59:27 -07:00
  • 9897135035 Merge pull request #59 from coralproject/moving-to-queue David Erwin 2016-11-11 16:50:05 -05:00
  • 92869e529a Fixing comment count bug. David Jay 2016-11-11 16:27:56 -05:00
  • 68433ec973 Added "display: popup" to the facebook dialog Wyatt Johnson 2016-11-11 14:27:48 -07:00
  • 1adac5cde1 Adding like button. David Jay 2016-11-11 16:25:47 -05:00
  • 879b32cf9e Merge branch 'master' into moving-to-queue gaba 2016-11-11 13:01:48 -08:00
  • c6198b21bc It changes the endpoint for the moderation queue. gaba 2016-11-11 12:59:24 -08:00
  • fad0122960 Merge pull request #62 from coralproject/permalinks-v2 Gabriela Rodríguez Berón 2016-11-11 12:41:52 -08:00
  • 2c6d321c7f Merged branch permalinks-v2 into permalinks-v2 Riley Davis 2016-11-11 13:25:56 -07:00
  • add200fe38 rename translations file to json Riley Davis 2016-11-11 13:25:46 -07:00
  • f0027220ce Merge branch 'master' into permalinks-v2 Riley Davis 2016-11-11 13:18:30 -07:00
  • 51b497e991 Merge branch 'master' into moving-to-queue gaba 2016-11-11 12:17:56 -08:00
  • 4b6bf58d43 now with translations and page hostname Riley Davis 2016-11-11 13:17:18 -07:00
  • f6184fddb0 Added facebook login support + redis cache Wyatt Johnson 2016-11-11 12:53:51 -07:00
  • 799c460186 Merge branch 'master' of github.com:coralproject/talk into passport Belen Curcio 2016-11-11 16:49:28 -03:00