 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 |
|
|
gaba
|
d3b1cd04d5
|
Merge branch 'master' of github.com:coralproject/talk
|
2016-11-09 12:40:22 -08:00 |
|
|
David Erwin
|
c2f450d969
|
Merging master and linting
|
2016-11-09 14:37:23 -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 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
|
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
|
7cfa767a9f
|
Merge branch 'master' of github.com:coralproject/talk
|
2016-11-09 09:34:35 -08:00 |
|
|
Dan Zajdband
|
890bacc2e8
|
Merge pull request #38 from coralproject/community
Routes and Layout Containers
|
2016-11-09 10:59:45 -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 |
|
|
David Jay
|
62af90be10
|
Merge pull request #41 from coralproject/error-middleware
Added error middleware
|
2016-11-08 19:00:19 -05:00 |
|
|
gaba
|
fff333480d
|
Merge branch 'master' of github.com:coralproject/talk
|
2016-11-08 15:28:22 -08:00 |
|
|
gaba
|
0968b02c3a
|
Moderation queue depending on moderation settings.
|
2016-11-08 15:26:05 -08:00 |
|
|
riley
|
843f90baea
|
merge master
|
2016-11-08 16:22:05 -07:00 |
|
|
Wyatt Johnson
|
7d5eae2e2f
|
Added embed stream preview
|
2016-11-08 16:21:50 -07:00 |
|
|
Riley Davis
|
c6188913d8
|
display a simple error text
|
2016-11-08 16:19:40 -07:00 |
|
|
Wyatt Johnson
|
84de3085bf
|
Merge branch 'master' into error-middleware
|
2016-11-08 16:18:15 -07:00 |
|
|
Riley Davis
|
ff52714f27
|
update state correctly. save to server correctly
|
2016-11-08 16:16:27 -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 |
|
|
Belen Curcio
|
8fd7a46d37
|
removed log
|
2016-11-08 19:52:37 -03:00 |
|
|
Belen Curcio
|
051209d8ad
|
Merge branch 'master' of github.com:coralproject/talk into community
|
2016-11-08 19:49:54 -03:00 |
|
|
Belen Curcio
|
4b7b8336ad
|
Env vars
|
2016-11-08 19:42:58 -03:00 |
|
|
Belen Curcio
|
6738ff86e1
|
changes
|
2016-11-08 19:35:56 -03:00 |
|
|
Riley Davis
|
2823232c12
|
add actions and reducers for settings
|
2016-11-08 15:25:48 -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 |
|
|
Belen Curcio
|
ad1d555574
|
Removing the watch
|
2016-11-08 18:51:52 -03:00 |
|
|
Belen Curcio
|
52fd6c1618
|
Community route
|
2016-11-08 18:50:40 -03:00 |
|
|
Belen Curcio
|
c9453c3c2a
|
Route nesting
|
2016-11-08 18:48:43 -03:00 |
|
|
Belen Curcio
|
285830211f
|
Updated Links
|
2016-11-08 18:46:50 -03:00 |
|
|
Belen Curcio
|
8920a59a92
|
ádding dev back
|
2016-11-08 18:25:54 -03:00 |
|
|
Belen Curcio
|
ce31161ef9
|
Production webpack
|
2016-11-08 18:22:27 -03:00 |
|
|
Belen Curcio
|
8e449c9023
|
Merge branch 'master' of github.com:coralproject/talk into community
|
2016-11-08 17:50:00 -03:00 |
|
|
Belen Curcio
|
cba476edfe
|
removing watch adding webpack const for env vars
|
2016-11-08 17:49:48 -03: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 |
|