Commit Graph

6433 Commits

Author SHA1 Message Date
Chi Vinh Le b1753ecdce Pass es6 to webpack and profit from tree shaking 2017-10-03 20:43:19 +07:00
Chi Vinh Le 7ea05e699e Remove deprecated commonjs imports and exports 2017-10-03 20:43:18 +07:00
Kim Gardner e99b79687f Merge pull request #1000 from coralproject/shorcuts
Admin Shortcuts working
2017-10-02 13:00:29 +01:00
Kim Gardner 89b87b01df Merge branch 'master' into shorcuts 2017-10-02 11:58:07 +01:00
Kim Gardner 257f361998 Merge pull request #997 from vickychijwani/patch-1
Fix double preposition in string
2017-10-02 11:32:13 +01:00
Belen Curcio 17f5800363 Shorcuts working again! 2017-10-02 01:24:59 -03:00
Vicky Chijwani 06ced883ba Fix double preposition in French and Portuguese translations 2017-10-01 05:16:43 +05:30
Vicky Chijwani f7e6f67f4e Fix double preposition in string
This string is followed by a relative time duration with a preposition included, like "in 1 week".
2017-10-01 05:06:10 +05:30
Wyatt Johnson 307fe58cf3 Merge pull request #989 from coralproject/use-talk-linting-preset
Use eslint-config-talk preset
2017-09-29 11:21:06 -06:00
Wyatt Johnson 48f2cce893 Merge branch 'master' into use-talk-linting-preset 2017-09-29 11:02:18 -06:00
Wyatt Johnson b597f730f6 Merge pull request #996 from coralproject/new-docs
Updated docs
2017-09-29 11:02:06 -06:00
Chi Vinh Le d396f43fe3 Merge branch 'master' into use-talk-linting-preset
Conflicts:
	package.json
2017-09-29 23:55:33 +07:00
Chi Vinh Le 799a21fecd Upgrade eslint-config-talk 2017-09-29 23:52:41 +07:00
Kim Gardner df737ad201 Merge branch 'master' into new-docs 2017-09-29 16:56:44 +01:00
Kim Gardner 09ee854302 Merge pull request #984 from ryanyun/add-class-names
introduce classes for easier CSS selection for custom styling
2017-09-29 16:56:03 +01:00
Wyatt Johnson f88bd8b485 Merge branch 'master' into new-docs 2017-09-29 08:59:36 -06:00
Ryan Yun 36ba7367d1 add talk-embed-stream- prefix to classes 2017-09-29 10:57:23 -04:00
Kim Gardner 445107ef64 Merge branch 'master' into add-class-names 2017-09-29 13:36:12 +01:00
Kim Gardner 1c3be913d3 Merge pull request #981 from coralproject/bump-version-3-6-0
Bump version to 3.6.0
2017-09-29 13:35:31 +01:00
Kim Gardner 09f9782505 Merge branch 'master' into new-docs 2017-09-29 12:21:37 +01:00
Kim Gardner 1d6e9527e5 Merge branch 'master' into bump-version-3-6-0 2017-09-29 12:21:16 +01:00
Kim Gardner d0ce832319 Merge pull request #990 from coralproject/update-translation-pt
Add translation of "new" queue in Portuguese
2017-09-29 12:21:05 +01:00
Wyatt Johnson 2e7ee6bb8b Updated docs 2017-09-28 23:38:01 -06:00
Wyatt Johnson ad3958a2e0 Merge branch 'master' into update-translation-pt 2017-09-28 09:45:12 -06:00
Wyatt Johnson 58acdef043 Merge branch 'master' into bump-version-3-6-0 2017-09-28 09:44:09 -06:00
Ryan Yun 99aad0f74b Merge branch 'master' into add-class-names 2017-09-28 11:38:14 -04:00
Kim Gardner 44ce71ef14 Merge pull request #974 from coralproject/redis-cluster-support
Redis Cluster Support
2017-09-28 15:44:02 +01:00
Kim Gardner 47cde9a842 Merge branch 'master' into redis-cluster-support 2017-09-28 15:38:51 +01:00
Ryan Yun 95114bc847 Merge branch 'add-class-names' of github.com:ryanyun/talk into add-class-names 2017-09-27 11:21:19 -04:00
Ryan Yun 12047d1ae1 fix typo for dynamic class names for like and respect buttons 2017-09-27 11:20:57 -04:00
Kim Gardner 0362dad14b Merge branch 'master' into add-class-names 2017-09-27 16:06:21 +01:00
Kim Gardner 97b81cc1cc Merge pull request #991 from coralproject/featured-comment-content-slot
Use commentContent slot in Featured Comments
2017-09-27 16:05:51 +01:00
Kim Gardner 8d6b9dd23c Merge branch 'master' into featured-comment-content-slot 2017-09-27 10:54:37 +01:00
Kim Gardner 9adf11e1d1 Merge branch 'master' into update-translation-pt 2017-09-27 10:53:52 +01:00
Kim Gardner ef49d9a3d2 Merge pull request #988 from coralproject/password-reset-fix
Password reset fixes
2017-09-26 17:42:06 +01:00
Wyatt Johnson 921eea59c8 Merge branch 'master' into password-reset-fix 2017-09-26 10:36:47 -06:00
Kim Gardner c5cd88f4c0 Merge pull request #986 from coralproject/cleanup-dependencies
Cleanup dependencies
2017-09-26 17:25:10 +01:00
Kim Gardner 762f4f7898 Merge branch 'master' into cleanup-dependencies 2017-09-26 17:15:13 +01:00
Kiwi e400ae37f4 Merge branch 'master' into password-reset-fix 2017-09-26 18:14:20 +02:00
Kiwi 45b0ec48de Merge branch 'master' into featured-comment-content-slot 2017-09-26 18:11:21 +02:00
Kim Gardner f3f8c6b24e Merge pull request #985 from coralproject/mod-indicator
Moderate Indicator
2017-09-26 17:03:34 +01:00
Belen Curcio baa5bddd19 Merge branch 'mod-indicator' of github.com:coralproject/talk into mod-indicator 2017-09-26 12:43:05 -03:00
Belen Curcio bea7d75db7 Polling to update the Header Indicator 2017-09-26 12:42:39 -03:00
Belén Curcio 8e5edd65c7 Merge branch 'master' into mod-indicator 2017-09-26 12:36:59 -03:00
Wyatt Johnson 9ae59ef998 added parent url to the login popup 2017-09-26 09:35:33 -06:00
Chi Vinh Le 0f382bd742 Use commentContent slot in Featured Comments 2017-09-26 22:31:54 +07:00
Kim Gardner 55b1f4831a Add translation of "new" queue in Portuguese 2017-09-26 16:30:09 +01:00
Wyatt Johnson 3d2575413d Merge branch 'master' into password-reset-fix 2017-09-26 09:07:07 -06:00
Kiwi c40393347a Merge branch 'master' into use-talk-linting-preset 2017-09-26 14:39:25 +02:00
Chi Vinh Le 8c05e3df87 Use eslint-config-talk preset 2017-09-26 19:35:24 +07:00