 David Erwin
|
9856c377eb
|
Merge branch 'master' into update-settings-in-ui
|
2016-11-09 17:34:25 -05:00 |
|
|
Dan Zajdband
|
99f0e77ce1
|
add(coral-admin): Working actions
|
2016-11-09 17:27:44 -05:00 |
|
|
David Erwin
|
f6473972d8
|
Remove browser: true in favor of client's eslint file
|
2016-11-09 17:19:44 -05:00 |
|
|
David Erwin
|
39654f34f2
|
Updating eslint as per @wyattjoh's request
|
2016-11-09 17:15:39 -05:00 |
|
|
David Erwin
|
777dd9d4ed
|
Merge branch 'update-settings-in-ui' of https://github.com/coralproject/talk into update-settings-in-ui
|
2016-11-09 17:13:27 -05:00 |
|
|
David Erwin
|
decb6747fd
|
Comment out inactive Settings options
|
2016-11-09 17:12:52 -05:00 |
|
|
David Jay
|
b7ee23d000
|
Updating commentstream to reflect new store structure.
|
2016-11-09 17:01:50 -05:00 |
|
|
gaba
|
49ea01049f
|
Merge branch 'master' into update-settings-in-ui
|
2016-11-09 13:57:19 -08:00 |
|
|
gaba
|
d7ea18cba9
|
Fix linting problems. Remove comment of code. Add package.
|
2016-11-09 13:52:47 -08:00 |
|
|
David Erwin
|
c80bd19b85
|
Merge pull request #40 from coralproject/flagging-adapt-api
api-adapt(coral-admin): Get flagging mod queue working with the backend
|
2016-11-09 16:46:56 -05:00 |
|
|
David Jay
|
6ab561b91b
|
Updating and passing coral-framework tests
|
2016-11-09 16:39:54 -05:00 |
|
|
David Erwin
|
ef0016dbc1
|
Merge in master and lint
|
2016-11-09 16:30:30 -05:00 |
|
|
gaba
|
74e162265b
|
Merge branch 'master' into queue
|
2016-11-09 12:40:31 -08:00 |
|
|
gaba
|
d3b1cd04d5
|
Merge branch 'master' of github.com:coralproject/talk
|
2016-11-09 12:40:22 -08:00 |
|
|
gaba
|
eae2a0285b
|
More tests and move settings stuff to routes and out of models.
|
2016-11-09 12:35:59 -08: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 |
|
|
gaba
|
9ff2613ab4
|
Comment stream with new and approved when post-moderated.
|
2016-11-09 11:40:57 -08:00 |
|
|
David Erwin
|
c2f450d969
|
Merging master and linting
|
2016-11-09 14:37:23 -05:00 |
|
|
David Jay
|
e0e80aa5cd
|
Moving coral-framework tests over and updating mocha to transpile them.
|
2016-11-09 14:10:01 -05:00 |
|
|
David Erwin
|
255e459e26
|
Merge pull request #44 from coralproject/embed-link
Updating embed link style to match designs.
|
2016-11-09 14:03:58 -05:00 |
|
|
David Erwin
|
dc981a93a6
|
Merging in master
|
2016-11-09 13:58:19 -05:00 |
|
|
David Jay
|
13aabb9974
|
Re-adding notification length to config.
|
2016-11-09 13:54:44 -05:00 |
|
|
David Jay
|
6616cf0c51
|
Uncommenting flags and hydrating actions.
|
2016-11-09 13:42:03 -05:00 |
|
|
David Erwin
|
694f894539
|
Merge pull request #43 from coralproject/client-eslint
Added linting to the client
|
2016-11-09 13:29:39 -05:00 |
|
|
David Jay
|
07db6b3f9c
|
Merge branch 'master' of https://github.com/coralproject/talk into reader-flags
|
2016-11-09 13:22:45 -05:00 |
|
|
David Jay
|
e9cf1004fc
|
Merge branch 'embed-link' of https://github.com/coralproject/talk into embed-link
|
2016-11-09 13:16:51 -05:00 |
|
|
Wyatt Johnson
|
eb146f286b
|
Merge branch 'master' into client-eslint
|
2016-11-09 11:16:21 -07:00 |
|
|
David Jay
|
1e2f377329
|
Updating copied text padding.
|
2016-11-09 13:13:25 -05:00 |
|
|
gaba
|
a7061c29a6
|
Merge branch 'master' into queue
|
2016-11-09 09:34:57 -08:00 |
|
|
gaba
|
7cfa767a9f
|
Merge branch 'master' of github.com:coralproject/talk
|
2016-11-09 09:34:35 -08:00 |
|
|
gaba
|
ab68b81f21
|
Add tests to stream on moderated comments.
|
2016-11-09 09:33:15 -08:00 |
|
|
gaba
|
48d404137d
|
Merge branch 'master' of github.com:coralproject/talk into queue
|
2016-11-09 08:34:59 -08:00 |
|
|
Belen Curcio
|
3dcfb58134
|
Merge branch 'master' of github.com:coralproject/talk into flagging-adapt-api
|
2016-11-09 13:08:26 -03:00 |
|
|
Wyatt Johnson
|
f708271d00
|
Added missing babel plugin
|
2016-11-09 09:03:25 -07:00 |
|
|
Dan Zajdband
|
890bacc2e8
|
Merge pull request #38 from coralproject/community
Routes and Layout Containers
|
2016-11-09 10:59:45 -05:00 |
|
|
Dan Zajdband
|
4d0bacafd3
|
Merge branch 'master' into flagging-adapt-api
|
2016-11-09 10:46:50 -05:00 |
|
|
Belen Curcio
|
c36604f7dd
|
Merge branch 'community' of github.com:coralproject/talk into community
|
2016-11-09 12:26:55 -03:00 |
|
|
Belen Curcio
|
e0512bbe92
|
Merge branch 'master' of github.com:coralproject/talk into community
|
2016-11-09 12:19:29 -03:00 |
|
|
Wyatt Johnson
|
6784612b61
|
Merge branch 'master' into embed-link
|
2016-11-09 08:13:41 -07:00 |
|
|
Wyatt Johnson
|
6aae992a45
|
Merge branch 'master' into community
|
2016-11-09 08:02:37 -07:00 |
|
|
Dan Zajdband
|
6dee464eec
|
Merge pull request #45 from coralproject/build-errors
Some dep fixes which will hopefully resolve the CI issues
|
2016-11-09 10:00:31 -05:00 |
|
|
Wyatt Johnson
|
e638d2785b
|
Some dep fixes which will hopefully resolve the CI issues
|
2016-11-09 07:53:34 -07:00 |
|
|
Belen Curcio
|
72d01539fa
|
Adding version and env
|
2016-11-09 10:16:07 -03:00 |
|
|
Belen Curcio
|
0df83a2d95
|
Merge branch 'master' of github.com:coralproject/talk into community
|
2016-11-08 21:32:32 -03:00 |
|
|
David Jay
|
418b1529ed
|
Updating copying style to match designs.
|
2016-11-08 19:18:26 -05:00 |
|
|
Wyatt Johnson
|
d8ec009482
|
Added linting to the client
|
2016-11-08 17:16:24 -07:00 |
|
|
gaba
|
b5769f429c
|
One test to do.
|
2016-11-08 16:01:57 -08:00 |
|
|
David Jay
|
62af90be10
|
Merge pull request #41 from coralproject/error-middleware
Added error middleware
|
2016-11-08 19:00:19 -05:00 |
|
|
gaba
|
b19f936e64
|
Adds tests
|
2016-11-08 15:59:35 -08:00 |
|