Commit Graph

8345 Commits

Author SHA1 Message Date
Kim Gardner cfd52144f4 Merge pull request #1366 from coralproject/bump-version-4-2-0
Update version to 4.2.0
2018-02-14 12:43:00 -05:00
Kim Gardner 239377dd7f Update version to 4.2.0 2018-02-14 12:25:40 -05:00
Kiwi c46b29aed9 Merge branch 'master' into router-cleanup 2018-02-14 16:06:59 +01:00
Chi Vinh Le 43e02e1574 Apply suggestions 2018-02-14 14:59:00 +01:00
Wyatt Johnson ffd88e0ef0 Merge branch 'master' into no-limit 2018-02-13 18:32:02 -07:00
Wyatt Johnson 9820e575b2 patch 2018-02-13 18:29:07 -07:00
Wyatt Johnson 1e329c8967 code cleanup 2018-02-13 17:45:26 -07:00
Wyatt Johnson 73034a20f0 added support for configuring limiting, action optims 2018-02-13 17:24:57 -07:00
Wyatt Johnson 8f7171b54e fixed old default.css 2018-02-13 13:59:20 -07:00
Chi Vinh Le b6e4581ba2 Merge branch 'auth-refactor' of ssh://github.com/coralproject/talk into auth-refactor 2018-02-13 21:27:13 +01:00
Chi Vinh Le 78444a0bb4 Remove empty reducers 2018-02-13 21:25:48 +01:00
Chi Vinh Le 4d7e64e1ec Fix css 2018-02-13 21:20:08 +01:00
Kiwi b8e340c471 Merge branch 'master' into auth-refactor 2018-02-13 21:19:50 +01:00
Chi Vinh Le 39c1fcf83a remove before close 2018-02-13 21:17:41 +01:00
Chi Vinh Le 4b2d9fc93a Add formatting to Slot 2018-02-13 21:17:24 +01:00
Wyatt Johnson f56b8ca3a4 Merge pull request #1364 from coralproject/pym-patch
Patched Pym.js
2018-02-13 12:52:47 -07:00
Wyatt Johnson 0a324a2268 template cleanup 2018-02-13 12:46:55 -07:00
Wyatt Johnson 5f5f0ffa14 patched pym 2018-02-13 12:32:57 -07:00
Wyatt Johnson fc27e02140 removed old unreverted code 2018-02-13 12:28:42 -07:00
Wyatt Johnson f40f209395 cleaned up routes 2018-02-13 12:12:03 -07:00
Wyatt Johnson e924ed9189 reverted path change, cleaned embed stream 2018-02-13 11:35:20 -07:00
Wyatt Johnson 4053a25239 moved login route from /login to /embed/login 2018-02-13 11:35:20 -07:00
Kim Gardner de094ee948 Merge branch 'master' into auth-refactor 2018-02-13 13:07:42 -05:00
Kim Gardner aecae3efbe Merge pull request #1362 from sanoma/master
Added/updated missing Dutch translations
2018-02-13 12:23:36 -05:00
Bart Stroeken 67ade3a323 Merge pull request #3 from sanoma/feature/fix_translations
Added/updated dutch translations
2018-02-13 17:26:54 +01:00
Bart Stroeken 6d2e74eeec capitalfix 2018-02-13 17:22:36 +01:00
Chi Vinh Le c7ee8307e6 Merge branch 'master' into auth-refactor 2018-02-13 16:33:17 +01:00
Bart Stroeken eaeb7ea0da email spellingfix 2018-02-13 16:10:28 +01:00
Bart Stroeken 9e28be8246 Fixed review result 2018-02-13 16:09:25 +01:00
Chi Vinh Le 431bbd4f03 Fix some comments 2018-02-13 16:03:06 +01:00
Chi Vinh Le 0f69df26f6 Use more selectors 2018-02-13 16:00:03 +01:00
Chi Vinh Le c140a62822 Fix e2e 2018-02-13 15:53:12 +01:00
Chi Vinh Le cad25eedd1 CSS cleanup 2018-02-13 15:46:49 +01:00
Chi Vinh Le 87af05c0d9 Fix translations 2018-02-13 15:33:50 +01:00
Chi Vinh Le c54a8bdc4f Remove old code 2018-02-13 15:00:53 +01:00
Bart Stroeken 40963e236f Added/updated dutch translations 2018-02-13 13:24:52 +01:00
Chi Vinh Le d857585c7f Implement facebook auth client 2018-02-13 12:26:55 +01:00
Chi Vinh Le 3999b806c7 Use plugin-api 2018-02-13 12:24:29 +01:00
Chi Vinh Le 6c1ed826d0 Fix External 2018-02-13 11:48:12 +01:00
Chi Vinh Le 4224f18ba7 Add BareButton 2018-02-13 11:42:25 +01:00
Chi Vinh Le 6feaa94fba Listen for auth changes 2018-02-13 11:34:30 +01:00
Chi Vinh Le d639596047 Add External Slot 2018-02-13 11:26:37 +01:00
Chi Vinh Le f5409b11bf Use plugin-api 2018-02-13 11:14:12 +01:00
Wyatt Johnson a0118751c7 Merge pull request #1355 from leeeandroo/lock-install-bug
Lock install issue
2018-02-12 19:39:03 -07:00
Wyatt Johnson 6860b2b03f Merge branch 'master' into lock-install-bug 2018-02-12 19:18:39 -07:00
Wyatt Johnson ec8cfdf5f7 fixed logic 2018-02-12 19:17:58 -07:00
Chi Vinh Le 142c5b32f1 More refactoring 2018-02-13 00:54:15 +01:00
Kim Gardner 2bca30d3c1 Merge pull request #1356 from hellp/l10n-de
German translation
2018-02-12 18:38:49 -05:00
Kim Gardner 3dde285776 Merge branch 'master' into l10n-de 2018-02-12 18:30:02 -05:00
Kim Gardner 1304669416 Merge pull request #1359 from coralproject/fallback-lang
Fallback English Translations
2018-02-12 18:29:41 -05:00