Commit Graph

8345 Commits

Author SHA1 Message Date
Belen Curcio b8c5461b90 Adding react-linkify 2017-06-13 15:13:26 -03:00
Chi Vinh Le cdfa8379ff Change text and status of ErrAlreadyExists 2017-06-14 00:38:34 +07:00
IAmSamHankins 99745723fb style updates to flagged user names queue and updated translations 2017-06-13 12:40:07 -04:00
Samantha Hankins b6237892d7 Merge branch 'master' into mod-panel-design-tweaks 2017-06-13 11:04:13 -04:00
Chi Vinh Le 7d8f2aa876 More robust reactions 2017-06-13 22:02:54 +07:00
Chi Vinh Le aed265efcc Use correct fragment name 2017-06-13 22:01:58 +07:00
Belen Curcio 00d1b0e6f5 Ádding to plugins 2017-06-12 19:11:53 -03:00
Belen Curcio 65f7ee2ab3 coral-plugin-commnet-content 2017-06-12 19:09:42 -03:00
Belen Curcio c902a4b05b Merge branch 'search-stories' of github.com:coralproject/talk into search-stories 2017-06-12 16:31:14 -03:00
Belen Curcio 8a3833ec11 Merge issues 2017-06-12 16:30:59 -03:00
Belén Curcio d45c396013 Merge branch 'master' into search-stories 2017-06-12 16:27:39 -03:00
Belén Curcio d84ddfe1ec Merge branch 'master' into asset-improvements 2017-06-12 16:19:23 -03:00
Belén Curcio efc4db56d0 Merge pull request #674 from coralproject/live-reactions
Live reactions
2017-06-12 16:19:02 -03:00
Belén Curcio 32da779ac1 Merge branch 'master' into live-reactions 2017-06-12 14:46:26 -03:00
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
Chi Vinh Le e2fdba4898 Upgrade subscriptions-transport-ws 2017-06-13 00:00:40 +07:00
Chi Vinh Le ce76335fda Add some comments 2017-06-12 23:50:09 +07:00
Chi Vinh Le 70177d3a2c Cleanup 2017-06-12 23:45:46 +07:00
Chi Vinh Le d628c26693 Wrap mutations into framework 2017-06-12 23:25:58 +07:00
Chi Vinh Le 2a283a9a5a Support live updates 2017-06-12 23:21:27 +07:00
Chi Vinh Le 74ad3c3a35 Refactor all reactions and encapsulate server code 2017-06-12 17:02:14 +07:00
gaba d22f5215ed Adding french translation to the auth plugin. 2017-06-09 16:09:13 -07:00
riley c7d5ab935f merge master 2017-06-09 15:27:44 -06:00
IAmSamHankins cc4c943a21 hover states, link styling, alignment fixes 2017-06-09 17:27:35 -04:00
Riley Davis aa289ecbfe less terrible looking 2017-06-09 14:32:12 -06:00
Kim Gardner dfd580bf7c Merge branch 'master' into bump-version-2-0-0 2017-06-09 16:26:48 -04:00
Riley Davis de665b3a0d show stories in dropdown 2017-06-09 14:10:21 -06: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 b5065bad3e Merge branch 'master' into bump-version-2-0-0 2017-06-09 12:59:43 -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 452b2c3cdb Merge branch 'master' into bump-version-2-0-0 2017-06-09 12:17:42 -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