 Kim Gardner
|
490a5d3263
|
Merge branch 'master' into 142993479-tags
|
2017-06-08 11:56:14 -04:00 |
|
|
Kim Gardner
|
1c23f72807
|
Merge pull request #666 from coralproject/bump-version-1-9-1
Bump version 1.9.1
v1.9.1
|
2017-06-08 11:55:08 -04:00 |
|
|
Kim Gardner
|
8c1eaf09bc
|
Bump version 1.9.1
|
2017-06-08 11:51:16 -04:00 |
|
|
Kim Gardner
|
7e5adcd477
|
Merge branch 'master' into 142993479-tags
|
2017-06-08 11:50:18 -04:00 |
|
|
Belen Curcio
|
283c13fae8
|
Ádding typenames to update the store
|
2017-06-08 12:43:02 -03:00 |
|
|
Wyatt Johnson
|
6e82c180f7
|
Merge pull request #665 from coralproject/turn-on-off-topic
Turn on off-topic plugin by default
|
2017-06-08 09:42:08 -06:00 |
|
|
Belen Curcio
|
8d5085b7a3
|
Merge branch 'master' of github.com:coralproject/talk into 142993479-tags
|
2017-06-08 12:39:10 -03:00 |
|
|
Belen Curcio
|
ebbbe72d15
|
Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags
|
2017-06-08 12:37:50 -03:00 |
|
|
Belen Curcio
|
f6798af74d
|
Lint
|
2017-06-08 12:37:37 -03:00 |
|
|
Belen Curcio
|
1f261f5216
|
Fully working
|
2017-06-08 12:35:42 -03:00 |
|
|
Kim Gardner
|
81f3cc808c
|
Turn on off-topic plugin by default
|
2017-06-08 11:33:06 -04:00 |
|
|
Wyatt Johnson
|
480bab3c1a
|
changed some text around
|
2017-06-08 09:12:08 -06:00 |
|
|
Wyatt Johnson
|
3a285d92a5
|
Added more warnings
|
2017-06-08 09:10:53 -06:00 |
|
|
Kim Gardner
|
55928dff08
|
Merge pull request #664 from coralproject/fix-reply-bugs
Fix bugs related to reply box
|
2017-06-08 11:09:10 -04:00 |
|
|
Belen Curcio
|
82a72e506f
|
Off-topic and Staff working
|
2017-06-08 12:04:33 -03:00 |
|
|
Kim Gardner
|
9695db0678
|
Merge branch 'master' into fix-reply-bugs
|
2017-06-08 11:04:04 -04:00 |
|
|
Kim Gardner
|
f3dcfd23f3
|
Merge branch 'master' into 142993479-tags
|
2017-06-08 11:01:57 -04:00 |
|
|
Kim Gardner
|
655e53a35c
|
Merge pull request #662 from coralproject/bump-version
Update version number
|
2017-06-08 11:01:09 -04:00 |
|
|
Belen Curcio
|
15b5dc2236
|
Linting
|
2017-06-08 11:58:38 -03:00 |
|
|
Belen Curcio
|
38077cf3cf
|
Missing fragment
|
2017-06-08 11:56:38 -03:00 |
|
|
Belen Curcio
|
ef43ba3a35
|
new merge conflicts to master
|
2017-06-08 11:55:06 -03:00 |
|
|
Chi Vinh Le
|
d61ede2396
|
Fix bugs related to reply box
|
2017-06-08 18:44:07 +07:00 |
|
|
Kim Gardner
|
a40dd04c1b
|
Update version number
|
2017-06-07 19:10:13 -04:00 |
|
|
Kim Gardner
|
9d25a4c14a
|
Merge pull request #661 from coralproject/comment-stream-cleanup
Refinement of design for banned and suspend user messaging on comment stream.
v1.9.0
|
2017-06-07 17:12:25 -04:00 |
|
|
Kim Gardner
|
801d0a92af
|
Merge branch 'master' into comment-stream-cleanup
|
2017-06-07 17:07:39 -04:00 |
|
|
David Erwin
|
8bf86f34ee
|
Merge pull request #654 from coralproject/off-topic-features
Off Topic Features
|
2017-06-07 15:43:03 -04:00 |
|
|
Belen Curcio
|
63a35cbceb
|
Merge issues
|
2017-06-07 16:38:36 -03:00 |
|
|
Kim Gardner
|
14a35033da
|
Merge branch 'master' into comment-stream-cleanup
|
2017-06-07 14:33:29 -04:00 |
|
|
Chi Vinh Le
|
05da69d097
|
Remove falsely commited css styles
|
2017-06-08 01:23:22 +07:00 |
|
|
Chi Vinh Le
|
ffce78ef60
|
Move Icon and translation service to plugin-api
|
2017-06-08 01:18:02 +07:00 |
|
|
Chi Vinh Le
|
6561f733b7
|
Use correct prefix
|
2017-06-08 01:17:36 +07:00 |
|
|
Chi Vinh Le
|
b9758ba942
|
Fix overlap not clickable
|
2017-06-08 00:59:44 +07:00 |
|
|
Chi Vinh Le
|
4e56406c37
|
Fix tabsize in css
|
2017-06-08 00:49:18 +07:00 |
|
|
Chi Vinh Le
|
06858bf071
|
Move Slot and withReaction to beta
|
2017-06-08 00:42:21 +07:00 |
|
|
Chi Vinh Le
|
66e4f02a1a
|
Selectors, resolving merge errors, better class names, removing comment reducer
|
2017-06-08 00:29:05 +07:00 |
|
|
Wyatt Johnson
|
4cbc8b2226
|
Updates to setup process
|
2017-06-07 11:08:39 -06:00 |
|
|
IAmSamHankins
|
c3d76c6a4f
|
messaging style updates, and update to translation files.
|
2017-06-07 12:55:40 -04:00 |
|
|
Belen Curcio
|
c8534a91a6
|
Merge branch 'off-topic-features' of github.com:coralproject/talk into off-topic-features
|
2017-06-07 13:53:54 -03:00 |
|
|
Belen Curcio
|
87ddfea689
|
indexes css
|
2017-06-07 13:53:33 -03:00 |
|
|
Wyatt Johnson
|
6827ff2f1f
|
Added support for version enforcing
|
2017-06-07 10:27:42 -06:00 |
|
|
Belén Curcio
|
830441c531
|
Merge branch 'master' into off-topic-features
|
2017-06-07 13:24:58 -03:00 |
|
|
Riley Davis
|
7417d51973
|
Merge pull request #660 from coralproject/math-is-hard
percents have to be multiplied by 100
|
2017-06-07 10:22:45 -06:00 |
|
|
Belen Curcio
|
847a30ff92
|
Adding correct classNames
|
2017-06-07 13:19:36 -03:00 |
|
|
Riley Davis
|
9f4df35c3a
|
percents have to be multiplied by 100
|
2017-06-07 10:15:50 -06:00 |
|
|
Belen Curcio
|
f6ad9c9373
|
Adding camelcase for plugin reducers 🎉 <3
|
2017-06-07 13:14:52 -03:00 |
|
|
Belen Curcio
|
8872248d63
|
Addiing Stable API Architecture
|
2017-06-07 13:10:17 -03:00 |
|
|
Belen Curcio
|
d780eea357
|
Merge branch 'off-topic-features' of github.com:coralproject/talk into off-topic-features
|
2017-06-07 12:38:31 -03:00 |
|
|
Belen Curcio
|
20aba92ad2
|
Linting
|
2017-06-07 12:37:59 -03:00 |
|
|
Chi Vinh Le
|
7a2fd95eca
|
Merge branch 'master' into off-topic-features
Conflicts:
client/coral-embed-stream/src/components/Comment.css
client/coral-embed-stream/src/components/Comment.js
client/coral-embed-stream/src/components/Stream.js
client/coral-embed-stream/src/reducers/index.js
client/coral-framework/helpers/plugins.js
|
2017-06-07 22:37:06 +07:00 |
|
|
Belen Curcio
|
d7dfae89a3
|
Global classNames, and more
|
2017-06-07 12:05:53 -03:00 |
|