 Wyatt Johnson
|
84de3085bf
|
Merge branch 'master' into error-middleware
|
2016-11-08 16:18:15 -07:00 |
|
|
David Jay
|
ae4b2b69c8
|
Merge pull request #39 from coralproject/webpack-unification
Merged webpack files to unified webpack
|
2016-11-08 18:09:30 -05:00 |
|
|
Wyatt Johnson
|
a1fd4d32ba
|
Added error middleware
|
2016-11-08 15:53:26 -07:00 |
|
|
Wyatt Johnson
|
2fdd440720
|
Merge branch 'master' into webpack-unification
|
2016-11-08 15:07:18 -07:00 |
|
|
David Erwin
|
571778f42b
|
Merge pull request #36 from coralproject/ci-fixes
Added circle improvements
|
2016-11-08 17:07:13 -05:00 |
|
|
Wyatt Johnson
|
3c2eb9a42d
|
Merge branch 'master' into ci-fixes
|
2016-11-08 15:04:12 -07:00 |
|
|
Wyatt Johnson
|
8369f263fb
|
Merged webpack files to unified
|
2016-11-08 15:00:19 -07:00 |
|
|
Gabriela Rodríguez Berón
|
5270aefe6a
|
Merge pull request #37 from coralproject/terminology
Add TERMINOLOGY.md
|
2016-11-08 12:49:15 -08:00 |
|
|
David Erwin
|
551ba2ebb3
|
Add TERMINOLOGY.md
|
2016-11-08 15:46:00 -05:00 |
|
|
David Erwin
|
181944e367
|
Merge pull request #32 from coralproject/embed-link
Embed link
|
2016-11-08 14:56:28 -05:00 |
|
|
David Erwin
|
661b402351
|
Remove npm install from coral-admin build
|
2016-11-08 14:53:28 -05:00 |
|
|
David Erwin
|
57c63348bd
|
Merge branch 'master' into embed-link
|
2016-11-08 14:44:18 -05:00 |
|
|
David Erwin
|
d1b027af27
|
Merge pull request #35 from coralproject/css-build
enable css modules
|
2016-11-08 14:42:08 -05:00 |
|
|
Wyatt Johnson
|
24c9215dc2
|
Added circle improvements
|
2016-11-08 12:39:49 -07:00 |
|
|
Riley Davis
|
15f7f9ee0c
|
Merge branch 'master' into css-build
|
2016-11-08 12:38:50 -07:00 |
|
|
Riley Davis
|
b0b5136b4f
|
Merged branch css-build into css-build
|
2016-11-08 12:38:24 -07:00 |
|
|
Riley Davis
|
1874206dd7
|
update root package.json
|
2016-11-08 12:38:16 -07:00 |
|
|
David Jay
|
a615356936
|
Merge pull request #34 from coralproject/update-readme
Update readme
|
2016-11-08 14:37:17 -05:00 |
|
|
David Erwin
|
6c9e31c52d
|
Drop trailing slash requirement on admin route
|
2016-11-08 14:36:40 -05:00 |
|
|
Riley Davis
|
c609e5b3bb
|
enable css modules
|
2016-11-08 12:35:37 -07:00 |
|
|
Kim Gardner
|
ff42d571e6
|
Add trailing slashes to URLs
|
2016-11-08 14:25:53 -05:00 |
|
|
Kim Gardner
|
db66c66f3d
|
Update admin route
|
2016-11-08 14:23:42 -05:00 |
|
|
Kim Gardner
|
e3074892ce
|
Add moderator view URL
|
2016-11-08 14:23:41 -05:00 |
|
|
Kim Gardner
|
c7cf2785fd
|
Update README
|
2016-11-08 14:23:41 -05:00 |
|
|
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 |
|
|
David Jay
|
4a3f16b136
|
Merge branch 'master' into embed-link
|
2016-11-08 13:03:14 -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 |
|
|
David Jay
|
7e72046481
|
Adding npm install to build process for coral-admin so build works.
|
2016-11-08 12:57:16 -05:00 |
|
|
David Jay
|
ee33b8445b
|
Adding embed script to appropriate screen in settings.
|
2016-11-08 12:56:22 -05:00 |
|
|
David Jay
|
80754ee57b
|
Updating build scripts for coral-admin
|
2016-11-08 12:55:32 -05:00 |
|
|
riley
|
095f6a319e
|
remove the 2 requests in settings tests. add Promises
|
2016-11-08 10:38:49 -07:00 |
|
|
David Jay
|
411e6e48f3
|
Removing unused copy from build process.
|
2016-11-08 12:28:09 -05: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 |
|