1571 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Qhorin	b1819edd5b	Added missing "the"	2015-07-17 11:15:15 -04:00
Peter Cottle	07d577697e	Merge pull request #299 from pcottle/combineDialogs ... Combine dialogs	2015-06-24 09:57:40 -07:00
Peter Cottle	d727fb976b	commas	2015-06-24 09:52:40 -07:00
Peter Cottle	4239ee7e8e	for all languages	2015-06-24 09:52:19 -07:00
Peter Cottle	088480df05	Resolves #297 combine dialogs	2015-06-24 09:49:33 -07:00
Peter Cottle	e71a89e450	Merge pull request #298 from mizunashi-mana/mzJPTranslate4 ... fix japanese typos and add ja contents	2015-06-22 10:29:34 -07:00
Mizunashi Mana	a51fb7137d	fixed some typos	2015-06-22 23:46:10 +09:00
Mizunashi Mana	2d15267607	add ja contents for mergeManyFeatures	2015-06-22 13:08:01 +09:00
Mizunashi Mana	466d254a54	add ja contents for PushMaster	2015-06-21 19:21:38 +09:00
Mizunashi Mana	396c306fd2	Merge branch 'master' into mzJPTranslate4	2015-06-17 15:25:20 +09:00
Mizunashi Mana	9d59282c91	fix some typos	2015-06-17 15:06:01 +09:00
Peter Cottle	64ca318346	wait longer	2015-06-16 14:40:11 -07:00
Peter Cottle	1350d2e2d3	bump for travis	2015-06-16 14:36:48 -07:00
Peter Cottle	12cd7815be	Merge pull request #296 from mizunashi-mana/mzJPTranslate3 ... fix japanese typos and add ja contents	2015-06-16 11:50:31 -07:00
Mizunashi Mana	b944c28982	fix some typos	2015-06-17 02:07:48 +09:00
Mizunashi Mana	70ea9de86e	fix my a little typo :'-|	2015-06-16 23:21:57 +09:00
Mizunashi Mana	dc83be96b5	added myself to translater ;)	2015-06-16 22:55:00 +09:00
Mizunashi Mana	d16eaf882f	add ja contents on fetchRebase	2015-06-16 22:49:40 +09:00
Mizunashi Mana	a0fb2595f5	add ja contents on fakeTeamwork	2015-06-16 14:29:44 +09:00
Mizunashi Mana	ab2a163eed	fix some typos and add ja push translated	2015-06-16 12:35:15 +09:00
Peter Cottle	1c9bd97491	Merge pull request #295 from mizunashi-mana/mzJPTranslate3 ... fix japanese typos and add ja contents	2015-06-14 13:58:46 -07:00
Mizunashi Mana	fecf55c2db	add ja contents for push	2015-06-14 00:18:33 +09:00
Mizunashi Mana	d5715003ab	Merge branch 'master' into mzJPTranslate3	2015-06-13 23:05:51 +09:00
Mizunashi Mana	8af0788bb4	Merge remote-tracking branch 'upstream/master'	2015-06-13 23:05:25 +09:00
Mizunashi Mana	32203ad916	fix some typos	2015-06-13 23:05:05 +09:00
Peter Cottle	a90292cf3c	Merge pull request #294 from alexeiberkov/feature/russianTranslation ... Added Russian translation for pushManyFeatures.js	2015-06-11 10:28:40 -07:00
Alexey Berkov	84e4be8ec5	I added ru_RU (Russian) translation for the "pushManyFeatures.js". Fixed typos.	2015-06-11 16:46:57 +03:00
Peter Cottle	656d501883	Merge pull request #293 from pcottle/fixOriginMaster ... fix some escaping with react views	2015-06-09 11:28:08 -07:00
Peter Cottle	6ded51a719	Merge pull request #292 from pcottle/clarify ... Resolves #291 clarify o/ prefix	2015-06-09 11:28:04 -07:00
Peter Cottle	970131fe8b	fix some escaping with react views	2015-06-09 11:19:48 -07:00
Peter Cottle	0a1f3510af	Resolves #291 clarify o/ prefix	2015-06-09 11:17:30 -07:00
Peter Cottle	d805d75ffd	Merge pull request #290 from alexeiberkov/feature/russianTranslation ... ru_RU (Russian) translation for the "fetchRebase.js"	2015-06-07 21:50:13 -07:00
Alexey Berkov	cadc7c9ea0	I added ru_RU (Russian) translation for the "fetchRebase.js". Sorry for delay ;)	2015-06-07 23:15:44 +03:00
Peter Cottle	1b612dc327	Small fix for #288	2015-06-06 13:12:38 -07:00
Peter Cottle	718e4049a6	Merge pull request #289 from pcottle/fixLevelDancing ... Resolves #288 Resolves #266 Fix the level dancing bug	2015-06-06 13:08:44 -07:00
Peter Cottle	6ba36de6b7	Resolves #288 Resolves #266 Fix the level dancing bug	2015-06-06 13:05:09 -07:00
Peter Cottle	1e213b9ea0	Merge pull request #285 from pcottle/fixNpmInstall ... Resolves #280 stricter version of backbone	2015-06-02 22:56:17 -07:00
Peter Cottle	32b8b2c8bf	wait for longer	2015-06-02 22:46:44 -07:00
Peter Cottle	34b5c04577	Resolves #280 stricter version of backbone	2015-06-02 22:39:41 -07:00
Peter Cottle	2c29ecf990	cname for js-org :O	2015-05-30 08:41:29 -07:00
Peter Cottle	a5b6cc3e09	Merge pull request #281 from alexeiberkov/feature/russianTranslation ... Russian translation for "fakeTeamwork.js" and "push.js" lessons	2015-05-29 13:52:33 -07:00
Alexey Berkov	b64689dd3a	I added ru_RU (Russian) translation for the "fakeTeamwork.js" and "push.js" lessons. Fixed typos in "pull.js".	2015-05-29 15:54:10 +03:00
Peter Cottle	a492e5f4a5	Merge pull request #278 from alexeiberkov/feature/russianTranslation ... Added ru_RU (Russian) translation for the "pull.js".	2015-05-27 21:47:48 -07:00
Peter Cottle	1502b50bcb	Resolves #277	2015-05-27 21:38:12 -07:00
Peter Cottle	1ef2569394	Resolves #273 build level breakage	2015-05-27 21:30:52 -07:00
Alexey Berkov	232f7232fb	I have added ru_RU (Russian) translation for the "pull.js" lesson. With approval of owner I added my account name into list of contributors.	2015-05-25 10:48:32 +03:00
Mizunashi Mana	03db0de6bb	Merge branch 'master' into mzJPTranslate3	2015-05-25 00:58:33 +09:00
Mizunashi Mana	c031c604bd	Merge remote-tracking branch 'upstream/master'	2015-05-25 00:53:48 +09:00
Peter Cottle	6c3a7ad327	add link to my twitter for feedback	2015-05-23 13:31:49 -07:00
Mizunashi Mana	77ae2c9065	add ja content on fetch	2015-05-23 02:00:49 +09:00