Commit Graph

1294 Commits

Author SHA1 Message Date
Wyatt Johnson be72ebf2a1 Added tests + model implementation. 2017-01-05 17:01:41 -07:00
Wyatt Johnson 298e1e8d73 Updates to user cli + e2e + tests
- Updates to before + beforeEach for mongooose
- Removed reference to dotenv from cli in e2e, should use
  NODE_ENV=test instead.
- Changed test port from 30?? to 3000 to be consistent with what
  nightwatch was expecting
2017-01-04 10:16:51 -07:00
Wyatt Johnson a7680ae5d9 Initial pass at email confirmation 2017-01-03 17:35:58 -07:00
Gabriela Rodríguez Berón b7380978f5 Merge pull request #206 from coralproject/open-source-docs
Open source docs
2017-01-03 12:47:06 -03:00
David Erwin 5e4564c7ea Merge branch 'master' into open-source-docs 2017-01-03 10:29:41 -05:00
Gabriela Rodríguez Berón f5374dc914 Merge pull request #207 from coralproject/fix-test
Fix test on Suspected words
2017-01-03 11:45:30 -03:00
Wyatt Johnson 0dde122e9b Merge branch 'master' into fix-test 2017-01-03 07:41:44 -07:00
Gabriela Rodríguez Berón fd2b01d5ed Merge pull request #208 from coralproject/fix/dialog-unmount
Check if dialog is present before removing listeners
2017-01-03 11:40:31 -03:00
Dan Zajdband 759e74a88d coral-admin: Fixed check for component unmount removing a listener when there is no object 2017-01-03 10:46:55 -03:00
gaba 5c6df6d481 Fix tests when flagging because suspect word. 2017-01-03 09:37:02 -03:00
gaba a02ad69568 Adds specific fields to the metadata in the action when flagging because suspect word. 2017-01-03 09:36:20 -03:00
David Erwin f786daaec9 Merged branch open-source-docs into open-source-docs 2016-12-27 11:50:42 -05:00
David Erwin 9a608fd02e Spell stuff right and clean up 2016-12-27 11:50:34 -05:00
David Erwin 1ca6736146 Merge branch 'master' into open-source-docs 2016-12-27 11:46:54 -05:00
David Erwin c86148c0f1 Add links to INSTALL.md 2016-12-27 11:39:54 -05:00
David Erwin b0e4b79a6a Merge pull request #197 from coralproject/addINSTALL
Adds a very simple INSTALL file for developers.
2016-12-27 11:33:58 -05:00
David Erwin da37bb32f1 Updating for style and completeness 2016-12-27 11:28:01 -05:00
David Erwin 0219f1916e Link contributing.md from readme.md 2016-12-27 10:59:08 -05:00
David Erwin ef40cf37fe Update contribution guide 2016-12-27 10:55:16 -05:00
Kim Gardner 8b5b9e856b Merge branch 'master' into addINSTALL 2016-12-23 16:13:36 -05:00
Belén Curcio 6052cac1d3 Merge pull request #196 from coralproject/map-dispatch-mod-queue
create mapStateToProps in ModerationQueue
2016-12-23 18:12:32 -03:00
Kim Gardner 93c5e336b2 Merge branch 'master' into addINSTALL 2016-12-23 16:12:18 -05:00
Belen Curcio 8d992f7809 merg 2016-12-23 16:13:36 -03:00
Belen Curcio 168248f975 Presentational and Container Components added 2016-12-23 16:09:46 -03:00
Wyatt Johnson 153193959c Merge pull request #200 from coralproject/npm-heroku
Update app.json
v0.0.1
2016-12-22 16:47:48 -07:00
Wyatt Johnson f6a683ac1a Merge branch 'master' into npm-heroku 2016-12-22 16:42:29 -07:00
Wyatt Johnson 16120091c5 Merge pull request #199 from coralproject/from-address
FROM field in pw reset email should be an environment variable
2016-12-22 16:42:22 -07:00
Wyatt Johnson a5527f98e4 Update app.json 2016-12-22 16:40:13 -07:00
Riley Davis 4e3d286740 add environment var for pw reset FROM field 2016-12-22 14:53:33 -07:00
Riley Davis 7381c3760a Merge pull request #180 from coralproject/suspect-wordlist
Suspect wordlist
2016-12-22 14:44:07 -07:00
Riley Davis 1239141eb9 use setIn to simplify 2016-12-22 14:11:04 -07:00
Riley Davis a9a9ebdfd9 normalize constant names 2016-12-22 13:53:42 -07:00
Riley Davis 9d1d109ec0 Merge branch 'master'
Conflicts:
	client/coral-admin/src/reducers/index.js
2016-12-22 12:28:55 -07:00
Riley Davis 6cca99e75e Merge branch 'master' into map-dispatch-mod-queue 2016-12-22 12:25:51 -07:00
Riley Davis 92b51ef1fe Merge branch 'master' into addINSTALL 2016-12-22 12:25:08 -07:00
Riley Davis d637f82193 Merge pull request #193 from coralproject/docs-add-reactions
Update definitions in swagger
2016-12-22 12:24:46 -07:00
Riley Davis e37696e64f Merge branch 'master' into docs-add-reactions 2016-12-22 12:17:49 -07:00
Riley Davis 8cd10176cd Merge pull request #184 from coralproject/add-flag-option
Add flag option
2016-12-22 12:17:34 -07:00
David Jay 5e01fe4025 Fixing bug in text box display. 2016-12-22 11:01:59 -08:00
Riley Davis 7c999e2cc8 Merge branch 'master' into add-flag-option 2016-12-22 11:20:05 -07:00
Riley Davis 2f2f7993a4 Merge pull request #192 from coralproject/font-size-docs
Making font sizes relative
2016-12-22 11:00:18 -07:00
Riley Davis b723d72254 Merge branch 'master' into font-size-docs 2016-12-22 10:40:30 -07:00
Riley Davis c6170f558a Merge branch 'master' into add-flag-option 2016-12-22 10:38:34 -07:00
Riley Davis ab839abbb5 Merge pull request #182 from coralproject/admin-asset-list
Admin asset list
2016-12-22 10:38:12 -07:00
gaba 39222759f9 Adds links between README and INSTALL. 2016-12-22 08:31:00 -08:00
David Jay fdf5da56cf Merge branch 'admin-asset-list' of github.com:coralproject/talk into admin-asset-list 2016-12-21 18:11:51 -08:00
David Jay 0fc3e09c74 Removing unused log statement and combining setState functions. 2016-12-21 18:08:57 -08:00
David Jay 1896baadb8 Merge branch 'master' into docs-add-reactions 2016-12-21 17:55:49 -08:00
David Jay ec455c99af Making small corrections to swagger. 2016-12-21 17:53:55 -08:00
David Jay 510b3754aa Properly formatting swagger docs. 2016-12-21 17:43:06 -08:00