Commit Graph

5304 Commits

Author SHA1 Message Date
Wyatt Johnson 8d59678c8c Merge pull request #802 from coralproject/no-yarn-generate-introspection
Don't use `yarn generate-introspection`
2017-07-27 11:21:17 +10:00
Wyatt Johnson 0d7acbd44d Merge branch 'master' into no-yarn-generate-introspection 2017-07-27 11:12:22 +10:00
Wyatt Johnson 9c425c371d Merge pull request #801 from coralproject/jwt
Secret Rotation + Improvements
2017-07-27 11:10:19 +10:00
Wyatt Johnson 8cee74ae06 Merge branch 'master' into jwt 2017-07-27 11:05:26 +10:00
Kim Gardner 98a638cb4d Merge branch 'master' into no-yarn-generate-introspection 2017-07-26 21:02:28 -04:00
Wyatt Johnson 59a1435089 Updated config 2017-07-27 11:01:31 +10:00
Wyatt Johnson 4733233cae Added new cookie config params 2017-07-27 10:58:12 +10:00
Wyatt Johnson 9b37767674 refactored secret parsing 2017-07-27 10:49:33 +10:00
Kim Gardner fdb3a27616 Merge pull request #804 from coralproject/offtopic-style-change
changes to off-topic badge colors
2017-07-26 15:07:06 -04:00
Samantha Hankins 67f1ee1e39 changes to off-topic badge colors 2017-07-26 15:00:48 -04:00
Kim Gardner 13434556fd Merge pull request #798 from coralproject/live-reactions-no-comment
Live Reactions should not always expect the comment to be there.
2017-07-26 14:52:08 -04:00
Belén Curcio 2713254358 Merge branch 'master' into live-reactions-no-comment 2017-07-26 15:22:20 -03:00
Belén Curcio 605cefaeac Merge pull request #799 from coralproject/prefix-redux-actions-plugins
Prefix redux constants in plugins
2017-07-26 15:21:35 -03:00
Chi Vinh Le b1b4e9fc57 Don't use yarn generate-introspection 2017-07-26 16:34:07 +07:00
Kiwi cd3adb93dd Merge branch 'master' into prefix-redux-actions-plugins 2017-07-26 11:15:44 +02:00
Kiwi 0ea3422126 Merge branch 'master' into live-reactions-no-comment 2017-07-26 11:15:34 +02:00
Wyatt Johnson 6a12ab28db fixes for tests 2017-07-26 15:58:52 +10:00
Wyatt Johnson a91624bf4b Expanded JWT Capabilities 2017-07-26 15:24:16 +10:00
Kim Gardner f22350c92e Merge pull request #794 from coralproject/fix-vc
Mobile and Touch Events for Featured Tags/ Viewing Options
2017-07-25 16:45:56 -04:00
Kim Gardner 772e68f72e Merge branch 'master' into fix-vc 2017-07-25 14:26:04 -04:00
Kim Gardner 49943ddac0 Merge pull request #785 from coralproject/event-emitter
Implement Events
2017-07-25 14:11:18 -04:00
Kim Gardner 11a735f82e Merge branch 'master' into event-emitter 2017-07-25 14:04:22 -04:00
Kim Gardner c7515ff126 Merge pull request #800 from coralproject/fix-docker-deploy
Exclude generateIntrospectionResult from dockerignore
2017-07-25 13:55:50 -04:00
Chi Vinh Le 21d19d170d Exclude generateIntrospectionResult from dockerignore 2017-07-26 00:49:16 +07:00
Belen Curcio 608ad26e88 deleting unused utils 2017-07-25 14:18:40 -03:00
Belen Curcio 17e6064b9e Adding react touch events 2017-07-25 14:15:52 -03:00
Chi Vinh Le 8ea8bb521a Merge branch 'event-emitter' of ssh://github.com/coralproject/talk into event-emitter 2017-07-26 00:06:20 +07:00
Belen Curcio 9aa5c1ec46 Viewing Options for mobile 2017-07-25 14:04:13 -03:00
Belen Curcio 432afd2d8a Merge branch 'fix-vc' of github.com:coralproject/talk into fix-vc 2017-07-25 14:03:53 -03:00
Belen Curcio 48dadd8571 Viewing Options for mobile 2017-07-25 14:00:30 -03:00
Chi Vinh Le 1473c778a5 Refactor listener 2017-07-25 23:26:23 +07:00
Chi Vinh Le b8c5e56404 Rename action names to match the new constant names :-D 2017-07-25 23:04:32 +07:00
Belén Curcio a7adf3469d Merge branch 'master' into event-emitter 2017-07-25 13:04:08 -03:00
Belen Curcio 5e9791af9c Merge branch 'master' of github.com:coralproject/talk into fix-vc 2017-07-25 12:57:20 -03:00
Chi Vinh Le 84a20042f2 Prefix redux constants in plugins 2017-07-25 22:53:26 +07:00
Chi Vinh Le 8ecf55610c More fetchMore events and more data for graphql events 2017-07-25 22:28:28 +07:00
Chi Vinh Le d4bf5fd423 Add subscription data events 2017-07-25 21:20:04 +07:00
Chi Vinh Le ceb83834a7 Remove subscribeToMore Event because it's incomplete 2017-07-25 21:19:42 +07:00
Kim Gardner fefbec032c Merge pull request #790 from coralproject/commentsid
Search Comment in an Asset
2017-07-25 10:19:33 -04:00
Kim Gardner 788a35d9bb Merge branch 'master' into commentsid 2017-07-25 10:12:23 -04:00
Kim Gardner fc1b69681e Merge pull request #772 from coralproject/next
Generate and integrate introspection query results
2017-07-25 10:12:12 -04:00
Kim Gardner 1077bfbec2 Merge branch 'master' into next 2017-07-25 10:07:13 -04:00
Kim Gardner 9b5bbe9971 Merge pull request #791 from coralproject/bump-version-3-0-0
Update version to 3.0.0
2017-07-25 10:06:41 -04:00
Kim Gardner 00597378d6 Merge branch 'master' into bump-version-3-0-0 2017-07-25 10:01:14 -04:00
Kim Gardner 3bb0370a5a Merge pull request #797 from coralproject/jwt-alg
JWT Changes
2017-07-25 10:01:00 -04:00
Chi Vinh Le 3c2229f3a7 Remove redundant networkStatus 2017-07-25 20:48:26 +07:00
Chi Vinh Le fe9d0eb8e2 Merge branch 'event-emitter' of ssh://github.com/coralproject/talk into event-emitter 2017-07-25 20:45:03 +07:00
Chi Vinh Le 45a2e2a8a3 Activate wildcard matching 2017-07-25 20:40:51 +07:00
Chi Vinh Le 039b620ecf Live Reactions should not always expect the comment to be there. 2017-07-25 19:26:44 +07:00
Chi Vinh Le d9049ab602 Merge branch 'commentsid' of ssh://github.com/coralproject/talk into commentsid 2017-07-25 19:16:01 +07:00