Commit Graph

5347 Commits

Author SHA1 Message Date
Belen Curcio dd8167a204 Check premod by asset 2017-07-27 14:42:36 -03:00
Belen Curcio fba4b23dd0 Reordering Menu 2017-07-27 14:20:15 -03:00
Belen Curcio 200d41f2a5 New Queue 2017-07-27 14:15:49 -03:00
Belen Curcio 3c960db93d Merge branch 'master' of github.com:coralproject/talk into new-queue 2017-07-27 14:01:53 -03:00
Kim Gardner 1994e44e94 Merge pull request #810 from coralproject/fix-viewing-options-plugin
Fix viewing options plugin
2017-07-27 13:02:25 -04:00
Belen Curcio 47d37e31d8 prefixing translations 2017-07-27 13:50:14 -03:00
Belen Curcio 447c3aa7cc Wrong reducer name 2017-07-27 13:48:03 -03:00
Belen Curcio b3d1ff8003 Renaming flag by reported 2017-07-27 13:43:40 -03:00
Kim Gardner cf8528dcf1 Remove file 2017-07-27 12:23:18 -04:00
Kim Gardner 9bd3e6b541 Fix translation file 2017-07-27 12:20:07 -04:00
Kim Gardner f8758bd755 Fix folders 2017-07-27 11:58:36 -04:00
Kim Gardner ce0479ae5f Merge pull request #779 from coralproject/renaming-talk
Renaming Talk Plugins
2017-07-27 11:04:31 -04:00
Kim Gardner 433c4fcd03 Merge branch 'master' into renaming-talk 2017-07-27 10:06:17 -04:00
Kim Gardner 0f84586e1e Merge pull request #805 from coralproject/redis-fixes
Fixed bug with Kue
2017-07-27 10:05:55 -04:00
Wyatt Johnson a54a240ae6 fixed bug with job init 2017-07-27 15:14:11 +10:00
Kim Gardner 3a1a5e4e37 Fix merge conflicts 2017-07-26 21:49:50 -04:00
Wyatt Johnson 1a1d28c915 Merge pull request #788 from coralproject/docs-update
Updated docs, theme, jekyll
2017-07-27 11:33:56 +10:00
Kim Gardner 1359dfdc0b Merge branch 'master' into renaming-talk 2017-07-26 21:29:19 -04:00
Kim Gardner e7bc3002ef Add translations file for viewing options plugin 2017-07-26 21:21:42 -04:00
Wyatt Johnson 7eee40368a Merge branch 'master' into docs-update 2017-07-27 11:21:40 +10:00
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
Kim Gardner 7058e7e7e8 Merge branch 'master' into renaming-talk 2017-07-26 21:16:18 -04: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
Wyatt Johnson ea16d50516 docs update for jwt 2017-07-27 11:04:47 +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 22b3a59351 Merge branch 'master' into renaming-talk 2017-07-26 15:17:19 -04: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 e848df0976 docs update for jwt + move code of conduct 2017-07-26 18:09:04 +10: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
Wyatt Johnson 2dbcb0fe45 Updates to docs, fix bug with jwt 2017-07-26 11:23:09 +10:00
Wyatt Johnson 557bda6444 Merge branch 'master' into docs-update 2017-07-26 08:55:32 +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