wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-08-09 12:30:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,528 Commits 10 Branches 125 Tags
bf77ddc49be028380f9bc90f0a3363f59d78f803
Commit Graph
7528 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tibo BeijenandGitHub bf77ddc49b Merge branch 'master' into master 2018-01-12 13:54:31 +01:00
daan944andGitHub ebe6341b01 Merge pull request #1 from sanoma/feature/MDN-10616_translation_additions 
Feature/mdn 10616 translation additions
 2018-01-12 13:45:20 +01:00
d.luijten 34a0e314e8 After discussion: changed status to shorter “Pre-moderatie” 2018-01-12 13:44:29 +01:00
d.luijten 951f16f0a1 Improved email message: ‘je gebruiker’ is always referred to as ‘je account’. Also, simplified ‘Diens inhoud’ to ‘de inhoud van je gebruikersnaam’. 2018-01-12 11:32:48 +01:00
d.luijten 988b39f19d Fixed call-to-action: “Kom in gesprek!” sounds a bit weird to me. 2018-01-12 11:20:29 +01:00
d.luijten 9333b407bb Fixed consistency: Community guidelines are used both with and without capital C. Chose to go for the version without capital C, since it’s not a title. 2018-01-12 11:19:21 +01:00
d.luijten 8867fd54f3 Fixed consistency: “Voor-mod” is never used. “Pre-moderatie” would be acceptable, but “Wachtend op moderatie” sounds more like the correct status message. 2018-01-12 11:14:51 +01:00
d.luijten 56bd3041d6 Fixed consistency: a “bio” has been both named “biografie” and “bio”. Chose “biografie” for now. 2018-01-12 11:11:09 +01:00
d.luijten a53bb6650a Fixed SI units. 2018-01-12 11:10:30 +01:00
d.luijten 0a99ae50b1 Fixed consistency: “Afgewezen wachtrij” implies that this name is used more frequently, but it isn’t. 2018-01-12 11:10:06 +01:00
Tibo Beijen 6bad3fdc2f Dotted some sentences. 2018-01-12 09:09:21 +01:00
Kim GardnerandGitHub 737b77a6ac Merge pull request #1269 from larrylizhao/feature/pluginTranslation 
Translations refinement for plugins
 2018-01-11 09:36:35 -05:00
Bart Stroeken e5c3474455 dutch translation was not added yet without adding it to i18n.js - and refined a few translations. 2018-01-11 11:56:30 +01:00
liz 6e813e9663 Translations refinement for plugins 2018-01-11 17:16:26 +08:00
Bart Stroeken 1f2caada3f Finished drafting translations. Let's spin it up for a test run 2018-01-11 09:04:45 +01:00
Kim GardnerandGitHub bf76f0453b Merge pull request #1261 from coralproject/losowsky-patch-1 
Small grammar fixes
 2018-01-09 17:04:01 -05:00
Kim GardnerandGitHub 00677148b9 Merge branch 'master' into losowsky-patch-1 2018-01-09 16:53:15 -05:00
Wyatt JohnsonandGitHub 7bdfb55a1c Merge pull request #1260 from coralproject/embed-events 
Embed events
 2018-01-09 14:53:04 -07:00
Andrew LosowskyandGitHub c43051c6dd Small grammar fixes 2018-01-09 16:20:32 -05:00
Wyatt Johnson 20453dfddd refactor to cleanup 2018-01-09 14:13:02 -07:00
Wyatt JohnsonandGitHub 20f9bba845 Merge branch 'master' into embed-events 2018-01-09 11:25:22 -07:00
Wyatt Johnson 25e29cb79a extracted asset url 2018-01-09 11:01:10 -07:00
Wyatt Johnson 7f25f46ac0 extracted more funcs 2018-01-09 10:51:43 -07:00
Wyatt Johnson d3c1286d1a extracted events from opts 2018-01-09 10:47:58 -07:00
Kim GardnerandGitHub abc6cf6366 Merge pull request #1258 from coralproject/toxic-update 
Adding doNotStore param to our Toxic Comments Plugin
 2018-01-09 11:51:59 -05:00
Kim GardnerandGitHub eb33eb72d1 Merge branch 'master' into toxic-update 2018-01-09 11:44:44 -05:00
Kim GardnerandGitHub 1a39635c0e Merge pull request #1257 from larrylizhao/feature/RefineTranslation 
Feature/refine translation
 2018-01-09 11:43:23 -05:00
okbel ff016e22fe Adding TALK_PERSPECTIVE_DO_NOT_STORE to the docs 2018-01-09 10:42:28 -03:00
okbel 579644c910 Adding doNotStore 2018-01-09 10:34:24 -03:00
liz 37d1f3361c Translation update to make it more appropriate. 2018-01-09 16:54:13 +08:00
liz 6e8b28cc8a Translation for hide off topic comments 2018-01-09 14:03:09 +08:00
Wyatt JohnsonandGitHub c0f266dfa5 Merge pull request #1256 from coralproject/docs-typo 
Docs typo
 2018-01-08 10:56:41 -07:00
Kim GardnerandGitHub 99d66fef52 Docs typo 2018-01-08 11:27:25 -05:00
Kim GardnerandGitHub ad6a663179 Merge pull request #1237 from coralproject/admin-pages 
CSS Customization and i18n fixes
 2018-01-05 12:20:46 -05:00
Kim GardnerandGitHub 5cd6322284 Merge branch 'master' into admin-pages 2018-01-04 17:26:33 -05:00
Kim GardnerandGitHub 0ab6cc3a0f Merge pull request #1230 from coralproject/safari-bs-changes 
Safari Browserstack changes
 2018-01-04 17:26:05 -05:00
Kim GardnerandGitHub c617a3446d Merge branch 'master' into safari-bs-changes 2018-01-04 17:15:47 -05:00
Kim GardnerandGitHub d76fe5350e Merge pull request #1238 from MEL27/master 
Add initial Simplified Chinese translation
 2018-01-04 17:15:23 -05:00
Kim GardnerandGitHub 927aa54feb Merge branch 'master' into master 2018-01-04 17:03:10 -05:00
Kim GardnerandGitHub fc272ed1e1 Merge branch 'master' into master 2018-01-04 17:02:32 -05:00
Kim GardnerandGitHub 882251864a Merge pull request #1246 from coralproject/simplified-chinese-merge-fixes 
Simplified Chinese merge fixes
 2018-01-04 17:01:42 -05:00
Kim GardnerandGitHub 4eaa234dd8 Merge branch 'master' into simplified-chinese-merge-fixes 2018-01-04 16:48:46 -05:00
Kim Gardner bf1fbfe03f Fix merge conflicts on master 2018-01-04 16:43:51 -05:00
Kim GardnerandGitHub d3f93644db Merge branch 'master' into master 2018-01-04 16:07:18 -05:00
Kim GardnerandGitHub b9412dcb10 Merge branch 'master' into master 2018-01-04 15:55:18 -05:00
Kim GardnerandGitHub 1125351cd1 Merge pull request #1243 from larrylizhao/feature/zh_tw 
Adding traditional Chinese locales for Coral talk
 2018-01-04 15:35:22 -05:00
KiwiandGitHub 2c87dac897 Merge branch 'master' into admin-pages 2018-01-04 18:42:21 +01:00
Chi Vinh Le d5bf44ada8 Keep localhost for mongodb and redis 2018-01-04 18:41:31 +01:00
Kim GardnerandGitHub f8c1f1e63d Merge branch 'master' into safari-bs-changes 2018-01-04 11:21:52 -05:00
Kim GardnerandGitHub c7176a4660 Merge branch 'master' into feature/zh_tw 2018-01-04 11:21:07 -05:00