 Belén Curcio
|
c72a5c6df9
|
Merge branch 'master' into action-label-fix
|
2017-04-19 12:05:59 -03:00 |
|
|
Belen Curcio
|
9ddc6c35fd
|
Action labels default.css, temporary fix
|
2017-04-19 11:59:07 -03:00 |
|
|
Chi Vinh Le
|
0e6b0c01fd
|
Fix issue with ignoredUsers
|
2017-04-19 21:06:57 +07:00 |
|
|
Chi Vinh Le
|
6fb2a95bf2
|
Move query logic to coral-embed-stream
|
2017-04-19 20:28:14 +07:00 |
|
|
Chi Vinh Le
|
f724353cf0
|
Fix collapsing UI
|
2017-04-19 16:38:02 +07:00 |
|
|
Chi Vinh Le
|
7698bdf930
|
Fix load more in premod queue
|
2017-04-19 16:35:53 +07:00 |
|
|
Chi Vinh Le
|
d5d424bfc5
|
Merge branch 'master' into embed-refactor
|
2017-04-19 16:16:14 +07:00 |
|
|
Kiwi
|
1750510d34
|
Merge pull request #504 from coralproject/valid-notification-actions
Return a value for notification actions
|
2017-04-19 16:12:40 +07:00 |
|
|
Wyatt Johnson
|
ecbb66e270
|
Fix linting
|
2017-04-18 15:53:15 -06:00 |
|
|
Wyatt Johnson
|
45094fd176
|
Optimized sub model
|
2017-04-18 15:48:33 -06:00 |
|
|
Wyatt Johnson
|
e1c8e75405
|
Merge branch 'master' into subscriptions
|
2017-04-18 15:43:25 -06:00 |
|
|
Wyatt Johnson
|
2eda1cb1e4
|
Added defaultResolveType
|
2017-04-18 14:50:57 -06:00 |
|
|
Chi Vinh Le
|
4ce4c74fd9
|
Return a value for notification actions
|
2017-04-19 01:09:59 +07:00 |
|
|
Chi Vinh Le
|
e9331e90d3
|
Add missing check
|
2017-04-19 01:07:49 +07:00 |
|
|
Chi Vinh Le
|
d3b81dff35
|
Merge branch 'master' into embed-refactor
Conflicts:
client/coral-plugin-commentbox/CommentBox.js
|
2017-04-19 00:18:50 +07:00 |
|
|
Belén Curcio
|
bfacc8f2f7
|
Merge pull request #479 from coralproject/plugin_examples
Hooks and Context for Comment Plugins And Off-Topic Plugin
|
2017-04-18 13:52:30 -03:00 |
|
|
Belén Curcio
|
ad15b38a5d
|
Merge branch 'master' into plugin_examples
|
2017-04-18 13:46:44 -03:00 |
|
|
Chi Vinh Le
|
af5be0469f
|
Refactor embed
|
2017-04-18 23:20:39 +07:00 |
|
|
Chi Vinh Le
|
b40eed4751
|
Move to components folder
|
2017-04-18 23:14:28 +07:00 |
|
|
Wyatt Johnson
|
fd6282077f
|
Adjusted test to conform to new form
|
2017-04-17 16:05:44 -06:00 |
|
|
Riley Davis
|
673bbb61b1
|
Merge branch 'master' into all-comments-queue
|
2017-04-17 15:41:30 -06:00 |
|
|
riley
|
449a6f67f1
|
add some tab icons
|
2017-04-17 15:37:00 -06:00 |
|
|
Riley Davis
|
b5210f3727
|
more translations
|
2017-04-17 14:42:18 -06:00 |
|
|
Riley Davis
|
cc6882168b
|
add translations
|
2017-04-17 14:31:45 -06:00 |
|
|
Riley Davis
|
df859dc782
|
add all tab
|
2017-04-17 14:12:45 -06:00 |
|
|
Riley Davis
|
a5d11a05d1
|
Merge branch 'master' into flag-detail
|
2017-04-17 14:00:32 -06:00 |
|
|
Gabriela Rodríguez Berón
|
7526d64bc0
|
Merge pull request #493 from coralproject/143520971-stream-settings
Configure stream settings
|
2017-04-17 12:45:34 -07:00 |
|
|
Gabriela Rodríguez Berón
|
04a4918fd5
|
Update ConfigureStreamContainer.js
|
2017-04-17 12:35:29 -07:00 |
|
|
Gabriela Rodríguez Berón
|
371e3b951d
|
Merge branch 'master' into 143520971-stream-settings
|
2017-04-17 12:25:40 -07:00 |
|
|
gaba
|
f66e12be18
|
Merge branch 'master' into 143520971-stream-settings
|
2017-04-17 12:07:19 -07:00 |
|
|
gaba
|
fb010bfa67
|
Rename settings of the state to dirtySettings and add TO DO item to be sure we refactor this next time we do a refactor.
|
2017-04-17 11:51:24 -07:00 |
|
|
Belen Curcio
|
e729a673a3
|
Merge branch 'master' of github.com:coralproject/talk into plugin_examples
|
2017-04-17 14:17:42 -03:00 |
|
|
Wyatt Johnson
|
7fac8ef073
|
Merge branch 'master' into subscriptions
|
2017-04-17 08:03:14 -06:00 |
|
|
Riley Davis
|
d6b2d6d876
|
Merge branch 'master' into flag-detail
|
2017-04-14 15:38:15 -06:00 |
|
|
Riley Davis
|
55cdc98303
|
add some proptypes
|
2017-04-14 15:36:29 -06:00 |
|
|
Riley Davis
|
d5ff9d3eeb
|
show the details
|
2017-04-14 15:32:06 -06:00 |
|
|
Wyatt Johnson
|
404301bd43
|
Merge pull request #501 from coralproject/docs-update
Added note for production based deploy
|
2017-04-14 15:22:45 -06:00 |
|
|
Wyatt Johnson
|
8c478d1c13
|
Merge branch 'master' into docs-update
|
2017-04-14 15:18:44 -06:00 |
|
|
Wyatt Johnson
|
bee27da725
|
Added note for production based deploy
|
2017-04-14 15:16:42 -06:00 |
|
|
David Erwin
|
a873034288
|
Merge pull request #498 from coralproject/docs-update
Docs update
|
2017-04-14 17:16:26 -04:00 |
|
|
Wyatt Johnson
|
8164fa7813
|
Merge branch 'master' into docs-update
|
2017-04-14 15:07:02 -06:00 |
|
|
David Erwin
|
d1bc747009
|
Merge pull request #500 from coralproject/username-profanity-fix
Username Profanity Fix
|
2017-04-14 17:05:27 -04:00 |
|
|
Wyatt Johnson
|
e028e30afd
|
Added line about SSL certificates
|
2017-04-14 15:04:35 -06:00 |
|
|
Riley Davis
|
ff3cffdc8f
|
load actions
|
2017-04-14 14:59:51 -06:00 |
|
|
Wyatt Johnson
|
d4fc8a474d
|
Should resolve bug relating to usernames being set as "undefined"
|
2017-04-14 14:57:13 -06:00 |
|
|
Wyatt Johnson
|
a19fe02782
|
Added setup/usage docs
|
2017-04-14 14:49:23 -06:00 |
|
|
Gabriela Rodríguez Berón
|
81e040397e
|
Merge branch 'master' into docs-update
|
2017-04-14 12:09:45 -07:00 |
|
|
Riley Davis
|
07ea548d46
|
Merge branch 'master' into flag-detail
|
2017-04-14 12:56:11 -06:00 |
|
|
Gabriela Rodríguez Berón
|
99b0f8f2ad
|
Merge pull request #497 from coralproject/docs-metrics
EXTRA-SHORT: A note on the from/to parameters.
|
2017-04-14 11:29:08 -07:00 |
|
|
Wyatt Johnson
|
cb652dbb86
|
Merge branch 'master' into docs-update
|
2017-04-14 12:23:43 -06:00 |
|