 David Erwin
|
2baeedeb58
|
Merge pull request #33 from coralproject/admin-routes
add ejs templating and serve coral-admin from /admin
|
2016-11-08 14:15:56 -05:00 |
|
|
Riley Davis
|
23eb24272d
|
Merge branch 'master' into admin-routes
|
2016-11-08 12:04:20 -07:00 |
|
|
Riley Davis
|
80f1f70a2a
|
hardcode routes in react app
|
2016-11-08 12:03:49 -07:00 |
|
|
Gabriela Rodríguez Berón
|
28e6f87b1b
|
Merge pull request #26 from coralproject/mod-queue
Mod queue
|
2016-11-08 10:30:01 -08:00 |
|
|
Riley Davis
|
6f6da14401
|
fix build script a bit
|
2016-11-08 11:27:47 -07:00 |
|
|
gaba
|
ed01d54418
|
It fixes random test on get comment by comment_id.
|
2016-11-08 10:26:35 -08:00 |
|
|
Riley Davis
|
b2bfadafca
|
Merged branch admin-routes into admin-routes
|
2016-11-08 11:25:00 -07:00 |
|
|
Riley Davis
|
b6355b06db
|
remove unused var
|
2016-11-08 11:24:46 -07:00 |
|
|
Riley Davis
|
e56284569a
|
Merge branch 'master' into admin-routes
|
2016-11-08 11:20:53 -07:00 |
|
|
Riley Davis
|
a15d2eade7
|
add ejs templating and serve coral-admin from /admin
|
2016-11-08 11:15:08 -07:00 |
|
|
David Erwin
|
242e64198a
|
Add autoprefixer to dependencies
|
2016-11-08 13:09:09 -05:00 |
|
|
David Erwin
|
2807b2d5b2
|
Merge master into nod-queue
|
2016-11-08 13:05:31 -05:00 |
|
|
Gabriela Rodríguez Berón
|
28eee209a8
|
Merge pull request #31 from coralproject/even-more-fixing
remove the 2 requests in settings tests. add Promises
|
2016-11-08 10:01:14 -08:00 |
|
|
riley
|
095f6a319e
|
remove the 2 requests in settings tests. add Promises
|
2016-11-08 10:38:49 -07:00 |
|
|
Kim Gardner
|
bc7c877bfb
|
Merge pull request #30 from coralproject/fix-settings-test
fix a race condition in the tests
|
2016-11-08 12:27:37 -05:00 |
|
|
Riley Davis
|
b10ae913ab
|
fix a race condition in the tests
|
2016-11-08 10:07:41 -07:00 |
|
|
gaba
|
98bd1db614
|
Merge branch 'master' into mod-queue
|
2016-11-08 08:57:11 -08:00 |
|
|
David Erwin
|
12aa9c6260
|
Merge pull request #29 from coralproject/one-build
One build
|
2016-11-08 11:43:15 -05:00 |
|
|
David Erwin
|
4fcbead158
|
Merge branch 'master' into one-build
|
2016-11-08 11:34:59 -05:00 |
|
|
Riley Davis
|
ed509ad36b
|
build from root. routes in coral-admin menu work
|
2016-11-08 09:13:04 -07:00 |
|
|
gaba
|
588a8de489
|
MOve two lines into one.
|
2016-11-07 18:16:04 -08:00 |
|
|
gaba
|
c8c82fd03b
|
Move all DB functions into models. Clean up tests.
|
2016-11-07 18:10:17 -08:00 |
|
|
David Erwin
|
57ec16e6ef
|
Merge pull request #28 from coralproject/post-comment
Post order bugfix
|
2016-11-07 18:47:07 -05:00 |
|
|
David Jay
|
33c77178a9
|
Fixing id bug in redux store.
|
2016-11-07 18:41:23 -05:00 |
|
|
David Jay
|
e7f4f82f66
|
Fixing comment post order bug.
|
2016-11-07 18:41:07 -05:00 |
|
|
David Erwin
|
b51766ee2e
|
Merge pull request #27 from coralproject/post-comment
Chronological replies and multiline comments
|
2016-11-07 18:20:45 -05:00 |
|
|
David Jay
|
269be5b33f
|
Merge branch 'master' into post-comment
|
2016-11-07 18:17:33 -05:00 |
|
|
gaba
|
1cd79c2793
|
Merge branch 'master' into mod-queue
|
2016-11-07 15:13:57 -08:00 |
|
|
gaba
|
0c04e765d6
|
Moderation queue on flagged comments.
|
2016-11-07 15:10:56 -08:00 |
|
|
David Jay
|
456524e4ee
|
Adding multiline comments.
|
2016-11-07 18:09:26 -05:00 |
|
|
David Jay
|
47bcd163b1
|
Showing comments in chronological order.
|
2016-11-07 17:56:44 -05:00 |
|
|
David Erwin
|
8cc6d9db10
|
Merge pull request #25 from coralproject/post-comment
Post comment
|
2016-11-07 17:34:34 -05:00 |
|
|
David Jay
|
f1f051e63f
|
Copying over files in dev webpack
|
2016-11-07 17:29:49 -05:00 |
|
|
gaba
|
48e61c2dc1
|
Merge branch 'master' into mod-queue
|
2016-11-07 14:28:25 -08:00 |
|
|
Riley Davis
|
686d39c47b
|
merge master
|
2016-11-07 15:28:20 -07:00 |
|
|
gaba
|
626687f05b
|
Adds moderations queues.
|
2016-11-07 14:18:43 -08:00 |
|
|
David Jay
|
4f33818153
|
Posting items in reverse chronological order.
|
2016-11-07 17:12:20 -05:00 |
|
|
David Jay
|
c5d15eed77
|
Fixing bug in reply counting.
|
2016-11-07 16:54:52 -05:00 |
|
|
David Jay
|
3bdd1893e0
|
Commenting out flag button.
|
2016-11-07 16:48:57 -05:00 |
|
|
David Jay
|
9c3957ad40
|
Getting pym via https
|
2016-11-07 16:47:03 -05:00 |
|
|
David Jay
|
621a5e806f
|
Merge pull request #24 from coralproject/post-comment
Overriding CI, all we did here was change a docker file and test were running before.
|
2016-11-07 16:37:26 -05:00 |
|
|
David Jay
|
167876ee3d
|
Enabling build in dockerfile.
|
2016-11-07 16:35:46 -05:00 |
|
|
David Jay
|
b93ad47dca
|
Switching to local webpack.
|
2016-11-07 16:33:56 -05:00 |
|
|
David Jay
|
c8bdecbd1b
|
Merge branch 'master' of https://github.com/coralproject/talk into post-comment
|
2016-11-07 16:29:06 -05:00 |
|
|
Dan Zajdband
|
018784d725
|
fix(coral-admin): building, no css
|
2016-11-07 16:26:49 -05:00 |
|
|
David Jay
|
0e1e04d2a9
|
Returning usernames.
|
2016-11-07 16:19:20 -05:00 |
|
|
David Erwin
|
b813f91f9b
|
Merge pull request #23 from coralproject/comment-tests
Comment tests
|
2016-11-07 16:14:57 -05:00 |
|
|
gaba
|
8154133fe2
|
Improve test to remove comment.
|
2016-11-07 13:11:43 -08:00 |
|
|
David Jay
|
4737e84681
|
Displaying comments and replies appropriately.
|
2016-11-07 16:11:10 -05:00 |
|
|
gaba
|
d911e5b30d
|
Improve test.
|
2016-11-07 13:08:23 -08:00 |
|