 David Erwin
|
e632632754
|
Merging and updating tests
|
2016-11-10 12:16:58 -05:00 |
|
|
David Jay
|
b50c22a414
|
Merge branch 'master' of https://github.com/coralproject/talk into reader-flags
|
2016-11-09 22:44:12 -05:00 |
|
|
Wyatt Johnson
|
42a7eee1a2
|
Merge branch 'master' into auth
|
2016-11-09 16:28:39 -07:00 |
|
|
Wyatt Johnson
|
c203bf16eb
|
Improved tests and fixed them for new users model
|
2016-11-09 16:26:23 -07:00 |
|
|
David Erwin
|
9856c377eb
|
Merge branch 'master' into update-settings-in-ui
|
2016-11-09 17:34:25 -05:00 |
|
|
gaba
|
d7ea18cba9
|
Fix linting problems. Remove comment of code. Add package.
|
2016-11-09 13:52:47 -08:00 |
|
|
David Erwin
|
ef0016dbc1
|
Merge in master and lint
|
2016-11-09 16:30:30 -05:00 |
|
|
Wyatt Johnson
|
ef22da5f29
|
Merge branch 'master' into auth
|
2016-11-09 12:52:09 -07:00 |
|
|
Wyatt Johnson
|
0646645686
|
Added new cli interface + users model
|
2016-11-09 12:51:32 -07:00 |
|
|
David Jay
|
e0e80aa5cd
|
Moving coral-framework tests over and updating mocha to transpile them.
|
2016-11-09 14:10:01 -05:00 |
|
|
Wyatt Johnson
|
eb146f286b
|
Merge branch 'master' into client-eslint
|
2016-11-09 11:16:21 -07:00 |
|
|
Wyatt Johnson
|
f708271d00
|
Added missing babel plugin
|
2016-11-09 09:03:25 -07:00 |
|
|
Wyatt Johnson
|
e638d2785b
|
Some dep fixes which will hopefully resolve the CI issues
|
2016-11-09 07:53:34 -07:00 |
|
|
Wyatt Johnson
|
d8ec009482
|
Added linting to the client
|
2016-11-08 17:16:24 -07:00 |
|
|
Wyatt Johnson
|
8369f263fb
|
Merged webpack files to unified
|
2016-11-08 15:00:19 -07:00 |
|
|
David Erwin
|
57c63348bd
|
Merge branch 'master' into embed-link
|
2016-11-08 14:44:18 -05:00 |
|
|
Riley Davis
|
1874206dd7
|
update root package.json
|
2016-11-08 12:38:16 -07:00 |
|
|
Riley Davis
|
23eb24272d
|
Merge branch 'master' into admin-routes
|
2016-11-08 12:04:20 -07:00 |
|
|
Riley Davis
|
6f6da14401
|
fix build script a bit
|
2016-11-08 11:27:47 -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 Jay
|
80754ee57b
|
Updating build scripts for coral-admin
|
2016-11-08 12:55:32 -05:00 |
|
|
Riley Davis
|
ed509ad36b
|
build from root. routes in coral-admin menu work
|
2016-11-08 09:13:04 -07:00 |
|
|
Riley Davis
|
686d39c47b
|
merge master
|
2016-11-07 15:28:20 -07: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 |
|
|
David Erwin
|
8685e31b57
|
Integrating webpack build files, working commit
|
2016-11-07 15:31:12 -05:00 |
|
|
gaba
|
03e5242dcf
|
Merge branch 'master' into comment-api-implementation
|
2016-11-07 12:22:31 -08:00 |
|
|
David Jay
|
e5c04b5fd1
|
Updating routes and adding dev webpack to package.json
|
2016-11-07 13:51:40 -05:00 |
|
|
David Erwin
|
2ff6bcf85d
|
Merging master into asset
|
2016-11-07 12:00:28 -05:00 |
|
|
David Erwin
|
a6b2215a4b
|
Implement asset tests
|
2016-11-05 11:14:21 -04:00 |
|
|
David Erwin
|
c80282dd91
|
Implement asset upsert and find
|
2016-11-04 22:24:06 -04:00 |
|
|
gaba
|
3c8f310987
|
Merge branch 'master' into comment-api
|
2016-11-04 14:58:46 -07:00 |
|
|
Wyatt Johnson
|
c4de906e01
|
Bumped version of node to 7.0.0
|
2016-11-04 15:36:29 -06:00 |
|
|
gaba
|
bbe086df69
|
Merge branch 'master' into comment-api
|
2016-11-04 14:18:04 -07:00 |
|
|
Kim Gardner
|
b29a9a1c24
|
Merge branch 'master' into comment-api
|
2016-11-04 16:49:29 -04:00 |
|
|
Wyatt Johnson
|
a674f48879
|
Merge branch 'master' into docker-compose
|
2016-11-04 14:33:20 -06:00 |
|
|
Wyatt Johnson
|
b17854735e
|
Initial commit of deployment code
|
2016-11-04 14:24:23 -06:00 |
|
|
gaba
|
8cea206dd8
|
Add chai-http for tests. Simplify route for comments
|
2016-11-04 13:21:55 -07:00 |
|
|
Riley Davis
|
2af57b9ab0
|
Merge branch 'master' into parse-body-send-json
|
2016-11-04 11:00:03 -06:00 |
|
|
David Jay
|
8e9ebfb1a9
|
Adding find functions and tests to user and action models.
|
2016-11-03 17:45:37 -07:00 |
|
|
David Jay
|
df77ee963a
|
Adding find functions and tests to comment model.
|
2016-11-03 17:06:15 -07:00 |
|
|
Riley Davis
|
7facdf0840
|
make the settings routes actually work
|
2016-11-03 16:34:01 -06:00 |
|
|
David Jay
|
2faafd9b89
|
Merge branch 'master' into mock-stream-endpoint
# Conflicts:
# package.json
|
2016-11-02 15:46:48 -07:00 |
|
|
David Jay
|
e805573bd4
|
Adding build script to package.json
|
2016-11-02 15:45:52 -07:00 |
|
|
Belen Curcio
|
ed7bf1cc0b
|
Merge branch 'master' of github.com:coralproject/talk into enh-test
|
2016-11-02 15:08:16 -03:00 |
|
|
Belen Curcio
|
265be1898d
|
Adding mock test
|
2016-11-02 09:57:18 -03:00 |
|
|
Belen Curcio
|
f1469d0dbc
|
Merge branch 'master' of github.com:coralproject/talk into enh-test
|
2016-11-02 09:12:47 -03:00 |
|
|
Belen Curcio
|
61e9e30ac5
|
Adding test script
|
2016-11-02 09:02:34 -03:00 |
|
|
Belen Curcio
|
ac80d2683d
|
Adding eslint as devDep
|
2016-11-02 08:58:31 -03:00 |
|