Commit Graph

  • 6a4c168882 Merge pull request #275 from coralproject/mobile-width-fix David Jay 2017-02-01 12:37:44 -05:00
  • 37975574ea Switching rejected usernames from suspended to banned. David Jay 2017-02-01 12:26:01 -05:00
  • 17eefeea15 Merge branch 'master' into mobile-width-fix David Jay 2017-02-01 12:16:57 -05:00
  • 26ce3c635d Merge pull request #274 from coralproject/emailus-veritas David Jay 2017-02-01 12:13:28 -05:00
  • 37d688f99d Merge branch 'mobile-width-fix' of github.com:coralproject/talk into mobile-width-fix David Jay 2017-02-01 12:12:14 -05:00
  • bc6c77176e Fixing error in styling. David Jay 2017-02-01 12:11:12 -05:00
  • e24b953f51 Merge branch 'master' into emailus-veritas David Jay 2017-02-01 12:06:57 -05:00
  • 653e67c9c4 Merge pull request #271 from coralproject/e2e-port-fix David Erwin 2017-02-01 11:59:13 -05:00
  • 6c01a37f6a Removing user bio. David Jay 2017-02-01 11:48:16 -05:00
  • caa04de09d linting and proptypes Belen Curcio 2017-02-01 12:12:28 -03:00
  • 12070309d6 Wizard Nav Belen Curcio 2017-02-01 12:11:15 -03:00
  • 6a4315d608 Working Install Wizard Belen Curcio 2017-02-01 10:49:16 -03:00
  • 6c318b0502 Merge branch 'master' of github.com:coralproject/talk into install-admin Belen Curcio 2017-02-01 09:57:02 -03:00
  • 097934dee5 Merge branch 'master' into story-134624635 gaba 2017-01-31 15:00:14 -08:00
  • 282c7dc4f5 Removes duplicate func and adds tests. gaba 2017-01-31 14:04:31 -08:00
  • 37eae51641 Adds component to coral-framework to deal with the change of displayname. gaba 2017-01-31 13:52:40 -08:00
  • a377f61bdd Adds service and endpoint to change displayname. gaba 2017-01-31 13:51:36 -08:00
  • 80122dfdce Adds formfield to components. gaba 2017-01-31 13:48:45 -08:00
  • f5d873ba57 use referer from headers Riley Davis 2017-01-31 13:45:23 -07:00
  • 20bdf648d7 Merge branch 'e2e-port-fix' of github.com:coralproject/talk into e2e-port-fix David Jay 2017-01-31 15:40:09 -05:00
  • 55dc229b32 Merged branch emailus-veritas into emailus-veritas Riley Davis 2017-01-31 13:29:34 -07:00
  • e6e8ad5ca6 close the resend email box after use. remove dead code Riley Davis 2017-01-31 13:29:23 -07:00
  • 5d185e7aca Updating port in globals. David Jay 2017-01-31 15:21:21 -05:00
  • a13b1c95d6 Adjusted form Wyatt Johnson 2017-01-31 12:57:09 -07:00
  • f44c1d6f0a Merge branch 'master' into timeago-fix David Jay 2017-01-31 14:41:58 -05:00
  • 4a6b09ac96 Merge branch 'master' into e2e-port-fix David Jay 2017-01-31 14:41:43 -05:00
  • 64d2aa7f42 Merge branch 'master' into mobile-width-fix David Jay 2017-01-31 14:41:30 -05:00
  • ae3b8a6474 Merge branch 'master' into bugfix-asset-search David Jay 2017-01-31 14:41:22 -05:00
  • 7babb14bab Addressing bug in asset search. David Jay 2017-01-31 14:37:52 -05:00
  • 890da0400f Steps Belen Curcio 2017-01-31 16:31:29 -03:00
  • 3ca263bcfb Updating mock article template to support mobile widths. David Jay 2017-01-31 14:23:15 -05:00
  • ec1dfefc5d lint Riley Davis 2017-01-31 12:15:33 -07:00
  • 3d83c246f7 simplify email text Riley Davis 2017-01-31 12:08:59 -07:00
  • e63e1f3428 Merge branch 'master' Riley Davis 2017-01-31 12:05:16 -07:00
  • 56ddc49386 resend verify email Riley Davis 2017-01-31 12:04:19 -07:00
  • d72b661c93 Merge pull request #272 from coralproject/fix-252 v0.0.3 Wyatt Johnson 2017-01-31 10:47:02 -07:00
  • 0af41a5b6b Updated circle test Wyatt Johnson 2017-01-30 18:41:23 -07:00
  • 864413b5d6 Fixed issues with e2e Wyatt Johnson 2017-01-30 18:38:06 -07:00
  • 91cd2e9e86 Fixes #266 Wyatt Johnson 2017-01-30 18:21:04 -07:00
  • e6ef4b615f Changed prompt lib, updated cli's Wyatt Johnson 2017-01-30 17:46:09 -07:00
  • 6fd2a927f1 Linted Belen Curcio 2017-01-30 20:51:28 -03:00
  • 76f55b4524 Cursor on user name, and Reply Bio box Belen Curcio 2017-01-30 20:50:25 -03:00
  • 5b926b9b85 merge Belen Curcio 2017-01-30 20:42:15 -03:00
  • e8d8c7af5b Switching e2e to port 3011. David Jay 2017-01-30 18:04:17 -05:00
  • 976c821715 move FormField to coral-ui Riley Davis 2017-01-30 16:00:24 -07:00
  • 0881201465 Notification Belen Curcio 2017-01-30 20:00:01 -03:00
  • 235214642e Fixing bug where timeAgo cannot interpret dates from mongoose properly. David Jay 2017-01-30 17:55:06 -05:00
  • 5d2ed3f585 Notifications Belen Curcio 2017-01-30 19:48:07 -03:00
  • f83def83bd tab Belen Curcio 2017-01-30 19:38:58 -03:00
  • b75557912f Merge pull request #268 from coralproject/graph-pagination Wyatt Johnson 2017-01-30 14:43:44 -07:00
  • f9363e86d0 Merge Belen Curcio 2017-01-30 17:24:57 -03:00
  • 887fe08819 Merge branch 'master' into graph-pagination Belén Curcio 2017-01-30 17:12:23 -03:00
  • 2e1dd35de3 Permalink box Belen Curcio 2017-01-30 16:47:26 -03:00
  • 019e2a4fa9 Flag order Belen Curcio 2017-01-30 16:37:00 -03:00
  • e803593fc7 Move stuff around. gaba 2017-01-30 11:34:04 -08:00
  • f5dc5ed8b7 Test updated Belen Curcio 2017-01-30 15:53:29 -03:00
  • 744f2085da Lint 🎉 Belen Curcio 2017-01-30 15:38:26 -03:00
  • e4839468e3 Merge branch 'master' of github.com:coralproject/talk into design-pass-tweaks Belen Curcio 2017-01-30 15:34:23 -03:00
  • b316d626f5 Bio and Embed Stream refresh Belen Curcio 2017-01-30 15:33:08 -03:00
  • f7725f4143 Notifications working everywhere :D Belen Curcio 2017-01-30 15:27:09 -03:00
  • 7a227dff91 Notification in the CommentStream Working Belen Curcio 2017-01-30 15:11:16 -03:00
  • 1070dfd5ae Merge pull request #249 from coralproject/e2e-env-fix David Erwin 2017-01-30 12:14:50 -05:00
  • 805b5cb441 Lintin Belen Curcio 2017-01-30 09:04:00 -03:00
  • c42fea5889 SnackBar Belen Curcio 2017-01-30 08:19:18 -03:00
  • 8fe8f6c690 Working permalink Belen Curcio 2017-01-30 07:56:08 -03:00
  • 177a4d8f2e Permalinks and Embed Belen Curcio 2017-01-30 07:32:19 -03:00
  • 0105b1d4ac Permalink Belen Curcio 2017-01-30 06:57:12 -03:00
  • 61d24bad60 User bio, onClick and onMouseOver - Styles and Tooltip Belen Curcio 2017-01-30 06:17:39 -03:00
  • e5976576c1 merge Belen Curcio 2017-01-30 05:37:25 -03:00
  • 04cd7312a6 Added support for new commentCount Wyatt Johnson 2017-01-27 15:52:05 -07:00
  • b674ff45c0 Addressing errors with replies in e2e. David Jay 2017-01-27 17:29:23 -05:00
  • 5e521b832c add a confirm-email landing page Riley Davis 2017-01-27 15:04:42 -07:00
  • 1da61784b4 Fixing bugs around settings in e2e. David Jay 2017-01-27 16:10:47 -05:00
  • f0bb9db892 Merge branch 'e2e-env-fix' of github.com:coralproject/talk into e2e-env-fix David Jay 2017-01-27 15:21:47 -05:00
  • 9d15a0448a Adding settings init to pree2e script. David Jay 2017-01-27 15:21:18 -05:00
  • f09d9d0a8b Merge branch 'master' into e2e-env-fix David Jay 2017-01-27 14:10:59 -05:00
  • 801d18639b Merge branch 'e2e-env-fix' of github.com:coralproject/talk into e2e-env-fix David Jay 2017-01-27 14:09:29 -05:00
  • fcf22ef4f9 Adding selenium settings and fixing bug in moderation approval. David Jay 2017-01-27 14:07:34 -05:00
  • 2e6c7f7b09 First pass at pagination Wyatt Johnson 2017-01-27 12:05:19 -07:00
  • d829d2541f Added new env var for e2e reports Wyatt Johnson 2017-01-27 11:20:45 -07:00
  • ebc928c6f2 Merge pull request #267 from coralproject/lodash-dep Wyatt Johnson 2017-01-27 11:03:59 -07:00
  • 55a8b4984a only importing isEqual Belen Curcio 2017-01-27 14:58:36 -03:00
  • 1778c19f6a çhanges Belen Curcio 2017-01-27 14:55:55 -03:00
  • 087b1a7bd7 Merge pull request #264 from coralproject/postmod-default David Erwin 2017-01-27 11:16:36 -05:00
  • 0096de6e79 Merge branch 'master' into postmod-default Wyatt Johnson 2017-01-27 09:11:51 -07:00
  • 88d718e7c9 Merge pull request #265 from coralproject/remove-avatar Kim Gardner 2017-01-27 10:32:12 -05:00
  • c8c160a551 Remove avatar from user cards David Erwin 2017-01-27 10:16:09 -05:00
  • 5d1fd61425 Merge branch 'master' into e2e-env-fix Wyatt Johnson 2017-01-27 08:04:34 -07:00
  • 9fbde9c023 Update init.js Wyatt Johnson 2017-01-27 08:04:00 -07:00
  • 744fce4563 Set settings model as well David Erwin 2017-01-27 10:01:58 -05:00
  • c071484357 Removing test artifiacts David Erwin 2017-01-27 09:48:41 -05:00
  • 0a80205095 Update default setting to POST moderation David Erwin 2017-01-27 09:45:35 -05:00
  • fbc5a6660a Merge pull request #263 from coralproject/moderate-bio David Erwin 2017-01-27 09:25:02 -05:00
  • 71647d5233 Merge branch 'master' into e2e-env-fix Wyatt Johnson 2017-01-26 16:47:52 -07:00
  • e7587d9a41 Merge branch 'master' into moderate-bio David Jay 2017-01-26 17:46:20 -05:00
  • 02ece80227 Marking correct user as Pending on user flags. David Jay 2017-01-26 17:42:45 -05:00
  • 74d78b76a5 Merge pull request #219 from coralproject/moderate-bio David Erwin 2017-01-26 17:09:44 -05:00
  • d4c9bdb6fd Merge branch 'e2e-env-fix' of github.com:coralproject/talk into e2e-env-fix David Jay 2017-01-26 16:52:12 -05:00
  • b8ff2b6763 Resetting chrome version to 2.25 in nightwatch. David Jay 2017-01-26 16:51:03 -05:00
  • fa985acd14 Update circle.yml Wyatt Johnson 2017-01-26 14:45:02 -07:00