 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
|
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 |
|
|
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 |
|
|
Riley Davis
|
fce473a4b1
|
Merge branch 'master' into add-flag-option
|
2016-12-21 17:03:24 -07:00 |
|
|
Riley Davis
|
b8b47e9c2c
|
normalize constant names
|
2016-12-21 16:56:29 -07:00 |
|
|
Riley Davis
|
7fc3dffc77
|
reload assets after updating state
|
2016-12-21 16:49:53 -07:00 |
|
|
Riley Davis
|
7cbd06834f
|
set defaults on fetchAssets
|
2016-12-21 16:39:29 -07:00 |
|
|
David Jay
|
81ff5420fe
|
Completing user endpoitn updates.
|
2016-12-21 15:26:47 -08:00 |
|
|
Wyatt Johnson
|
6db2361edb
|
Adjusted middleware
|
2016-12-21 16:19:19 -07:00 |
|
|
Wyatt Johnson
|
8233937f7a
|
Moved wordlist loading into the middleware
|
2016-12-21 15:55:40 -07:00 |
|
|
David Jay
|
c867ae8eeb
|
Removing Next and Prev from pager and updating tests.
|
2016-12-21 12:11:42 -08:00 |
|
|
David Jay
|
cfed42be2c
|
Correcting bug in fetchAssets.
|
2016-12-21 12:05:25 -08:00 |
|
|
David Jay
|
00cf81563e
|
Adding user endpoints to swagger.
|
2016-12-21 12:01:37 -08:00 |
|
|
David Jay
|
55f58beced
|
Merge branch 'admin-asset-list' of github.com:coralproject/talk into admin-asset-list
|
2016-12-21 11:39:56 -08:00 |
|
|
David Jay
|
29fa26260c
|
Handling undefined values in fetchAssets call.
|
2016-12-21 11:39:21 -08:00 |
|
|
David Jay
|
8f877b87cb
|
Adding swagger endpoints.
|
2016-12-21 11:32:30 -08:00 |
|
|
Riley Davis
|
9cea233ce4
|
Merge branch 'master' into admin-asset-list
|
2016-12-21 12:13:27 -07:00 |
|
|
Riley Davis
|
4f9e793810
|
remove logs
|
2016-12-21 11:23:08 -07:00 |
|
|
riley
|
f5b8c0bbba
|
fix lint
|
2016-12-21 11:19:17 -07:00 |
|
|
Riley Davis
|
b6a11fb729
|
Merged branch master into suspect-wordlist
|
2016-12-21 11:12:26 -07:00 |
|
|
Riley Davis
|
18d4c58a48
|
allow pasting comma-separated lists
|
2016-12-21 11:12:09 -07:00 |
|
|
David Erwin
|
917feeaba2
|
Merge pull request #194 from coralproject/heroku
Initial support for Heroku Deployment
|
2016-12-21 10:17:47 -05:00 |
|
|
David Jay
|
149a0487c6
|
Merge branch 'admin-asset-list' of github.com:coralproject/talk into admin-asset-list
|
2016-12-20 17:03:17 -08:00 |
|
|
David Jay
|
a490aaeaf0
|
Merge branch 'master' of github.com:coralproject/talk into admin-asset-list
|
2016-12-20 17:02:24 -08:00 |
|
|
Wyatt Johnson
|
ef38ed3443
|
Added postinstall hook for heroku deploys
|
2016-12-20 17:51:30 -07:00 |
|
|
David Jay
|
0235d26295
|
Correcting accidentally moved pager files.
|
2016-12-20 16:34:27 -08:00 |
|
|
Wyatt Johnson
|
36c9f51aa8
|
Initial support for Heroku Deployment
|
2016-12-20 17:33:18 -07:00 |
|
|
David Jay
|
7faa3eeecf
|
Merge branch 'master' of github.com:coralproject/talk into add-flag-option
|
2016-12-20 16:23:39 -08:00 |
|
|
David Jay
|
8052dd9149
|
Merge branch 'docs-add-reactions' of github.com:coralproject/talk into docs-add-reactions
|
2016-12-20 16:19:57 -08:00 |
|
|
David Jay
|
d998549fd0
|
Updating swagger docs.
|
2016-12-20 16:16:10 -08:00 |
|
|
Riley Davis
|
9315337ce6
|
suspect words are marked up
|
2016-12-20 16:56:16 -07:00 |
|
|
Riley Davis
|
ef0055e689
|
highlight suspect words
|
2016-12-20 16:42:16 -07:00 |
|
|
Riley Davis
|
9e0ab7d2a1
|
load actions in a reducer
|
2016-12-20 15:47:27 -07:00 |
|
|
David Jay
|
c85daa2ece
|
Merge branch 'master' into docs-add-reactions
|
2016-12-20 13:53:49 -08:00 |
|
|
Riley Davis
|
652a41971b
|
Merge branch 'master'
Conflicts:
client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
|
2016-12-20 14:51:36 -07:00 |
|
|
Gabriela Rodríguez Berón
|
9d22dcd0d4
|
Merge pull request #190 from coralproject/refactor-talk-adapter
Refactor talk adapter
|
2016-12-20 13:45:19 -08:00 |
|
|
David Jay
|
c4510c1abf
|
Updating action documentation.
|
2016-12-20 13:43:38 -08:00 |
|