 Chi Vinh Le
|
ee2068f5f1
|
Merge branch 'master' into auth-flow
Conflicts:
client/coral-admin/src/actions/auth.js
|
2017-05-27 01:07:19 +07:00 |
|
|
Chi Vinh Le
|
99a9154d40
|
Remove unused dependency
|
2017-05-27 00:26:04 +07:00 |
|
|
Kim Gardner
|
178cecad05
|
Update version 1.7.0
|
2017-05-25 16:58:35 -04:00 |
|
|
Belen Curcio
|
460f3f292b
|
Ádding dependencies
|
2017-05-25 17:41:35 -03:00 |
|
|
Belen Curcio
|
bd21719ea5
|
Handling non safari browsers
|
2017-05-24 17:20:23 -03:00 |
|
|
Chi Vinh Le
|
061c18670b
|
Merge branch 'master' into suspend-user
Conflicts:
client/coral-admin/src/constants/moderation.js
client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
|
2017-05-19 02:19:24 +07:00 |
|
|
Wyatt Johnson
|
555c593059
|
Added gzip compression to bundle assets
|
2017-05-18 11:08:46 -06:00 |
|
|
riley
|
7896b3f33b
|
merge master
|
2017-05-16 09:43:49 -06:00 |
|
|
Chi Vinh Le
|
97121382c7
|
Merge branch 'master' into suspend-user
Conflicts:
client/coral-admin/src/containers/ModerationQueue/ModerationContainer.js
client/coral-admin/src/containers/ModerationQueue/components/Comment.js
client/coral-framework/utils/index.js
package.json
|
2017-05-16 21:02:33 +07:00 |
|
|
Belen Curcio
|
b2e5c0452a
|
The merge conficts
|
2017-05-15 17:13:48 -03:00 |
|
|
Belen Curcio
|
4e86e4197c
|
handling logout
|
2017-05-15 13:13:28 -03:00 |
|
|
Chi Vinh Le
|
63fa3c4de7
|
Implement suspend user components
|
2017-05-15 22:28:04 +07:00 |
|
|
Belen Curcio
|
76b96a66a2
|
Adding Bearer token to the Graph Client
|
2017-05-15 11:41:36 -03:00 |
|
|
Wyatt Johnson
|
d497ad3369
|
initial pagination rewrite, cleanups to comment edit
|
2017-05-11 17:27:02 -06:00 |
|
|
riley
|
57b0b5ec67
|
add a drawer for the user details
|
2017-05-04 13:58:43 -06:00 |
|
|
Benjamin Goering
|
b97fa228b1
|
merge with master after huge coral-embed-stream refactor
|
2017-05-03 19:19:03 -07:00 |
|
|
Benjamin Goering
|
c8e7ec6cbf
|
streamQuery reduces editComment mutations to reflect edits without contacting server
|
2017-05-03 13:35:51 -07:00 |
|
|
Kim Gardner
|
28ea498df2
|
Bump version to 1.6.0
|
2017-05-03 12:12:25 -04:00 |
|
|
Benjamin Goering
|
aa18a433f8
|
Can't edit comment outside of edit window
|
2017-05-02 16:47:00 -05:00 |
|
|
David Erwin
|
06378209a2
|
Merge branch 'master' into optimise-initial-query
|
2017-04-27 13:49:12 -04:00 |
|
|
Wyatt Johnson
|
ec915208e5
|
Moved dep to devDeps
|
2017-04-27 10:48:03 -06:00 |
|
|
Chi Vinh Le
|
8c53bc2d22
|
Postpone first query until checked login
|
2017-04-27 22:55:36 +07:00 |
|
|
David Erwin
|
077daeb793
|
Merge branch 'master' into subscriptions
|
2017-04-26 16:55:32 -04:00 |
|
|
Chi Vinh Le
|
4bacc2b0c2
|
Update Apollo
|
2017-04-25 22:31:59 +07:00 |
|
|
Wyatt Johnson
|
1f562c8fad
|
Merge branch 'master' into subscriptions
|
2017-04-20 15:17:44 -06:00 |
|
|
Wyatt Johnson
|
50219922d5
|
Switched to lock at node 7.8
|
2017-04-20 09:35:49 -06:00 |
|
|
Wyatt Johnson
|
7fac8ef073
|
Merge branch 'master' into subscriptions
|
2017-04-17 08:03:14 -06:00 |
|
|
Wyatt Johnson
|
6c0e00155f
|
Initial update
|
2017-04-12 13:29:01 -06:00 |
|
|
Wyatt Johnson
|
9f8c9c7eb1
|
Merge branch 'master' into subscriptions
|
2017-04-12 10:37:15 -06:00 |
|
|
Kim Gardner
|
8e76a34631
|
Bump version and update description
|
2017-04-12 08:45:19 -04:00 |
|
|
Wyatt Johnson
|
3a3b89b03b
|
Fixed bugs with plugin install
|
2017-04-11 14:59:02 -06:00 |
|
|
Wyatt Johnson
|
7acaaadcd6
|
Merge branch 'master' into subscriptions
|
2017-04-10 14:33:08 -06:00 |
|
|
Belen Curcio
|
27408e1fa1
|
Linting and Patch
|
2017-04-06 18:49:12 -03:00 |
|
|
Wyatt Johnson
|
c12660be3b
|
Merge branch 'master' into subscriptions
|
2017-04-06 15:39:24 -06:00 |
|
|
Belen Curcio
|
f779a55096
|
Merge branch 'master' of github.com:coralproject/talk into plugin
|
2017-04-06 18:33:17 -03:00 |
|
|
Wyatt Johnson
|
1f367e666b
|
Added joi plugin validation
|
2017-04-06 10:39:36 -06:00 |
|
|
Chi Vinh Le
|
7c2b16521a
|
Merge branch 'master' into plugin
Conflicts:
.eslintignore
.gitignore
graph/resolvers/index.js
plugins.json
|
2017-04-06 21:22:40 +07:00 |
|
|
Wyatt Johnson
|
ffb0ee20e8
|
Cleanup of subscriptions
|
2017-04-05 16:15:22 -06:00 |
|
|
Wyatt Johnson
|
3c91b9cda1
|
Merge branch 'master' into subscriptions
|
2017-04-05 13:36:57 -06:00 |
|
|
Chi Vinh Le
|
b0effe8731
|
Merge with 'master'
|
2017-04-06 01:26:48 +07:00 |
|
|
Chi Vinh Le
|
582f799b6c
|
Revert "Merge"
This reverts commit d9835a17d3, reversing
changes made to 18d6846f4e.
|
2017-04-06 00:53:21 +07:00 |
|
|
Wyatt Johnson
|
21eb532c6e
|
Added postinstall hook
|
2017-04-05 11:49:22 -06:00 |
|
|
Wyatt Johnson
|
8a06118d94
|
Added coral facebook auth plugin, some circ dep fixes
|
2017-04-05 11:39:54 -06:00 |
|
|
Belen Curcio
|
d9835a17d3
|
Merge
|
2017-04-05 12:08:07 -03:00 |
|
|
Wyatt Johnson
|
45c7cbad9e
|
Merge branch 'master' into subscriptions
|
2017-04-05 08:08:56 -06:00 |
|
|
Chi Vinh Le
|
765bee40b4
|
Update apollo
|
2017-04-05 18:46:16 +07:00 |
|
|
Wyatt Johnson
|
07d1f9d3cf
|
Merge branch 'master' into subscriptions
|
2017-04-04 09:58:50 -06:00 |
|
|
Wyatt Johnson
|
b5280b1221
|
Added support for plugin relative imports
|
2017-04-03 13:02:32 -06:00 |
|
|
Wyatt Johnson
|
9c806cb6e4
|
Added support for plugin upgrades
|
2017-04-03 11:58:54 -06:00 |
|
|
Chi Vinh Le
|
73e2b899d8
|
Use custom plugins loader
|
2017-04-03 14:19:51 +07:00 |
|