 Wyatt Johnson
|
90a8a87eaf
|
Added graph API for assets
|
2017-08-28 18:57:32 -06:00 |
|
|
Wyatt Johnson
|
df6f6a72ef
|
Merge pull request #885 from coralproject/subscriber
Adding new Slot: commentAuthorTags
|
2017-08-28 16:18:32 -06:00 |
|
|
Wyatt Johnson
|
c09381ff84
|
Merge branch 'master' into subscriber
|
2017-08-28 15:40:31 -06:00 |
|
|
Wyatt Johnson
|
a172f5be51
|
Merge pull request #881 from coralproject/feature/heroku-deploy
Heroku Deploy
|
2017-08-28 15:39:52 -06:00 |
|
|
Wyatt Johnson
|
2fec9e3c0f
|
Merge branch 'master' into feature/heroku-deploy
|
2017-08-28 15:33:24 -06:00 |
|
|
Kim Gardner
|
a570626787
|
Merge pull request #888 from coralproject/debugging-optim
Increased debugging and optimized a query path
v3.3.0
|
2017-08-28 18:55:07 +01:00 |
|
|
Wyatt Johnson
|
e92f75d4ad
|
Merge branch 'master' into debugging-optim
|
2017-08-28 11:50:02 -06:00 |
|
|
Wyatt Johnson
|
057d8cabd2
|
Increased debugging and optimized a query path
|
2017-08-28 11:47:51 -06:00 |
|
|
Kiwi
|
4f901d0d56
|
Merge branch 'master' into subscriber
|
2017-08-28 19:43:54 +02:00 |
|
|
Kim Gardner
|
9af0c5e01a
|
Merge pull request #887 from coralproject/fix-action-type-query
Fix `action_type` query
|
2017-08-28 18:28:54 +01:00 |
|
|
Kiwi
|
afd3b1b3fe
|
Merge branch 'master' into fix-action-type-query
|
2017-08-28 19:21:19 +02:00 |
|
|
Chi Vinh Le
|
44c6798959
|
Fix action_type query
|
2017-08-29 00:20:36 +07:00 |
|
|
Belén Curcio
|
e14d6007a7
|
Merge branch 'master' into subscriber
|
2017-08-28 13:12:19 -03:00 |
|
|
Wyatt Johnson
|
1aa4f83c89
|
Merge pull request #886 from coralproject/query-fix
Fixed query
|
2017-08-28 09:47:28 -06:00 |
|
|
Wyatt Johnson
|
8cfccb7b00
|
fixed query
|
2017-08-28 09:42:37 -06:00 |
|
|
Kim Gardner
|
c05bee2316
|
Merge pull request #880 from coralproject/load-more-history
Only load my own comments in history
|
2017-08-28 16:37:11 +01: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 |
|
|
Kim Gardner
|
733d8e1eae
|
Merge pull request #882 from coralproject/fix-permalink-liveupdates
Fix live update false comments in permalink view
|
2017-08-28 16:23:57 +01: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 |
|
|
Kim Gardner
|
22945d49df
|
Merge pull request #884 from coralproject/rm-semicolon
Remove semicolon
|
2017-08-28 16:15:07 +01:00 |
|
|
Kiwi
|
b8c6305939
|
Merge branch 'master' into rm-semicolon
|
2017-08-28 17:09:42 +02:00 |
|
|
Chi Vinh Le
|
7911e366e5
|
Remove semicolon
|
2017-08-28 22:04:21 +07:00 |
|
|
Kim Gardner
|
1ba5fd0028
|
Merge pull request #870 from coralproject/user-sort
Optimizations and User Sort
|
2017-08-28 15:30:31 +01:00 |
|
|
Chi Vinh Le
|
7856c9d947
|
Fix live update false comments in permalink view
|
2017-08-28 21:05:32 +07:00 |
|
|
Jeff Nelson
|
7c9e2297df
|
don't hardcode branch
|
2017-08-28 09:54:20 -04:00 |
|
|
Chi Vinh Le
|
153c5acce1
|
Only load my own comments in history
|
2017-08-28 19:15:29 +07:00 |
|
|
Chi Vinh Le
|
bb42cffc17
|
Add sort plugins for other reactions
|
2017-08-28 18:50:01 +07:00 |
|
|
Chi Vinh Le
|
0dffc15836
|
Hover styles
|
2017-08-28 18:22:30 +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 |
|
|
Kim Gardner
|
5ec65c86ce
|
Merge pull request #879 from coralproject/questionbox
Question Box Builder
|
2017-08-25 20:58:41 +01: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 |
|
|
Kim Gardner
|
0ecf1cedc3
|
Merge pull request #874 from coralproject/refactor-global-dependencies
Dependency Management
|
2017-08-25 15:41:53 +01:00 |
|
|
Chi Vinh Le
|
7f899b0440
|
Attach to fragments tree
|
2017-08-25 21:40:57 +07:00 |
|
|
Chi Vinh Le
|
88b2798718
|
Merge branch 'user-sort' of ssh://github.com/coralproject/talk into user-sort
|
2017-08-25 21:30:24 +07:00 |
|
|
Chi Vinh Le
|
e3227322a5
|
Some docs
|
2017-08-25 21:22:48 +07:00 |
|
|
Kim Gardner
|
a767ab73da
|
Update default plugins to include new sorts
|
2017-08-25 15:20:05 +01:00 |
|
|
Kim Gardner
|
3e65eac7a0
|
Merge branch 'master' into refactor-global-dependencies
|
2017-08-25 15:18:46 +01:00 |
|
|
Kim Gardner
|
1b6b0a4b87
|
Merge pull request #878 from coralproject/bump-version-3-3-0
Update version to 3.3.0
|
2017-08-25 15:18:36 +01:00 |
|
|
Chi Vinh Le
|
42951aaf0b
|
Adding proptypes
|
2017-08-25 21:17:15 +07:00 |
|
|
Chi Vinh Le
|
6b96fcfad1
|
Only unsubscribe from newest comments
|
2017-08-25 21:05:30 +07:00 |
|
|
Jeff Nelson
|
fe0c32898d
|
Update README.md
|
2017-08-25 10:03:46 -04:00 |
|
|
Jeff Nelson
|
091d787e34
|
Update README.md
|
2017-08-25 10:02:16 -04:00 |
|
|
Jeff Nelson
|
7ee2794344
|
Merge branch 'master' into feature/heroku-deploy
|
2017-08-25 09:56:55 -04:00 |
|