Commit Graph

7162 Commits

Author SHA1 Message Date
gaba 8e5e75ed6f It works for user signin/signup and posting comments. 2016-12-23 14:57:39 -08:00
gaba 6892ef85f8 Sending the CSRF to the POST request. 2016-12-23 13:56:42 -08:00
Kim Gardner 8b5b9e856b Merge branch 'master' into addINSTALL 2016-12-23 16:13:36 -05:00
Kim Gardner ac66a7bb0e Merge branch 'master' into csrf 2016-12-23 16:12:53 -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
gaba 8e6aa23d32 More CSRF in front-end. 2016-12-23 13:07:16 -08: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
Belén Curcio 964c1cb3d2 Linting 2016-12-23 12:06:40 -03:00
Belén Curcio 9766215231 Rename FRONTEND.md to README.md 2016-12-23 11:51:46 -03:00
Belén Curcio 3b1731e809 Update FRONTEND.md 2016-12-23 10:56:15 -03:00
Belén Curcio 1538690cad Update FRONTEND.md 2016-12-23 10:55:30 -03:00
Belén Curcio ca9ef44202 links 2016-12-23 10:52:32 -03:00
Belén Curcio 3dfa4969e5 Update IMMUTABLEJS.md 2016-12-23 10:50:16 -03:00
Belén Curcio 92a8fc5a93 links 2016-12-23 10:49:45 -03:00
Belén Curcio 018447f00e Update DEBUG.md 2016-12-23 10:43:59 -03:00
Belen Curcio b36109f0a1 Áddind debug 2016-12-23 10:39:03 -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
gaba ec3e9d1cd4 Merge branch 'master' into csrf 2016-12-22 14:23:01 -08:00
gaba 54d0096dd1 More CSRF in forms. 2016-12-22 14:17:09 -08: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
gaba 075fe7f6b4 Merge branch 'master' into csrf 2016-12-21 16:03:59 -08:00
Riley Davis fce473a4b1 Merge branch 'master' into add-flag-option 2016-12-21 17:03:24 -07:00
gaba 54bad908b3 Apply changes from review. 2016-12-21 16:01:16 -08:00
Riley Davis b8b47e9c2c normalize constant names 2016-12-21 16:56:29 -07:00