Commit Graph

4512 Commits

Author SHA1 Message Date
Belén Curcio 09d74e8fd6 Merge branch 'master' into asset-improvements 2017-06-12 14:34:20 -03:00
Belén Curcio 9fc139964f Merge pull request #670 from coralproject/client-targets
Webpack Plugin Targets
2017-06-12 14:32:45 -03:00
Belén Curcio 681e25ebdb Merge branch 'master' into client-targets 2017-06-12 14:09:09 -03:00
Wyatt Johnson f929059daf added asset merging + url updates 2017-06-09 13:23:16 -06:00
Kim Gardner f2f5ddd131 Merge pull request #663 from coralproject/port-perm-checks
Port perm checks to the new framework
2017-06-09 13:24:43 -04:00
Belén Curcio 1fbeacdc36 Merge branch 'master' into port-perm-checks 2017-06-09 14:08:07 -03:00
Kim Gardner 3c58888129 Merge branch 'master' into client-targets 2017-06-09 13:00:00 -04:00
Kim Gardner f6012526b3 Merge pull request #668 from coralproject/update-readme
Update README
2017-06-09 12:24:31 -04:00
Kim Gardner fc64a98cb7 Merge branch 'master' into update-readme 2017-06-09 12:17:28 -04:00
Kiwi 8d24dcd58d Merge branch 'master' into port-perm-checks 2017-06-09 17:49:18 +07:00
Kiwi 5d59f2923e Merge branch 'master' into client-targets 2017-06-09 17:49:11 +07:00
Kiwi 291d3b583b Merge pull request #669 from coralproject/subscription-fixes
Subscription fixes
2017-06-09 17:45:31 +07:00
Chi Vinh Le c7ca3c5e4a Reset websocket after successful login 2017-06-09 17:26:42 +07:00
Kiwi 66c9e0e232 Merge branch 'master' into port-perm-checks 2017-06-09 16:59:48 +07:00
Wyatt Johnson 1d3cc906eb small fix 2017-06-08 17:34:01 -06:00
Wyatt Johnson 3bf35bdc7f Merge branch 'master' into client-targets 2017-06-08 17:32:51 -06:00
Wyatt Johnson 99174565fa fixes to webpack config (uncommenting) 2017-06-08 17:32:01 -06:00
Wyatt Johnson 8d2c1b7247 changed bundle format 2017-06-08 17:25:27 -06:00
Wyatt Johnson 399f1e7458 simplified webpack file 2017-06-08 16:53:22 -06:00
Wyatt Johnson 140f980c14 Merge branch 'master' into subscription-fixes 2017-06-08 15:09:37 -06:00
Wyatt Johnson 32708e9098 submscription fixes 2017-06-08 15:08:18 -06:00
Kim Gardner d0b3845d0f Update README 2017-06-08 15:55:41 -04:00
Kim Gardner 3545bf01cd Merge pull request #522 from coralproject/142993479-tags
Get tags into a separate structure that can be applied to other models
2017-06-08 15:16:33 -04:00
Chi Vinh Le 4e5680577e Include public comments 2017-06-09 01:17:27 +07:00
Chi Vinh Le 428246cbe2 Make it work without iframe 2017-06-09 01:16:39 +07:00
Wyatt Johnson a9a24b96c0 cleaned up plugins in webpack 2017-06-08 11:49:36 -06:00
Chi Vinh Le 1153c52c2c Correct optimistic response 2017-06-09 00:31:29 +07:00
Chi Vinh Le 995dd9fd60 Correct fragment names 2017-06-09 00:31:19 +07:00
Chi Vinh Le 007b9604af Merge branch '142993479-tags' of ssh://github.com/coralproject/talk into 142993479-tags 2017-06-09 00:24:48 +07:00
Chi Vinh Le 57747e8f13 Make mutations extendable 2017-06-09 00:22:58 +07:00
Wyatt Johnson 27445f7b19 Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags 2017-06-08 11:21:55 -06:00
Wyatt Johnson b06a58ebe1 adjusted flow 2017-06-08 11:21:44 -06:00
Wyatt Johnson b95e20e493 removed explicit migration step 2017-06-08 11:21:09 -06:00
Chi Vinh Le 5a89ca51f5 Merge branch '142993479-tags' of ssh://github.com/coralproject/talk into 142993479-tags 2017-06-09 00:20:19 +07:00
Wyatt Johnson 80900a98fd perform migrations during web install 2017-06-08 11:19:43 -06:00
Chi Vinh Le d55f22b09c Merge branch '142993479-tags' of ssh://github.com/coralproject/talk into 142993479-tags 2017-06-09 00:19:37 +07:00
Chi Vinh Le 9b839b76f5 Don't assume response name pattern 2017-06-08 23:55:37 +07:00
Chi Vinh Le 8eb8010a33 Implement Response interface 2017-06-08 23:54:08 +07:00
Belen Curcio 40709c5b79 Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags 2017-06-08 12:58:01 -03:00
Belen Curcio 6bc5793e57 Merge branch 'master' of github.com:coralproject/talk into 142993479-tags 2017-06-08 12:56:33 -03:00
Kim Gardner 490a5d3263 Merge branch 'master' into 142993479-tags 2017-06-08 11:56:14 -04:00
Kim Gardner 1c23f72807 Merge pull request #666 from coralproject/bump-version-1-9-1
Bump version 1.9.1
v1.9.1
2017-06-08 11:55:08 -04:00
Kim Gardner 8c1eaf09bc Bump version 1.9.1 2017-06-08 11:51:16 -04:00
Kim Gardner 7e5adcd477 Merge branch 'master' into 142993479-tags 2017-06-08 11:50:18 -04:00
Belen Curcio 283c13fae8 Ádding typenames to update the store 2017-06-08 12:43:02 -03:00
Wyatt Johnson 6e82c180f7 Merge pull request #665 from coralproject/turn-on-off-topic
Turn on off-topic plugin by default
2017-06-08 09:42:08 -06:00
Belen Curcio 8d5085b7a3 Merge branch 'master' of github.com:coralproject/talk into 142993479-tags 2017-06-08 12:39:10 -03:00
Belen Curcio ebbbe72d15 Merge branch '142993479-tags' of github.com:coralproject/talk into 142993479-tags 2017-06-08 12:37:50 -03:00
Belen Curcio f6798af74d Lint 2017-06-08 12:37:37 -03:00
Belen Curcio 1f261f5216 Fully working 2017-06-08 12:35:42 -03:00