9907 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nick Winter	4ff4306366	Added latest i18n keys to de-DE.coffee again. Added some bottom margin on Component configuration screen for dropdowns.	2015-03-10 16:13:34 -07:00
Nick Winter	12b1d336d9	Merge pull request #2499 from mchlnix/patch-1 ... fixes typos in de-DE.coffee	2015-03-10 16:12:00 -07:00
Michael Nix	4cf4ae6ad7	fixes typos in de-DE.coffee ... Email is actually E-Mail. Email is a different word altogether. Maybe next commit.	2015-03-10 23:36:35 +01:00
Imperadeiro98	68c317d4a2	Update pt-PT.coffee	2015-03-10 22:01:53 +00:00
Imperadeiro98	a2665258da	Better styling for pt-PT in subscribe modal	2015-03-10 22:00:09 +00:00
Nick Winter	b0dc743126	Tweaks to #2418.	2015-03-10 14:49:50 -07:00
Nick Winter	f2ab176fd6	Merge pull request #2418 from divyanshu013/master ... A small fix for confusing Hero Modal weaopons list for #1774	2015-03-10 14:42:31 -07:00
Nick Winter	0992b7bdea	Propagated i18n.	2015-03-10 14:41:53 -07:00
Nick Winter	c1f3e80586	Merge branch 'joseasousa-patch-1'	2015-03-10 14:40:35 -07:00
Nick Winter	439e6f7b4e	Merged pt-BR.coffee.	2015-03-10 14:40:22 -07:00
Nick Winter	8fc893dd6f	Fixed a couple issues with errors during incompletely loaded levels or weird child window global situations using level editor.	2015-03-10 14:37:12 -07:00
Nick Winter	1be0852872	Merge pull request #2496 from nixel2007/patch-1 ... Update DiplomatView.coffee	2015-03-10 14:28:58 -07:00
Imperadeiro98	f202276917	Some fixes to last merge	2015-03-10 21:18:00 +00:00
Imperadeiro98	beea14697a	Merge pull request #2498 from philosomatiker/patch-1 ... Update de-DE.coffee	2015-03-10 21:12:55 +00:00
Markus Plößer	bec8dca9bc	Update de-DE.coffee	2015-03-10 22:00:49 +01:00
Imperadeiro98	74f266f44b	Uncommented some translations	2015-03-10 20:55:44 +00:00
Markus Plößer	bd565f9682	Update de-DE.coffee ... - some spell checkings corrected; - translated a few more lines of "teachers" category	2015-03-10 21:14:06 +01:00
Nikita Gryzlov	321ca1eb2b	Fix Issue #2495	2015-03-10 20:16:43 +03:00
Nick Winter	9c99fc455a	A few poll fixes.	2015-03-10 09:45:21 -07:00
Nick Winter	8c1de9dfa2	Added user index for siterefs.	2015-03-09 17:50:36 -07:00
Nick Winter	dc5fb0af14	Sending a couple more offers in the next-steps emails.	2015-03-09 16:32:29 -07:00
Matt Lott	031337e472	Remove GA main.html default code pageview ... Pageviews are covered by Backbone plumbing instead.	2015-03-09 12:57:10 -07:00
Matt Lott	5a0a4d1446	No auto-fullscreen for admins	2015-03-09 12:57:10 -07:00
Matt Lott	6db4d72dc4	Track pageviews for manual calls to navigate	2015-03-09 12:57:10 -07:00
Nick Winter	652fb3cd3f	Poll doesn't need to saveBackups except in the poll editor.	2015-03-09 11:52:22 -07:00
Nick Winter	54f55b1f9d	Adding polls as patchable.	2015-03-09 11:48:13 -07:00
Nick Winter	e58734894a	Tweaked style on space-disabling and default-locking by player level.	2015-03-09 10:50:00 -07:00
Nick Winter	f5633f05dc	Merge pull request #2414 from h3yduck/lock_issue ... Only lock spacebar and default code when the player is lower level (issue 2406)	2015-03-09 10:37:40 -07:00
Nick Winter	18e6907284	Merge pull request #2488 from nixel2007/master ... Update ru.coffee. Polls	2015-03-09 10:34:45 -07:00
Nick Winter	57b8c06dc4	Merge pull request #2483 from javatlacati/patch-2 ... Update es-419.coffee	2015-03-09 10:33:16 -07:00
Nick Winter	76b6ccad30	Merge pull request #2482 from jklemm/master ... Translate to pt-br	2015-03-09 10:29:52 -07:00
Nick Winter	f3e0b9c00c	Poll answers now recordable by non-admins.	2015-03-09 10:11:03 -07:00
Nick Winter	efe1b77e9e	First poll should be askable.	2015-03-09 09:51:15 -07:00
Nick Winter	495845a633	Storing certain poll results in User object. Showing a poll once per day.	2015-03-09 09:30:51 -07:00
nixel2007	aa98001d36	Update ru.coffee. Polls	2015-03-09 17:11:13 +03:00
jose alves sousa neto	7001bc5b38	Update pt-BR.coffee	2015-03-08 23:08:40 -04:00
Nick Winter	e21360127d	Polls!	2015-03-08 16:36:17 -07:00
javatlacati	3a3e445be5	Update es-419.coffee ... Some update on translation.	2015-03-08 03:53:37 -06:00
Jorge	dedb001bdd	Translate more lines to portuguese brasilian.	2015-03-08 00:49:29 -03:00
Jorge	398ac998ab	Merge branch 'master' of https://github.com/jklemm/codecombat	2015-03-07 23:21:35 -03:00
Nick Winter	6954175fa8	Fixed world.rand.shuffle for arrays of length 0 or 1.	2015-03-06 17:35:11 -08:00
Jorge Klemm	5842481387	Update pt-BR.coffee	2015-03-06 15:16:25 -03:00
Jorge Klemm	b9e2490108	Update pt-BR.coffee	2015-03-06 10:40:02 -03:00
Michael Schmatz	09e969405a	Updated script to use new analytics database	2015-03-05 16:27:33 -08:00
Nick Winter	10f2df3480	Added extra lesson resource links to the Guide.	2015-03-05 08:58:11 -08:00
Imperadeiro98	cbbdd4f3ab	Uncommented some headers... ... ... and fixed errors from last merge.	2015-03-05 16:32:46 +00:00
Imperadeiro98	40318158c1	Merge pull request #2468 from cookiekrieger/cookiekrieger-patch-2 ... Cookiekrieger patch	2015-03-05 16:25:42 +00:00
Imperadeiro98	9aa445ef71	Uncommented some translations from last merge	2015-03-05 16:25:27 +00:00
Imperadeiro98	1b4ef93e25	Merge pull request #2471 from javatlacati/patch-2 ... Update it.coffee	2015-03-05 16:20:33 +00:00
Imperadeiro98	9a5adb43cb	Updated license's year to 2015	2015-03-05 16:13:17 +00:00