 Wyatt Johnson
|
30e6f1d169
|
Merge branch 'master' into lint-upgrade
|
2017-08-28 16:19:10 -06:00 |
|
|
Wyatt Johnson
|
eb586f217b
|
Upgraded/pruned deps, applied linting fixes
|
2017-08-28 14:06:54 -06:00 |
|
|
Belén Curcio
|
e14d6007a7
|
Merge branch 'master' into subscriber
|
2017-08-28 13:12:19 -03:00 |
|
|
Kiwi
|
f4365eb848
|
Merge branch 'master' into load-more-history
|
2017-08-28 17:27:04 +02:00 |
|
|
Belén Curcio
|
96006a0196
|
Merge branch 'master' into subscriber
|
2017-08-28 12:26:08 -03:00 |
|
|
Chi Vinh Le
|
9436188487
|
Merge branch 'master' into load-more-history
Conflicts:
client/coral-settings/containers/ProfileContainer.js
|
2017-08-28 22:25:20 +07:00 |
|
|
Belén Curcio
|
3108f3dac3
|
Merge branch 'master' into subscriber
|
2017-08-28 12:22:05 -03:00 |
|
|
Kim Gardner
|
1e2c617775
|
Merge branch 'master' into fix-permalink-liveupdates
|
2017-08-28 16:17:40 +01:00 |
|
|
Belen Curcio
|
12d66a49d0
|
Adding commentAuthorTags
|
2017-08-28 12:17:01 -03:00 |
|
|
Chi Vinh Le
|
7856c9d947
|
Fix live update false comments in permalink view
|
2017-08-28 21:05:32 +07:00 |
|
|
Chi Vinh Le
|
153c5acce1
|
Only load my own comments in history
|
2017-08-28 19:15:29 +07:00 |
|
|
Chi Vinh Le
|
e4490e20a7
|
Merge branch 'master' into user-sort
Conflicts:
package.json
|
2017-08-28 18:16:18 +07:00 |
|
|
Chi Vinh Le
|
f9bc5f79ec
|
Don't sort and ignore duplicate comments (embed-stream)
|
2017-08-28 18:08:33 +07:00 |
|
|
Wyatt Johnson
|
8a5db167ff
|
changed sort -> sortOrder
|
2017-08-25 09:59:37 -06:00 |
|
|
Chi Vinh Le
|
48595a1bbf
|
Merge branch 'master' into user-sort
Conflicts:
client/coral-admin/src/reducers/moderation.js
client/coral-embed-stream/src/actions/stream.js
client/coral-embed-stream/src/components/Stream.js
client/coral-framework/components/Slot.js
plugin-api/beta/client/utils/index.js
test/server/routes/api/account/index.js
|
2017-08-25 21:55:00 +07:00 |
|
|
Belén Curcio
|
ce63942902
|
Merge branch 'master' into questionbox
|
2017-08-25 11:52:11 -03:00 |
|
|
Chi Vinh Le
|
7f899b0440
|
Attach to fragments tree
|
2017-08-25 21:40:57 +07:00 |
|
|
Kim Gardner
|
3e65eac7a0
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-25 15:18:46 +01:00 |
|
|
Chi Vinh Le
|
6b96fcfad1
|
Only unsubscribe from newest comments
|
2017-08-25 21:05:30 +07:00 |
|
|
Chi Vinh Le
|
9e2f6f1f63
|
Use factory
|
2017-08-25 19:40:55 +07:00 |
|
|
Chi Vinh Le
|
6ae68a4f90
|
First working version
|
2017-08-25 19:21:57 +07:00 |
|
|
Belen Curcio
|
46f17f5381
|
Fully working :)
|
2017-08-24 19:10:30 -03:00 |
|
|
Belen Curcio
|
de7ab8f7ac
|
With fancy lazy load for the Markdown Editor :D
|
2017-08-24 19:05:57 -03:00 |
|
|
Belen Curcio
|
5302d6d935
|
Markdown Editor Added and Working
|
2017-08-24 18:21:52 -03:00 |
|
|
Belen Curcio
|
3d0d5df139
|
Markdown Added
|
2017-08-24 18:16:32 -03:00 |
|
|
Belen Curcio
|
575a3030f9
|
Smooth transition
|
2017-08-24 16:40:16 -03:00 |
|
|
Belen Curcio
|
73058c624f
|
Linting
|
2017-08-24 16:32:51 -03:00 |
|
|
Belen Curcio
|
5cb71eaee8
|
Icon List for Question Box
|
2017-08-24 16:32:07 -03:00 |
|
|
Belen Curcio
|
7991188f8d
|
deleting old code from default.css and building QuestionBox component
|
2017-08-24 14:45:47 -03:00 |
|
|
Chi Vinh Le
|
ddb555e07f
|
Add new sorting variables
|
2017-08-24 21:30:16 +07:00 |
|
|
Chi Vinh Le
|
df60ac4714
|
Merge branch 'master' into user-sort
|
2017-08-24 20:09:44 +07:00 |
|
|
Kiwi
|
2d7d505913
|
Merge branch 'master' into banned-words
|
2017-08-24 13:49:31 +02:00 |
|
|
Chi Vinh Le
|
a42d668329
|
Merge branch 'refactor-global-dependencies' of ssh://github.com/coralproject/talk into refactor-global-dependencies
|
2017-08-24 18:47:09 +07:00 |
|
|
Chi Vinh Le
|
645aaa09ae
|
Add some docs
|
2017-08-24 18:40:38 +07:00 |
|
|
Wyatt Johnson
|
763f753928
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-23 11:56:35 -06:00 |
|
|
Kiwi
|
f5eac91e0e
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-23 18:02:17 +02:00 |
|
|
Belén Curcio
|
0961797f8f
|
Merge branch 'master' into banned-words
|
2017-08-23 10:10:04 -03:00 |
|
|
Chi Vinh Le
|
c2b0a60d8a
|
Remove global dependency on router history
|
2017-08-23 20:02:36 +07:00 |
|
|
Chi Vinh Le
|
bf89409f60
|
Remove global dependency on Storage
|
2017-08-23 19:53:06 +07:00 |
|
|
Kim Gardner
|
994923cae0
|
Merge branch 'master' into user-sort
|
2017-08-23 13:00:12 +01:00 |
|
|
Kim Gardner
|
2a839250ed
|
Merge branch 'master' into slot-username
|
2017-08-23 13:00:06 +01:00 |
|
|
Chi Vinh Le
|
0811c9302d
|
Ignore access from react dev tools
|
2017-08-23 17:50:35 +07:00 |
|
|
Chi Vinh Le
|
5eafb672ef
|
Add missing fragment field to Comment
|
2017-08-23 17:07:28 +07:00 |
|
|
Chi Vinh Le
|
61e601a2a5
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-23 04:05:56 +07:00 |
|
|
Chi Vinh Le
|
a23bad49c6
|
Remove global dependency on notification on admin
|
2017-08-23 03:48:20 +07:00 |
|
|
Chi Vinh Le
|
89037a2e05
|
Refactor notification
|
2017-08-23 03:22:56 +07:00 |
|
|
Chi Vinh Le
|
f428bfa6c9
|
WIP
|
2017-08-23 03:16:19 +07:00 |
|
|
Chi Vinh Le
|
1ee7c81675
|
Remove admin store impl
|
2017-08-23 02:24:26 +07:00 |
|
|
Chi Vinh Le
|
a934722672
|
Cleanup
|
2017-08-23 02:23:18 +07:00 |
|
|
Chi Vinh Le
|
a882b36501
|
Fix connection bug
|
2017-08-23 02:20:43 +07:00 |
|