7893 commits

Author	SHA1	Message	Date
nixel2007	fff60c717b	Update ru,coffee	2015-03-24 10:52:16 +03:00
Nick Winter	3af8fb6218	Suppress selection sounds in the level editor.	2015-03-23 17:37:49 -07:00
Nick Winter	5502deb9f6	Merge pull request #2548 from nixel2007/ForkModal ... Clean i18n when forking an object	2015-03-23 16:52:00 -07:00
Nikita Gryzlov	20884f8b5d	Update ForkModal.coffee. Unset i18nCoverage on Fork	2015-03-24 02:39:03 +03:00
Nick Winter	d34577dd38	Propagated i18n.	2015-03-23 15:54:26 -07:00
Nick Winter	b4ea78e5cb	Implementing alternative pricing with Alipay in China to support dedicated China server.	2015-03-23 15:26:44 -07:00
Imperadeiro98	26b7c65855	Merge pull request #2562 from nixel2007/ru ... Update ru.coffee. "Subscribe", "teachers", orfografic.	2015-03-23 13:35:27 +00:00
Imperadeiro98	02bee04662	Uncommented a string from last merge... ... ... so that it doesn't get lost	2015-03-23 13:34:44 +00:00
nixel2007	126b64e9f5	Update ru.coffee. New "Teachers" block	2015-03-23 16:28:02 +03:00
nixel2007	1329098cac	Update ru.coffee. Fix orfografic	2015-03-23 13:17:12 +03:00
nixel2007	844d4cec88	Update ru.coffee. Subscribe and small fixes.	2015-03-23 01:26:37 +03:00
AtaZh	03df2416f1	Update uk.coffee	2015-03-22 23:15:52 +02:00
AtaZh	13629d8650	Update uk.coffee	2015-03-22 21:33:41 +02:00
Jhoon Saravia	dc835f74e4	Finished translations and added some corrections.	2015-03-22 10:23:37 -05:00
Imperadeiro98	8c138d5d36	Merge pull request #2555 from e-jigsaw/community-translate-japanese ... Translated community page in Japanese	2015-03-22 10:33:23 +00:00
Imperadeiro98	44fd85b3a4	Merge pull request #2554 from e-jigsaw/classes-translate-japanese ... Translated classes summary in Japanese	2015-03-22 10:33:02 +00:00
Imperadeiro98	bfda4bbe58	Merge pull request #2552 from e-jigsaw/improve-japanese-about-page ... Improve Japanese in about page	2015-03-22 10:32:39 +00:00
jigsaw	3bbbf6583c	Translated community page in Japanese	2015-03-21 23:00:13 +09:00
jigsaw	4a27bbd0ea	Translated classes summary in Japanese	2015-03-21 22:39:07 +09:00
jigsaw	9df6ade953	Improve Japanese in about page	2015-03-21 19:43:15 +09:00
Nikita Gryzlov	3c2e8a7fa5	Update es-ES	2015-03-21 11:43:04 +03:00
Nick Winter	19e68f7c05	Improvements to spectate for big screens, allowing spectating of chosen top matches.	2015-03-20 15:32:35 -07:00
Nick Winter	e288b95543	Fixed #1961 (castDrainLife -> cast('drain-life') in the docs).	2015-03-20 13:43:00 -07:00
nixel2007	7cda4e65e3	Update ForkModal. Clean i18n on fork	2015-03-20 23:19:38 +03:00
Nikita Gryzlov	da47e2cefb	Update en.coffee. Add {change}	2015-03-20 23:08:26 +03:00
Nick Winter	8760725b8d	Unholy Tome III instead of IV for Zero Sum.	2015-03-20 11:07:41 -07:00
Matt Lott	fb8e184819	Update teachers page	2015-03-20 09:18:34 -07:00
Nick Winter	bae7612703	Disabled pinned docs clicks for now, since their CSS is wonky.	2015-03-20 09:03:36 -07:00
Nick Winter	0e0d2830be	Zero Sum mirror match using Golden Wand and Unholy Tome IV now.	2015-03-19 21:37:47 -07:00
Nick Winter	d5b69cb811	Merge pull request #2545 from Vlevo/patch-1 ... Update ControlBarView.coffee	2015-03-19 15:15:18 -07:00
Matt Lott	fec3ac38e9	Prepaid subscriptions ... Admins can generate a prepaid code, which a user can use to subscribe for free via the account/subscription page. The subscription will be identical to the normal monthly subscription (e.g. 3500 gems per month), except they won’t be charged. Does not require the recipient to enter billing information. Can be applied to an existing subscription, which will be converted to free. Prepaid code can only be used once. Prepaid subscription cannot be unsubscribed via the UI.	2015-03-19 15:04:15 -07:00
Vlevo	49b32a8ff1	Update ControlBarView.coffee ... added a clause for the "older campaigns"	2015-03-19 16:02:53 -06:00
nixel2007	5169dc789f	Update eo.coffee. Slogan; nav, modal, not_found	2015-03-19 22:49:29 +03:00
nixel2007	34a01a22e5	Update eo.coffee. Diplomat block	2015-03-19 22:16:17 +03:00
Nick Winter	aae44c2064	Further fix for DiplomatView including Esperanto.	2015-03-19 10:18:53 -07:00
Imperadeiro98	e1a6156345	Requiring Esperanto in Diplomat page... ... ... so that it doesn't break. It would be nice if the languages could be loaded from locale/locale.	2015-03-19 16:26:00 +00:00
Nick Winter	6b372ec82e	Adding Esperanto stub.	2015-03-19 08:36:35 -07:00
Nick Winter	c6cd7b032d	Fixed Alipay auto locale detection.	2015-03-18 17:17:30 -07:00
Nick Winter	f9d9b0985b	Merge pull request #2540 from nixel2007/master ... Add "Translated Name" to /i18n	2015-03-18 16:21:34 -07:00
Nick Winter	585fa40a8c	Added first draft of campaign info to campaign selector screen.	2015-03-18 16:20:30 -07:00
nixel2007	9b509fa83e	Add "Translated Name" to /i18n	2015-03-19 01:44:23 +03:00
Shady Kamal	216579d95b	Update he.coffee ... finished the essentials and I took my time to check the translation, I wasn't active since I worked onmy projects now the steps remaining are 1) finishing the miscellenious translations (teachers, community, editors etc...) 2) fixing the right to left problem (probably by just using the mechanics of the text editor differently[reorganizing brackets, dots, commas, language mixed sentences and so on...]) 3) altering other files to support sending the subscription message according to user's gender since there is no way to representboth gender in the same form (Could you please direct me to the files that I need to edit to send the message?)	2015-03-18 22:08:54 +02:00
Imperadeiro98	d6043d4572	Uncommented an header from last merge	2015-03-18 18:06:45 +00:00
Imperadeiro98	1ddbbdfbcd	Merge pull request #2538 from pettevi/patch-1 ... Update fi.coffee	2015-03-18 18:01:44 +00:00
Imperadeiro98	4b7f9366dc	Removed "Experimental" from Lua... ... ... and added to CoffeeScript	2015-03-18 17:58:29 +00:00
petteri	b98b621eb3	Update fi.coffee ... Removed few # from category-tags and fixed typos	2015-03-18 13:20:56 +02:00
petteri	d36e2863c9	Update fi.coffee ... Added more translations	2015-03-18 09:18:23 +02:00
petteri	1cfaf76bd1	Update fi.coffee ... Added more translations here and there	2015-03-18 09:06:03 +02:00
Nick Winter	792e65767d	I could try to compile it first, I guess.	2015-03-17 22:04:30 -07:00
Nick Winter	8af94209b4	Lua is not experimental any more. (But CoffeeScript is.)	2015-03-17 22:02:15 -07:00
Nick Winter	3236abc5da	Added emphasis for Apocalypse.	2015-03-17 21:20:26 -07:00
Nick Winter	5e80bb60d0	Fixed scrolling issue on background on i18n edit pages.	2015-03-17 16:30:59 -07:00
Nikita Gryzlov	2c4be8bdda	Removing invoices from /account ... As said at https://github.com/codecombat/codecombat/pull/2527#issuecomment-82609513	2015-03-18 01:23:40 +03:00
Imperadeiro98	9913a155c7	Some styling updates to account-settings-view.sass	2015-03-17 18:57:16 +00:00
Imperadeiro98	1a039ff3cc	Uncommented some strings from last merge	2015-03-17 18:42:39 +00:00
Imperadeiro98	0ceebbf4e5	Merge pull request #2536 from pettevi/patch-1 ... Update fi.coffee	2015-03-17 18:37:51 +00:00
petteri	7aa355c320	Update fi.coffee ... Removed # that I forgot in my last commit	2015-03-17 20:25:36 +02:00
Imperadeiro98	44eef21f36	Merge pull request #2535 from Coderaulic/patch-2 ... Update ja.coffee	2015-03-17 18:05:11 +00:00
petteri	b8d92c1027	Update fi.coffee ... Added more general translations	2015-03-17 18:43:22 +02:00
petteri	962635b6bd	Update fi.coffee ... Started Finnish translation	2015-03-17 13:08:06 +02:00
Coderaulic	a101c0a6d6	Update ja.coffee ... Finished translation for Settings: Minor fixes from previous. One off translations here and there.	2015-03-16 23:31:55 -07:00
Nathan Smith	8f67835d41	Added more names for #53	2015-03-16 20:51:29 -07:00
Nick Winter	0916f1dd61	Style tweaks for #2533. Fixed #1403.	2015-03-16 19:50:05 -07:00
Nick Winter	084c01c5b7	Merge pull request #2533 from basicer/patch-1 ... Update vector.coffee	2015-03-16 19:48:43 -07:00
Nick Winter	7e97c5dd58	Merge pull request #2532 from nixel2007/patch-1 ... Show extendedName and unlockLevelName in i18n-thang editor only if it needs to show	2015-03-16 19:24:57 -07:00
Rob Blanckaert	82c2d4d4b5	Update vector.coffee ... Fix indents.	2015-03-16 21:02:07 -04:00
Rob Blanckaert	0a06022b8f	Update vector.coffee ... Make Vector do the right thing if you forget new,	2015-03-16 20:56:28 -04:00
Nick Winter	2d89de8183	Using new Aether optimization options for minimal flow tracking (big performance gains). Trying again to handle random no-window avatar creation error.	2015-03-16 17:36:38 -07:00
nixel2007	38275dd2a9	Show extendedName and unlockLevelName in i18n-thang editor only if it needs to show	2015-03-17 01:15:13 +03:00
Nick Winter	8c28247906	Merge pull request #2509 from Imperadeiro98/master ... Some cleanup to play-items-modal.sass file	2015-03-16 13:55:02 -07:00
Nick Winter	4f8b81903b	Propagated i18n.	2015-03-16 13:51:51 -07:00
Nick Winter	116cf24060	Merged el.coffee.	2015-03-16 13:49:45 -07:00
Imperadeiro98	746ea0689d	Merge pull request #2529 from swoeste/patch-1 ... Update de-DE.coffee	2015-03-16 19:36:29 +00:00
Imperadeiro98	a6a0096549	Merge pull request #2530 from Coderaulic/patch-2 ... Update ja.coffee	2015-03-16 19:35:15 +00:00
Nick Winter	d6cba0de67	Enabled Alipay support. Updated to latest version of Stripe checkout.js.	2015-03-16 10:50:15 -07:00
Nick Winter	bb7c232455	Not using Mixpanel any more.	2015-03-16 08:48:52 -07:00
Coderaulic	da5f5da4e0	Update ja.coffee ... Finished translations for "Contact Us". Assuming no translation is wanted for deprecated lines. Added one off translations here and there. Not sure how to translate line 340. Any insight into meaning is appreciated.	2015-03-16 02:29:43 -07:00
swoeste	a36e8962d5	Update de-DE.coffee ... Added translations for "Accounts Subscription View" and some other parts.	2015-03-15 22:09:20 +01:00
Imperadeiro98	7ec870386c	Uncommented an header to activate translations	2015-03-15 11:58:23 +00:00
Imperadeiro98	06b1767725	Merge pull request #2525 from tianz/master ... Added translations to some untranslated items (Simplified Chinese)	2015-03-15 11:57:05 +00:00
Imperadeiro98	cd8316c61f	Merge pull request #2520 from Zikanda13/patch-1 ... Update de-DE.coffee	2015-03-15 11:50:53 +00:00
Tian Zhou	a2aeadf1ae	Added translations to some untranslated items	2015-03-14 22:11:48 -04:00
Nick Winter	404afd7f3d	Merge pull request #2379 from coder0xff/patch-1 ... Update ellipse.coffee	2015-03-14 11:33:31 -07:00
nixel2007	980ef9b769	Update ru.coffee. Fix accretion.	2015-03-14 20:22:43 +03:00
Nick Winter	89bdb3b790	Fixed #2518.	2015-03-14 09:57:31 -07:00
Nick Winter	57e77a0cd7	Upcoming ladder level Zero Sum equalizes all players' heroes and equipment.	2015-03-14 09:39:43 -07:00
nixel2007	87b1f8628f	Update ru.coffee. personal_sub block	2015-03-14 19:24:17 +03:00
Imperadeiro98	f970213283	Merge pull request #2510 from JCesar91/patch-1 ... Update es-419.coffee	2015-03-14 13:33:45 +00:00
coder0xff	9dbecd213b	Update ellipse.coffee ... Fix to pass unit tests	2015-03-14 01:26:13 -04:00
Zikanda13	cc12333eba	Update de-DE.coffee ... Changed several formulation issues to a more common form of German language. Corrected some grammar mistakes. Added some translations for the "teachers" part.	2015-03-14 01:37:01 +01:00
Matt Lott	b696c916c0	🐛Fix subscription view personal sub next payment date	2015-03-13 16:08:30 -07:00
Matt Lott	5264fc6181	🐛Fix subscription view just subscribed alert message	2015-03-13 15:51:47 -07:00
Matt Lott	af89452b93	Merge branch 'sponsored-subs'	2015-03-13 15:19:20 -07:00
Nick Winter	3ff41f5619	Rewriting sample code dynamically to fix findNearestEnemy / findNearest(findEnemies) issues.	2015-03-12 11:08:58 -07:00
Nick Winter	83a72d3030	Merge pull request #2514 from Catsync/mountain-generator ... Added mountain terrain generator	2015-03-12 10:42:48 -07:00
Cat Sync	90d7159501	Added mountain terrain generator	2015-03-12 13:31:21 -04:00
Jorge Klemm	b26f9f1f6a	Correcting translate word Items to Itens on pt-BR translation	2015-03-12 13:14:38 -03:00
Jorge Klemm	571f69b2de	Translate and adjust some words.	2015-03-12 10:57:00 -03:00
Jorge Klemm	a6c39714aa	Adding me as a Diplomat.	2015-03-12 10:52:09 -03:00
Nick Winter	3458f2069b	Temporary workaround for #2512. Identifying ageRange. Made poll header slightly smaller.	2015-03-11 20:21:54 -07:00
JCesar91	661d94bf33	Update es-419.coffee	2015-03-11 19:42:28 -05:00
Imperadeiro98	9fedd1f838	Some cleanup to play-items-modal.sass file	2015-03-11 22:13:16 +00:00
Nick Winter	a697b35920	Fixed poll fetching for first poll.	2015-03-11 09:01:40 -07:00
Nick Winter	7b20bf469a	Merge pull request #2504 from nixel2007/patch-2 ... More humane view of i18n-editor	2015-03-11 08:16:12 -07:00
nixel2007	e5c8fc4a1c	More humane view of i18n-editor ... Change the layout to Description en non-en	2015-03-11 16:45:35 +03:00
nixel2007	01c2cfce7c	Update play-heroes-modal.sass for ru	2015-03-11 15:41:39 +03:00
laituan245	ae07a69bd7	Fixed issue #2497	2015-03-11 13:01:15 +09:00
laituan245	599f18344e	Fixed issue #2497 for 'ru', 'pt-PT', and 'pt-BR'	2015-03-11 12:16:03 +09:00
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
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	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	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	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
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
javatlacati	edd86ac87b	Update it.coffee	2015-03-05 05:40:03 -06:00
nixel2007	6fafd51d89	Update ru.coffee. Invoice block	2015-03-05 13:11:57 +03:00
nixel2007	1d793fbdf4	Update ru.coffee	2015-03-05 12:17:24 +03:00
Matt Lott	cd59b90e37	Add custom payments ... Example: https://codecombat.com/account/invoices?a=21600&d=9%20monthly%20subscrip tions	2015-03-04 15:40:53 -08:00
Nick Winter	942bab554a	Restored lost vi translations, with section headers this time, as caught in #2428.	2015-03-04 14:49:04 -08:00
Nick Winter	025f1c5afc	Fixed ellipse-ellipse intersection test.	2015-03-04 13:53:57 -08:00
cookiekrieger	77fb084d29	Update de-DE.coffee	2015-03-04 22:24:27 +01:00
cookiekrieger	3a4115d779	Update de-DE.coffee	2015-03-04 22:12:52 +01:00
Nick Winter	60db16b1c3	Making all code languages load for level editor to avoid busted level previews. Added CoffeeScript compiler to web worker so we can use Referee extraCode.	2015-03-04 11:29:03 -08:00
cookiekrieger	ce8ff52936	Update de-DE.coffee ... Sometimes I left the originalcode as a commentary behind the text. I hope this is allowed.	2015-03-04 18:32:41 +01:00
Imperadeiro98	e63f194fd1	Update pt-PT.coffee	2015-03-04 17:19:28 +00:00
Nick Winter	e6cf298ed3	Propagated i18n. A couple other misc tweaks.	2015-03-04 09:00:32 -08:00
Nick Winter	2d18bcf9f0	Recording referrer information. Updating parent email prompt to also show after Signs and Portents if that's the fourth level.	2015-03-03 09:04:53 -08:00
Nick Winter	a082d2e05f	Merged hu.coffee.	2015-03-02 12:11:54 -08:00
Nick Winter	2fe4be4034	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-03-02 10:23:02 -08:00
Nick Winter	0f53605c21	Merged names. Added genders to all name categories. Reordered names so ones we need more are towards the top.	2015-03-02 10:22:04 -08:00
Matt Lott	57bfa86719	🐛Fix IE9 analytics logging CORS problem ... There’s limited CORS support on IE9.	2015-03-02 10:11:58 -08:00
Thejdeep	e6c60a8027	Added a quote	2015-03-02 20:54:30 +05:30
Nick Winter	bb80db9cd5	Server now thinks it's production whenever it's not localhost:3000, rather than whenever it is codecombat.com.	2015-03-01 22:19:01 -08:00
divyanshu013	ae5aafb24a	Added /account link to logged in username for #1635 ... Clicking on the username should point to /account page of the logged in user.	2015-03-02 01:38:47 +05:30
Nick Winter	dc56a50b75	Handling empty context objects in i18n edit view.	2015-03-01 09:40:14 -08:00
Nick Winter	26c5c17eab	Fixed #2427.	2015-03-01 07:51:24 -08:00
divyanshu013	e66d94c59f	Bug fix for layout problem in German subscribe for #2409 ... A small fix adjusting the font sizes.	2015-03-01 20:08:14 +05:30
divyanshu013	fac48752fa	A small fix for confusing Hero Modal weaopons list for #1774	2015-03-01 20:08:14 +05:30
nixel2007	e1cfd9763f	Update ru.coffee ... tip_open_source_contribute and clear_storage	2015-03-01 16:11:09 +03:00
Imperadeiro98	f3e7018c88	Re-ordered contributor classes... ... ... in community view according to contribute page order.	2015-03-01 11:25:23 +00:00
Imperadeiro98	81c234723b	Update pt-PT.coffee	2015-03-01 11:20:53 +00:00
Nick Winter	8e37505197	Merge pull request #2442 from DotTry/patch-3 ... Updated Translation	2015-02-28 16:12:25 -08:00
Nick Winter	c9be09474c	Merge pull request #2441 from Coderaulic/patch-1 ... Update ja.coffee	2015-02-28 16:11:35 -08:00
Nick Winter	f5668a1f09	Merge pull request #2440 from nixel2007/master ... Update ru.coffee	2015-02-28 16:11:06 -08:00
Nick Winter	b79458d819	Merged es-419.coffee.	2015-02-28 16:09:49 -08:00
Nick Winter	6de70308aa	Merged ar.coffee.	2015-02-28 16:07:34 -08:00
Nick Winter	62b6191862	Merge pull request #2435 from Khoffee/patch-1 ... Update names.coffee	2015-02-28 16:05:58 -08:00
Nick Winter	62a21acdd0	Merge pull request #2432 from DotTry/patch-1 ... Added 13 names.	2015-02-28 16:03:41 -08:00
Nick Winter	5bbe330136	Propagated i18n.	2015-02-28 16:00:55 -08:00
Nick Winter	6789a8d6bc	Rearranging tip_open_source_contribute link.	2015-02-28 16:00:04 -08:00
Nick Winter	2f9de1a9b2	Merge pull request #2438 from kojoidrissa/master ... New Loading messages/Tips	2015-02-28 15:55:23 -08:00
DotTry	914817abe9	Updated Translation ... A couple of lines.	2015-02-28 17:00:43 -06:00
Coderaulic	0c056769bb	Update ja.coffee ... Translated all of About Page. Some minor fix and one off translations here and there.	2015-02-28 14:43:18 -08:00
nixel2007	8f1ef498b5	Update ru.coffee ... Fix spelling	2015-03-01 01:39:49 +03:00
Kojo Idrissa	93cc73b490	Merge remote-tracking branch 'upstream/master'	2015-02-28 16:08:12 -06:00
Kojo Idrissa	bad3b48af1	reverted "open_source_1" back to "open_source"; changed "open_source_2" to "open_source_contribute"	2015-02-28 15:47:43 -06:00
laituan245	7a19c616c3	Fixed issue #2430	2015-03-01 06:19:35 +09:00
Kojo Idrissa	5812f954f7	added new loading message/tip from prior commit to en-GB & en-US.coffee files	2015-02-28 15:09:12 -06:00
Kojo Idrissa	39f04f0f8b	added new load message to level_loading.jade and the English, Traditional Chinese and Simplified Chinese localization files	2015-02-28 15:03:40 -06:00
FedericoTomas	307556d0d1	Update es-419.coffee ... now its done, thanks.	2015-02-28 17:03:57 -03:00
Imperadeiro98	2bac9b5607	Merge pull request #2425 from nixel2007/master ... Update ru.coffee	2015-02-28 19:48:39 +00:00
Khoffee	b010a9b388	Update names.coffee ... Added more names for issue #53	2015-02-28 13:24:20 -06:00
Fahad Iqbal	ea31862e85	Adding a few names	2015-02-28 12:44:54 -06:00
DotTry	d135ba2513	Added 10 names.	2015-02-28 12:39:30 -06:00
FedericoTomas	8cc99adfd6	Update es-419.coffee ... Doing some work	2015-02-28 15:32:29 -03:00
Kojo Idrissa	d55e4fecba	Added multiple names	2015-02-28 11:58:20 -06:00
nixel2007	6902b7e246	Update ru.coffee	2015-02-28 18:48:36 +03:00
Nick Winter	44008be95f	Level Editor doesn't need to load your session or its hero config (or break doing so). Fixed adding unconfigured heroes to levels busting the level.	2015-02-27 21:37:55 -08:00
Matt Lott	86d167394e	Remove Segment analytics dependency ... Call Google Analytics, Errorception, and Inspectlet directly.	2015-02-27 16:07:41 -08:00
Imperadeiro98	f2f1359e3b	Update pt-PT.coffee	2015-02-27 22:54:51 +00:00
Nick Winter	6596912fa4	Propagated i18n.	2015-02-27 14:37:05 -08:00
Nick Winter	00245c69ec	Actually activated the previous fix.	2015-02-27 14:07:07 -08:00
Nick Winter	8df779b5a3	Fixed issue of level editor getting super low res when resizing the window when not looking at the ThangsTabView.	2015-02-27 13:49:26 -08:00
Nick Winter	473f9304fd	Merge pull request #2412 from h3yduck/navbar_issue ... Add "navigation bar" to user profile page (issue 2411)	2015-02-27 13:27:17 -08:00
Szabolcs Gelencser	b022a94cf1	Update hu.coffee	2015-02-27 21:51:42 +01:00
Michael Schmatz	d0d622445f	Fixed tracking for non production environments	2015-02-27 14:44:06 -05:00
Michael Schmatz	4efb73d8d7	Switch to new analytics server	2015-02-27 13:45:10 -05:00
Nick Winter	45d4b25c60	Fixed #1048 because I accidentally closed it and then didn't want to reopen it, so figured I might as well fix it as if I meant to do that the whole time.	2015-02-27 09:28:26 -08:00
Szabolcs Gelencser	58f2494c83	update campaign.schema.coffee also	2015-02-27 18:16:16 +01:00
Szabolcs Gelencser	dde3e8cf8f	Remove hardcoded treshold values, make it consistent through being able to change the treshold in campaign editor, if desired	2015-02-27 17:33:38 +01:00
Nick Winter	b4e9ee67f0	Added one-minute in-memory server caching for a bunch of common queries.	2015-02-26 17:20:27 -08:00
Nick Winter	9b34d4e166	Ooops, that was just for testing.	2015-02-26 16:04:57 -08:00
Szabolcs Gelencser	b138001205	for issue #2406	2015-02-26 23:42:37 +01:00
Nick Winter	e881aec7d7	Account button shouldn't show up for anonymous players.	2015-02-26 14:35:41 -08:00
Nick Winter	77bca72002	Added A/B test on whether Signs and Portents or Forgetful Gemsmith is the fourth level. Ran and completed some A/B tests. Turned level indicator in CampaignView white.	2015-02-26 14:24:00 -08:00
Szabolcs Gelencser	eb30daf07a	use nav.profile for i18n	2015-02-26 21:57:05 +01:00
Szabolcs Gelencser	a6ad04af53	Add navbar to profile	2015-02-26 12:19:32 -08:00
Nick Winter	32a95afbd0	Allowing reordering of levels in Campaign. Reversing CampaignEditor levels before save so that when the save magically reverses them again, the order is preserved.	2015-02-26 11:33:07 -08:00
Matt Lott	52bc660391	Add external subs script	2015-02-26 08:44:56 -08:00
Nick Winter	7d2c99acd7	Added attack/health/speed tooltip explanations on hero picker stat comparison bars.	2015-02-26 08:02:22 -08:00
Imperadeiro98	d4c64457b4	Update en.coffee	2015-02-26 14:49:33 +00:00
Imperadeiro98	6a6cd83252	Fixed i18n in about page	2015-02-26 14:48:58 +00:00
Imperadeiro98	ed2f498917	Added i18n to subscribe price	2015-02-26 14:41:40 +00:00
Nick Winter	df4b98a9bf	Added a new 'artisan' permission, which can edit most of the things admins can, but with less uncomfortable ultimate power.	2015-02-25 18:41:39 -08:00
Nick Winter	7e889a2a80	Simulating games for Harrowland, now, too. Alternative way of loading hero when sticking with same hero from within level when changing inventory.	2015-02-25 18:09:55 -08:00
Nick Winter	3be2b6406d	Admins are now automatically premium.	2015-02-25 17:45:01 -08:00
Nick Winter	c8c76e6b74	Trying to track down the cause of InventoryModal loading without a hero assigned.	2015-02-25 16:19:49 -08:00
Nick Winter	b6d8ceafb0	Updating team page and avatars.	2015-02-25 15:40:50 -08:00
Nick Winter	a2a78286da	Fixed #2407 by implementing styles for new subscribe-in-gem-shop design.	2015-02-25 14:24:32 -08:00
George Saines	9adb59f9ad	fixing the buy gems background	2015-02-25 14:21:32 -08:00
Nick Winter	714ff0a249	Merge pull request #2408 from laituan245/master ... Update hero-victory-modal.sass (Issue 1917)	2015-02-25 13:59:52 -08:00
laituan245	e73208f8e8	Update hero-victory-modal.sass	2015-02-26 06:03:17 +09:00
Nick Winter	15ca65f226	Further disabled employer portal for now.	2015-02-25 12:38:51 -08:00
Nick Winter	d58d151b8c	Got rid of debugging code that was making Hour of Code stuff always show up.	2015-02-25 12:32:59 -08:00
Nick Winter	a66e1c5389	Retoring next level highlight arrow for players who are very new when they click off a selected level.	2015-02-25 11:58:03 -08:00
Nick Winter	9be8c55d6f	Started some new Thang name categories for #53.	2015-02-25 11:50:43 -08:00
Nick Winter	13f9d71cca	You can now use bitcoin to buy gems.	2015-02-25 11:33:51 -08:00
Nick Winter	1ab8274c43	Added a clear storage button to the campaign editor.	2015-02-25 11:09:15 -08:00
angryelven-jdd	6654cfb410	Update de-DE.coffee ... translated subscription section	2015-02-25 16:05:06 +01:00
Nick Winter	1c14059d92	Better console logging for Vectors and shapes.	2015-02-24 18:21:33 -08:00
George Saines	88ebd5f46b	adding subscribe option to buy gems modal	2015-02-24 17:40:50 -08:00
Imperadeiro98	289ddb0a4f	Removed unneeded strong tag from last merge	2015-02-24 21:54:13 +00:00
Shady Kamal	431b9dca85	Update he.coffee	2015-02-24 23:42:47 +02:00
Nick Winter	be625cbfbe	Merge pull request #2403 from divyanshu013/master ... Bug fix for long hero button text in Russian for #1918	2015-02-24 12:56:55 -08:00
Imperadeiro98	c174cc35fa	Merge pull request #2401 from popey456963/master ... Update teacher.jade	2015-02-24 20:49:13 +00:00
Popey456963	e5c71d0c6a	Changed aimed to recommended	2015-02-24 20:46:49 +00:00
Popey456963	f79d90b81f	Changed requirement to recommended	2015-02-24 20:40:44 +00:00
divyanshu013	f2459f1b39	Bug fix for long hero button text in Russian for #1918	2015-02-25 02:08:08 +05:30
Popey456963	9419ec1d33	Update EN.coffee ... For new Teacher.jade	2015-02-24 20:17:04 +00:00
Nick Winter	9dd07b024e	Fixed item shop not loading items with later letters of the alphabet, since there are now so many items.	2015-02-24 12:15:35 -08:00
Popey456963	dabf5ce57d	Added minimum age	2015-02-24 20:13:13 +00:00
Nick Winter	1c691283c4	Merge pull request #2400 from laituan245/iss2388 ... Add Profile to account page (Issue #2388)	2015-02-24 11:57:19 -08:00
laituan245	23a9aa5e33	Changed the URL style	2015-02-25 04:53:20 +09:00
Imperadeiro98	49b6f4ff82	Merge pull request #2397 from divyanshu013/patch-1 ... Update hi.coffee	2015-02-24 19:52:09 +00:00
Nick Winter	592fd52699	Fixed ko.coffee inventory header.	2015-02-24 11:48:44 -08:00
Nick Winter	1e448abde2	Merged ko.coffee.	2015-02-24 11:47:33 -08:00
Divyanshu Maithani	17bdabcc7a	Update hi.coffee	2015-02-25 01:16:47 +05:30
Nick Winter	e48d996a60	Fixed #2286.	2015-02-24 11:45:50 -08:00
Popey456963	ff8e18146e	Edited Teacher.Jade ... Removed HoC references, Added Arrays and Expanded Acronym	2015-02-24 19:31:22 +00:00
Imperadeiro98	9f9e9cc639	Update pt-PT.coffee	2015-02-24 19:24:12 +00:00
Imperadeiro98	088d194755	Merge pull request #2396 from ITz7/patch-6 ... Update zh-HANT.coffee	2015-02-24 19:08:06 +00:00
Imperadeiro98	f42a2af8d7	Merge pull request #2395 from ITz7/patch-5 ... Update zh-HANS.coffee	2015-02-24 19:07:21 +00:00
laituan245	a78f864607	Add Profile to account page (Issue #2388)	2015-02-25 04:03:46 +09:00
Nick Winter	4cbbcdad6d	Merge pull request #2359 from laituan245/master ... Added ability to delete account	2015-02-24 09:30:22 -08:00
laituan245	a588a3b2c8	Some updates to the PR #2359	2015-02-25 02:12:39 +09:00
laituan245	eb53381083	Don't delete the User object, just remove all the properties except for _id	2015-02-24 22:36:12 +09:00
Aman Kumar	0df2dea469	Issue #2387: Accounts setting toggle all fix	2015-02-24 17:25:18 +05:30
Divyanshu Maithani	335e1d96e8	Update hi.coffee	2015-02-24 02:48:20 -08:00
ITz7	5d6b2a890c	Update zh-HANT.coffee ... wondered why Herotype isnt translated o.o	2015-02-24 14:41:18 +08:00
ITz7	a326361e42	Update zh-HANS.coffee ... Many Minor Updates + FInalization :D	2015-02-24 14:36:46 +08:00
Nick Winter	c43ddda235	Reduced number of events being sent by cutting out simulator results.	2015-02-23 16:56:16 -08:00
Nick Winter	34a92838a5	Propagated i18n.	2015-02-23 16:01:06 -08:00
Nick Winter	69959caba5	Using common.play instead of home.play for a more-common use of it.	2015-02-23 15:59:42 -08:00
Nick Winter	88c55fa7fd	Fix for making ja start game text break lines in the right places. #2386	2015-02-23 15:57:43 -08:00
Nick Winter	4d35c2cefc	Merged.	2015-02-23 15:05:54 -08:00
Nick Winter	0f6404fea1	Being a tiny bit more idiomatic about CoffeeScript ranges.	2015-02-23 15:03:48 -08:00
Nick Winter	6d9e7a76ce	Merge pull request #2389 from amankr/bug/duplicates ... Issue #2267: Removed duplicates from TreemaData	2015-02-23 15:02:20 -08:00
Nick Winter	fb10de5023	Merge pull request #2376 from amankr/login ... Issue #2082: Campaign editor login fixed	2015-02-23 14:54:15 -08:00
Nick Winter	1513e20486	Merge pull request #2370 from amankr/newfeature ... Issue #1785: Empty level editor folders removed	2015-02-23 14:53:08 -08:00
Nick Winter	1314695382	Merge pull request #2385 from nixel2007/master ... Update diplomat.jade	2015-02-23 14:50:04 -08:00
Nick Winter	61831e83c2	Merge pull request #2368 from rmarren1/master ... Slight cleanup to level indicator code	2015-02-23 14:49:13 -08:00
Aman Kumar	d8a4803268	Issue #2267: Removed duplicates from TreemaData	2015-02-24 03:18:35 +05:30
Coderaulic	21ddb9ca59	Update ja.coffee ... Some minor fixes added based on last changes. Can you tell me how to add a line break? Is it " text \ text " for: text text as output? Or "ABC '\' DEF" for: ABC DEF Not familiar with line breaks in coffee script.	2015-02-23 12:24:00 -08:00
Imperadeiro98	6afad49d8f	Some fixes to last merge	2015-02-23 20:21:10 +00:00
Imperadeiro98	c375a8ed12	Merge pull request #2384 from etem/master ... Update bg.coffee	2015-02-23 20:16:08 +00:00
Imperadeiro98	aad40bbe33	Merge pull request #2383 from musicogeek/patch-1 ... Update es-419.coffee	2015-02-23 20:12:01 +00:00
Imperadeiro98	7ea804458c	Merge pull request #2382 from ITz7/patch-3 ... Update zh-HANT.coffee	2015-02-23 19:59:01 +00:00
Imperadeiro98	0d0dc5597d	Merge pull request #2380 from ITz7/patch-2 ... Update zh-HANS.coffee	2015-02-23 19:57:54 +00:00
Imperadeiro98	9acea40089	Uncommented an header for last commit	2015-02-23 19:52:22 +00:00
Imperadeiro98	f392ffcb71	Merge pull request #2362 from leotada/patch-1 ... Translation PT-BR	2015-02-23 19:51:21 +00:00
nixel2007	a3afec0989	Update diplomat.jade ... Fix >100% of translation.	2015-02-23 21:18:00 +03:00
Etem Hyusnev	7d7b77e753	Updated translation	2015-02-23 20:15:01 +02:00
Etem Hyusnev	3baf791e77	Updated translation	2015-02-23 19:00:09 +02:00
Etem Hyusnev	68b46778ad	Updated translation	2015-02-23 18:01:32 +02:00
Orlando Hernández	887936fd79	Update es-419.coffee	2015-02-23 11:29:19 -04:30
ITz7	56feac3f5f	Update zh-HANS.coffee	2015-02-23 23:47:37 +08:00
ITz7	2c301df0ba	Update zh-HANS.coffee	2015-02-23 22:36:58 +08:00
ITz7	8c64a69012	Update zh-HANT.coffee	2015-02-23 21:39:14 +08:00
ITz7	faa5b43902	Update zh-HANS.coffee	2015-02-23 19:58:38 +08:00
Etem Hyusnev	9280444f57	Updated translation	2015-02-23 09:11:23 +02:00
coder0xff	55e43c247f	Update ellipse.coffee ... Copy/pasted wrong version of containsPoint!	2015-02-23 01:14:21 -05:00
coder0xff	9a85db4a91	Update ellipse.coffee ... An improved (and untested) implementation for containsPoint	2015-02-23 01:09:39 -05:00
Nick Winter	63b24b9bf1	Properly showing the back of wizards' robes.	2015-02-22 21:50:56 -08:00
Etem Hyusnev	ce074921b4	Updated translation	2015-02-22 22:29:04 +02:00
divyanshu013	5ad23fc354	Fix for Campaign editor login not working for #2082 ... Overiding the login and signup listener clicks in CampaignEditorView so that the child can call them.	2015-02-23 01:34:33 +05:30
divyanshu013	dc953431ec	Fix for long names in leader board for #2373 ... Reduced the max-width component to fit ellipsis properly.	2015-02-23 01:03:35 +05:30
Nick Winter	7d7db5dafe	Thang Editor can now drag Thangs to adjust registration points. Fixed missing terrain save property on ThangTypes. Fixed text search test. Added new Talus (mountain floors) to floor ThangType list for proper stretching.	2015-02-22 11:07:56 -08:00
Imperadeiro98	2e25beccd4	Uncommented some translations from last merge	2015-02-22 16:10:20 +00:00
Imperadeiro98	da4a160f54	Merge pull request #2377 from etem/master ... Updated Bulgarian translation	2015-02-22 16:04:27 +00:00
Matt Lott	7e46b819c4	Stripe API version update fixes ... Using customer sources instead of cards so we can update our API version: https://stripe.com/docs/upgrades?since=2014-11-05#api-changelog	2015-02-22 07:54:36 -08:00
Etem Hyusnev	3179546430	Updated Bulgarian translation	2015-02-22 17:43:44 +02:00
Aman Kumar	7f442a32a3	Issue #2082: Campaign editor login fixed	2015-02-22 20:26:13 +05:30
Coderaulic	8915f0a98e	Update ja.coffee ... Various translations added and some minor fixes.	2015-02-21 23:49:48 -08:00
Aman Kumar	436594555c	Issue #1785: Empty level editor folders removed	2015-02-22 05:11:02 +05:30
Ryan Marren	b16c44da63	Merge remote-tracking branch 'upstream/master'	2015-02-21 17:31:30 -05:00
Ryan Marren	320e8c401a	level indicator code cleanup	2015-02-21 17:30:32 -05:00
Nick Winter	40ff7d4116	Harmonized enter shortcut for PlayHeroesModal.	2015-02-21 14:22:51 -08:00
Matt Lott	ecd9abc3b6	Merge pull request #2366 from rmarren1/master ... Clarified level indicator for #2351 Fixes #2351	2015-02-21 11:41:35 -08:00
Ryan Marren	f850409dbe	made "level" display in other languages	2015-02-21 14:29:40 -05:00
Nick Winter	e3d13f6dd0	Merge pull request #2363 from ChaosCat/patch-1 ... Update he.coffee	2015-02-21 09:21:41 -08:00
Ryan Marren	a7dadc34aa	Added level indicator	2015-02-20 23:50:42 -05:00
Nick Winter	0e135ac07f	Fixed blank language selector row.	2015-02-20 15:20:44 -08:00
Shady Kamal	f32572e94c	Update he.coffee ... +Another update for "he.coffe" file	2015-02-20 20:38:30 +02:00
Leonardo	de7f216d22	translation ... translation.	2015-02-20 15:35:37 -02:00
enricpc	e113c7accb	Update ca.coffee	2015-02-20 08:51:29 +01:00
Nick Winter	ab252adf90	Better detection and error handling of unsupported WebGL context creation failures.	2015-02-19 19:57:10 -08:00
laituan245	d325623699	Added ability to delete account	2015-02-20 08:19:30 +09:00
sohalya	a3ce088657	Update fr.coffee ... Some translations and french grammar corrections.	2015-02-19 17:21:46 +01:00
Shady	928748ff5f	Update he.coffee ... a minor update for he.coffee	2015-02-19 14:16:23 +02:00
Nick Winter	8355ba5a6d	Replayable level awards now count up from where they were last time instead of from 0.	2015-02-18 18:01:22 -08:00
Nick Winter	f2a5c4bc5a	Merge pull request #2353 from amankr/sound ... Volume bug fix #2202	2015-02-18 13:36:59 -08:00
Nick Winter	a81663f06a	CampaignView shouldn't use localStorage backups unless it's in editor mode.	2015-02-18 13:35:47 -08:00
Imperadeiro98	227a8edffa	Merge pull request #2350 from vampirelower/patch-2 ... Update uk.coffee	2015-02-18 20:45:49 +00:00
Aman Kumar	e4a3890f39	fixed volume bug #2202	2015-02-19 02:05:41 +05:30
Aman Kumar	a74c2a58e2	fixed volume bug #2202	2015-02-19 01:58:24 +05:30
Shady	a7bff7a011	Update he.coffee - 2 ... second update done	2015-02-18 22:16:12 +02:00
Edward Litvinchyck	ff4487d79f	Update uk.coffee	2015-02-18 21:10:33 +02:00
Nick Winter	178082d4e8	Fixed bug with dragging an item to unequip it not updating rest of state.	2015-02-18 09:57:03 -08:00
Imperadeiro98	0a332073e9	Merge pull request #2347 from divyanshu013/patch-1 ... Update hi.coffee	2015-02-18 17:35:37 +00:00
Imperadeiro98	35284a3d18	Uncommented some translations from last commit	2015-02-18 17:35:15 +00:00
Imperadeiro98	8b0a9a5c68	Merge pull request #2346 from ChaosCat/patch-2 ... Update he.coffee	2015-02-18 17:32:12 +00:00
Imperadeiro98	639da031fc	Uncommented an header for last commit	2015-02-18 17:31:15 +00:00
Imperadeiro98	04daa08a97	Merge pull request #2345 from wakeup/patch-2 ... Update tr.coffee	2015-02-18 17:28:46 +00:00
Nick Winter	1795891933	Added new pow function for simulated ladder games achievement.	2015-02-18 09:06:32 -08:00
Nick Winter	1a44b3ff5a	Merge pull request #2344 from laituan245/master ... Fix issue #1832 (Equipping with little equip button doesn't update big equip button)	2015-02-18 08:58:36 -08:00
Divyanshu Maithani	e55d3251bc	Update hi.coffee	2015-02-18 21:26:36 +05:30
ChaosCat	0b1b28ff8e	Update he.coffee ... some updates to he.coffee	2015-02-18 17:33:19 +02:00
Volkan Gezer	375a61fcc6	Update tr.coffee	2015-02-18 16:13:35 +01:00
Imperadeiro98	055922a967	Some fixes to last merge	2015-02-18 12:06:38 +00:00
Imperadeiro98	30f451985d	Merge pull request #2340 from ChaosCat/patch-1 ... Fixed errors and added more translations to he.coffee	2015-02-18 12:05:24 +00:00
Imperadeiro98	993ca19da2	Removed blank line from names.coffee	2015-02-18 12:02:17 +00:00
laituan245	0cf16e157c	Fix issue #1832	2015-02-18 16:12:19 +09:00
Nick Winter	5bc99d7c0d	Merge pull request #2338 from Raxerz/patch-1 ... Added more ninja names for #53	2015-02-17 15:28:14 -08:00
Nick Winter	dc703c40b0	Merge pull request #2336 from divyanshu013/master ... Added some Hindi localizations for hi.coffee	2015-02-17 15:26:41 -08:00
Imperadeiro98	ef8f3cff1a	Couple fixes to pt-PT	2015-02-17 22:33:14 +00:00
ChaosCat	589ab03438	תיקון שגיאות והוספת מידע ... חלק מהתרגומום שונו לנוסח רשמי\ברור יותר נא לתקן במידת הצורך	2015-02-17 23:37:20 +02:00
Imperadeiro98	697e5a0ab3	Uncommented an header for last commit	2015-02-17 20:09:47 +00:00
Imperadeiro98	59aa6e257a	Merge pull request #2337 from laituan245/master ... Update ko.coffee	2015-02-17 20:09:12 +00:00
Nick Winter	f308379453	Fixed typo in LevelSession busting readyToRank check.	2015-02-17 11:51:52 -08:00
divyanshu013	d8716ed40b	Added CodeCombat navigation from /play to / for #2044	2015-02-17 23:49:34 +05:30
Nick Winter	7d582b5cfa	Better targeting of multiplayer sessions for user profile completed levels view.	2015-02-17 09:49:56 -08:00
Nick Winter	ae07a25657	Fixed #2329: ordered spoken languages first by popularity (for top 8), then by alphabetical.	2015-02-17 09:29:21 -08:00
Rajath	31c6d9069b	Added more ninja names for #53 ... Added 'Itachi', 'Madara' and 'Obito' to the set of ninja names.	2015-02-17 21:52:20 +05:30
Tuan Manh Lai	e09d6fd709	Update ko.coffee	2015-02-17 22:07:13 +09:00
Tuan Manh Lai	b1e280ccd3	Update ko.coffee	2015-02-17 21:44:41 +09:00
Imperadeiro98	5c91c7a237	Merge pull request #2334 from Kyezil/patch-1 ... Update ca.coffee	2015-02-17 11:00:27 +00:00
Tuan Manh Lai	f99239c11a	Update ko.coffee	2015-02-17 15:36:51 +09:00
divyanshu013	82b3221e0d	Added some Hindi localizations	2015-02-17 11:28:38 +05:30
Nick Winter	141e11f918	Merge branch 'master' of git://github.com/rmarren1/codecombat into rmarren1-master	2015-02-16 17:13:24 -08:00
Louis Clergue	7f128f6773	Update ca.coffee	2015-02-17 00:26:58 +01:00
Imperadeiro98	158560f42d	Merge pull request #2331 from vampirelower/patch-1 ... Update uk.coffee	2015-02-16 23:20:02 +00:00
Imperadeiro98	3f9169a18f	Uncommented an header	2015-02-16 23:18:23 +00:00
ptsoumaki	ef5363c1cb	Update el.coffee	2015-02-17 00:21:38 +02:00
Ryan Marren	b2d881807a	Merge branch 'master' of https://github.com/rmarren1/codecombat	2015-02-16 17:12:38 -05:00
Ryan Marren	1a60b004a7	added achievement editor for #2304	2015-02-16 17:12:05 -05:00
Edward Litvinchyck	8ffe11fd05	Update uk.coffee	2015-02-17 00:10:58 +02:00
divyanshu013	036b72ca19	Font size tweak for #2324 ... Also reduced the size for tbody data to fit properly	2015-02-17 00:44:08 +05:30
Nick Winter	de11743df9	Merge pull request #2326 from laituan245/master ... Add type (warrior/ranger/wizard) to hero selector modal (Issue #2307)	2015-02-16 10:29:26 -08:00
Nick Winter	5645f7779b	Changed isMultiplayer check to fix #2325.	2015-02-16 10:24:00 -08:00
Imperadeiro98	a73ccbc037	Changed language specific style in home.sass ... So that it only affects pt-BR instead of pt-PT.	2015-02-16 18:23:42 +00:00
Nick Winter	83c25efa40	Merge pull request #2317 from rmarren1/master ... added famous computer scientist names for #53	2015-02-16 09:33:49 -08:00
Nick Winter	c0f738d736	Fixed bug with Campaign i18n not showing fullNames properly.	2015-02-16 09:21:59 -08:00
laituan245	dfaa29c596	Add type (warrior/ranger/wizard) to hero selector modal (Issue #2307)	2015-02-17 00:50:01 +09:00
Imperadeiro98	f0619e08f3	Merge pull request #2323 from ZeAntwan/patch-2 ... FR Translations and corrections	2015-02-16 13:49:41 +00:00
Imperadeiro98	d575bb2992	Small spacing fix	2015-02-16 13:33:44 +00:00
ZeAntwan	1d332f2afe	FR Translations and corrections ... Categories Translated : - contact - classes Corrections : (Note aux français) : Il faut différencier les "Subscribe" des "Sign Up". Subscribe équivaut à l'abonnement payant ! - legal > page-title ATTENTION : - (417) parent_button : The translation is out of box, text size need to be reduced to around 21px to fit.	2015-02-16 14:15:17 +01:00
Imperadeiro98	b29bb787d8	Merge pull request #2320 from laituan245/laituan245-patch-1 ... Update vi.coffee	2015-02-16 11:48:58 +00:00
Imperadeiro98	6ff6d11323	Merge pull request #2322 from ZeAntwan/patch-1 ... Update fr.coffee	2015-02-16 11:46:28 +00:00
ZeAntwan	91313a0015	Update fr.coffee ... Translated following strings : share_progress_modal (309) tip_reticulating (326) tip_superpower (329) tip_code_never_lies (335) : tip_move_forward (337) : tip_adding_evil (Traduction approximative de "evil" vers "mechanceté") subscribe (lots of things) Correction 427 (ecriVant pas ecriSant)	2015-02-16 03:47:57 +01:00
Tuan Manh Lai	6377484db5	Update vi.coffee	2015-02-16 01:38:58 +09:00
Tuan Manh Lai	f01b0d1b9a	Update vi.coffee	2015-02-15 05:41:06 +09:00
Tuan Manh Lai	5421c4ec46	Update vi.coffee	2015-02-15 05:35:57 +09:00
Tuan Manh Lai	377d8a768d	Update vi.coffee	2015-02-15 05:21:31 +09:00
Ryan Marren	0a961b03c5	added famous computer scientist names for #53	2015-02-14 11:07:24 -05:00
Barney	dd40a07fc0	Update zh-HANT.coffee	2015-02-14 21:22:02 +08:00
Barney	00242f5767	Merge remote-tracking branch 'upstream/master'	2015-02-14 16:03:22 +08:00
Nick Winter	7f2e5c4404	Achievements list now shows proper amount of gems and exp for repeatable achievements.	2015-02-13 18:55:23 -08:00
Nick Winter	c29bb432e1	Merge pull request #2314 from laituan245/master ... A small fix to the PR #2313	2015-02-13 13:46:45 -08:00
Matt Lott	81678e81d9	Merge pull request #2315 from amankr/autocomplete2 ... Autocomplete bug fix #2233 - method 2 Thanks @amankr!	2015-02-13 13:12:22 -08:00
Aman Kumar	85a024546b	Autocomplete bug fix #2233	2015-02-14 02:21:54 +05:30
Aman Kumar	224213ccb0	Autocomplete bug fix #2233	2015-02-14 02:11:00 +05:30
Imperadeiro98	8b978c0047	Removed unused string	2015-02-13 20:39:03 +00:00
laituan245	93bbedd02d	A small fix to the PR #2313	2015-02-14 05:27:58 +09:00
Aman Kumar	80fb124772	Autocomplete bug fix #2233	2015-02-14 01:56:05 +05:30
Barney	140ba5f9e0	Update zh-HANT.coffee	2015-02-14 03:57:09 +08:00
Barney	248d6dd1ef	Merge remote-tracking branch 'upstream/master'	2015-02-14 03:53:47 +08:00
Barney	dde3546564	Update zh-HANT.coffee	2015-02-14 03:53:44 +08:00
Scott Erickson	52e5dc4719	Removed another instance of the old scope, for #2067.	2015-02-13 11:24:06 -08:00
Scott Erickson	9b86e5872f	Fixed #2067	2015-02-13 11:18:00 -08:00
Barney	e6008f2a5c	Merge remote-tracking branch 'upstream/master'	2015-02-14 02:46:11 +08:00
Nick Winter	574f0b1442	Fixed #2303. Sorry, TBL.	2015-02-13 09:29:18 -08:00
Nick Winter	a9fddb8eb2	Propagated i18n.	2015-02-13 09:13:24 -08:00
Nick Winter	4fec64c3ca	Merge pull request #2313 from laituan245/master ... Added a "god mode" button to the local dev environment (issue #2164)	2015-02-13 09:08:09 -08:00
Nick Winter	937bbf211c	Thang Editor now centers unit better, lists action names in a more useful order.	2015-02-13 09:03:22 -08:00
laituan245	9c754bbd96	Added a "god mode" button to the local dev environment #2164	2015-02-14 01:46:04 +09:00
Barney	ae2d52d31a	Merge remote-tracking branch 'upstream/master'	2015-02-13 23:50:25 +08:00
Barney	6f88af50f9	Update zh-HANT.coffee	2015-02-13 23:50:12 +08:00
Gutierri Barboza	74babe01ea	more translations pt-br	2015-02-13 13:22:48 -02:00
Imperadeiro98	9ddbf1a102	Fixed i18n in buy-gems-modal.jade	2015-02-13 14:54:19 +00:00
Imperadeiro98	c54cd428ad	Removed unused strings	2015-02-13 14:54:04 +00:00
Imperadeiro98	2785d3fa2b	Fixed indentation issue in last merge	2015-02-13 14:40:36 +00:00
Imperadeiro98	6bd56e040c	Merge pull request #2310 from jimmysvk/patch-3 ... Around hundred new lines of Slovak translation	2015-02-13 14:38:08 +00:00
Imperadeiro98	306c76d41d	Merge pull request #2308 from ArthurLu/master ... Update zh-HANT.coffee	2015-02-13 14:35:54 +00:00
Nick Winter	5cf37d1796	A few tweaks to visuals on PlayHeroesModal hero previews.	2015-02-13 04:09:40 -08:00
jimmysvk	6574a4b978	Around hundred new lines of Slovak translation ... Completed translations of home, nav, diplomat_suggestion, play, common, general, almost whole play_level, buy_gems, skill_docs, versions	2015-02-13 10:19:13 +01:00
Barney	6917ebc110	Update zh-HANT.coffee	2015-02-13 13:02:47 +08:00
Barney	295ecf53c2	Merge remote-tracking branch 'upstream/master'	2015-02-13 12:34:37 +08:00
Nick Winter	991a374da2	Fixed up SpectateView for hero ladder games. Addd player names to their heroes in spectate and observation mode. Fixed #1679.	2015-02-12 19:47:57 -08:00
Nick Winter	a8dc353f86	Aether now loading all code languages possibly used in a match before the level can begin. Hopefully, this will fix #1943 and fix #1892.	2015-02-12 18:40:38 -08:00
Nick Winter	7000048bee	Fixed a few more issues with the headless simulator.	2015-02-12 17:07:29 -08:00
Nick Winter	1aa738b256	Fixed up headless client, I hope.	2015-02-12 16:07:19 -08:00
Matt Lott	c4f46faf25	🐛Fix leaderboard level popup stacked buttons ... CSS initial keyword isn’t supported in IE. Fixes #2301	2015-02-12 14:19:19 -08:00
Matt Lott	d937feb3de	🐛Fix share progress title wrap on IE11 ... Fixes #2301	2015-02-12 13:38:55 -08:00
Nick Winter	e01e71d5e8	Fixed #2181, I hope.	2015-02-12 11:59:38 -08:00
Nick Winter	6b9d8161ef	Found another place missing cache: false.	2015-02-12 11:17:23 -08:00
Nick Winter	8936d5fa40	Simulator version 2 takes into account flag history when simulating matches.	2015-02-12 10:59:34 -08:00
Imperadeiro98	1f20402bb0	Update pt-PT.coffee	2015-02-12 18:31:01 +00:00
Barney	df0a588870	Update zh-HANT.coffee	2015-02-13 02:21:52 +08:00
Imperadeiro98	42a4ca9299	Uncommented some headers	2015-02-12 17:25:31 +00:00
jimmysvk	03800e4360	Update of SVK translation ... Translated achievments, user, article, save_load, inventory, game_menu, some of play_level, some of general, rest of login, rest of nav	2015-02-12 18:17:03 +01:00
Imperadeiro98	cf5aa3bc25	Uncommented some headers	2015-02-12 17:02:13 +00:00
Imperadeiro98	ff183b683d	Merge pull request #2299 from jimmysvk/patch-1 ... Some lines of SVK translation updated	2015-02-12 17:00:37 +00:00
Nick Winter	a2a4303a83	Fixed #2109. Much less fragile naming of opponents on My Matches tab.	2015-02-12 08:50:55 -08:00
jimmysvk	892ea201eb	Some lines of SVK translation updated ... Just for the begining. Looking forward to complete translation ; )	2015-02-12 16:54:06 +01:00
Imperadeiro98	3188ba15b8	Merge pull request #2297 from laituan245/laituan245-patch-1 ... Update vi.coffee	2015-02-12 14:22:00 +00:00
Imperadeiro98	838363fd63	Uncommented an header	2015-02-12 14:20:13 +00:00
Tuan Manh Lai	cf9da099a5	Update vi.coffee	2015-02-12 17:17:19 +07:00
Tuan Manh Lai	f0ca5d1a5b	Update vi.coffee	2015-02-12 17:05:41 +07:00
Melondonut	4f3ae1b73d	Update ko.coffee	2015-02-12 16:26:24 +09:00
Barney	b63bbf870b	Update zh-HANT.coffee	2015-02-12 13:15:22 +08:00
Nick Winter	63fa2f86d4	Tracking who is simulating matches so we can see patterns in ill-reported matches. Rejecting simulations from simulators with old versions of the Simulator code.	2015-02-11 20:24:12 -08:00
Nick Winter	2efb6aafbc	Fixed #1632.	2015-02-11 16:12:26 -08:00
Nick Winter	5ee6eaf8b4	Fixed audio upload nodes to work in Firefox. Fixed #445.	2015-02-11 15:52:15 -08:00
Nick Winter	3bdede3587	Fixed #141.	2015-02-11 15:13:38 -08:00
Nick Winter	53621f0d5d	Merge pull request #2294 from mogsie/i18n-norwegian ... i18n norwegian	2015-02-11 14:10:07 -08:00
Nick Winter	85ad3f5960	Fixed #2293.	2015-02-11 14:09:00 -08:00
Erik Mogensen (@mogsie)	fc46075b35	Merge remote-tracking branch 'upstream/master' into i18n-norwegian	2015-02-11 23:03:20 +01:00
Erik Mogensen (@mogsie)	102bb50870	i18n/nb: wording, punctuation.	2015-02-11 23:02:59 +01:00
Nick Winter	2a9bb0292d	Don't dispatch simulations to old ladders, just new hero-ladder levels. Fixed typo in last cache commit.	2015-02-11 14:01:38 -08:00
Erik Mogensen (@mogsie)	71ff84538e	i18n/nb: capitalization, wording.	2015-02-11 22:17:33 +01:00
Nick Winter	d09636306c	Toggling all plausibly-buggy AJAX requests to cache: false for better IE behavior. Look out for bugs!	2015-02-11 13:12:54 -08:00
Tuan Manh Lai	01f5ff9d1a	Update vi.coffee	2015-02-12 05:49:09 +09:00
Erik Mogensen (@mogsie)	8029ce22f0	i18n/nb: Teacher page grammar, typos, wording.	2015-02-11 21:15:30 +01:00
Erik Mogensen (@mogsie)	5dc4d52c27	Merge remote-tracking branch 'upstream/master'	2015-02-11 20:54:31 +01:00
Erik Mogensen (@mogsie)	762eaca9dc	i18n: nb, grammar	2015-02-11 20:53:22 +01:00
nixel2007	f06ed33129	Update ru.coffee. fix comma	2015-02-11 22:45:56 +03:00
nixel2007	a54a9d6016	Update ru.coffee ... Translated new blocks and small fixes with You/you	2015-02-11 22:42:46 +03:00
Imperadeiro98	9ead6600b0	Enabling translations	2015-02-11 18:58:17 +00:00
Imperadeiro98	c84d744d82	Merge pull request #2290 from laituan245/master ... Update vi.coffee	2015-02-11 18:55:06 +00:00
Tuan Manh Lai	5e793cbbe5	Update vi.coffee	2015-02-12 01:49:08 +07:00
Tuan Manh Lai	3c67cba78e	Update vi.coffee	2015-02-12 01:46:03 +07:00
Matt Lott	af343bfd82	🐛Fix share progress modal i18n	2015-02-11 10:15:03 -08:00
Nick Winter	6ff39ba48a	Not showing particles in IE.	2015-02-11 09:34:27 -08:00
Imperadeiro98	10e0cf50ed	Enabled some translations	2015-02-11 17:02:36 +00:00
Imperadeiro98	9f6bf3a8d2	Merge pull request #2288 from laituan245/master ... Update vi.coffee	2015-02-11 17:01:21 +00:00
Barney	0341f50ad8	Update zh-HANT.coffee	2015-02-11 20:51:19 +08:00
Tuan Manh Lai	bacf86201a	Update ko.coffee	2015-02-11 17:11:18 +09:00
Tuan Manh Lai	405f5921c4	Update vi.coffee ... Translated some words and sentences into Vietnamese	2015-02-11 16:50:48 +09:00
Barney	bc369b94a4	Update zh-HANT.coffee	2015-02-11 15:20:40 +08:00
Barney	d1bd7b3803	Update zh-HANT.coffee	2015-02-11 14:00:02 +08:00
Melondonut	f1859a7341	Update ko.coffee	2015-02-11 13:41:20 +09:00
Melondonut	217590b930	Update ko.coffee	2015-02-11 12:16:17 +09:00
Melondonut	381c2af331	Update ko.coffee	2015-02-11 12:06:48 +09:00
Imperadeiro98	c35b925cb1	Update pt-PT.coffee	2015-02-10 22:32:52 +00:00
Matt Lott	9bda187f90	Add terrain to loaded world map event	2015-02-10 14:20:18 -08:00
Nick Winter	76f03790fd	Propagated i18n.	2015-02-10 14:14:14 -08:00
Nick Winter	413edb3b4c	Deleted no.coffee in favor of nb.coffee and nn.coffee as discussed in #2284.	2015-02-10 14:13:15 -08:00
Erik Mogensen (@mogsie)	36d5f132cc	Norwegian translation: Some typos and punctuation.	2015-02-10 22:44:12 +01:00
Erik Mogensen (@mogsie)	ab8346c6b2	Better tanslation from @matifol.	2015-02-10 22:31:02 +01:00
Erik Mogensen (@mogsie)	427aea9457	Fix speling.	2015-02-10 22:29:14 +01:00
Popey456963	da64bea348	Revert "Remove Hour of Code References from teachers.jade" ... This reverts commit b30c0d059a.	2015-02-10 21:14:34 +00:00
Popey456963	b30c0d059a	Remove Hour of Code References from teachers.jade	2015-02-10 21:13:06 +00:00
Nick Winter	b03d6fb3d4	Merged nb.coffee.	2015-02-10 12:54:25 -08:00
Nick Winter	a610bac948	Merge pull request #2261 from mogsie/master ... More norwegian translations.	2015-02-10 12:50:18 -08:00
Nick Winter	106ba5acda	Fixed #2280.	2015-02-10 12:49:28 -08:00
Nick Winter	afe94afd08	Merge pull request #2278 from laituan245/master ... Added more names for #53	2015-02-10 12:47:11 -08:00
Nick Winter	86fa8dd59d	Merge pull request #2281 from divyanshu013/master ... Fixed the issue with the Leaderboard view to fit properly for #2254	2015-02-10 12:45:54 -08:00
Erik Mogensen (@mogsie)	62baa53ec0	Fix missing "	2015-02-10 21:45:17 +01:00
Nick Winter	00c8c9016c	Merge pull request #2277 from AnirudhGP/patch-3 ... Added some quotes for #710	2015-02-10 12:43:57 -08:00
Nick Winter	4c716eb12a	Merge pull request #2276 from AnirudhGP/patch-2 ... Added some quotes for #710	2015-02-10 12:43:44 -08:00
Nick Winter	3a80fffa15	Merge pull request #2275 from AnirudhGP/patch-1 ... Added more names for #53	2015-02-10 12:43:04 -08:00
Martin Folkeseth	1fb2771d24	Edited nb.coffee	2015-02-10 21:39:04 +01:00
Imperadeiro98	c37398b2c1	Small fix to last merge	2015-02-10 19:57:34 +00:00
Nick Winter	db2b0c29fe	Merginated.	2015-02-10 11:54:57 -08:00
Barney	201ef800bc	Merge remote-tracking branch 'upstream/master'	2015-02-11 03:38:47 +08:00
Barney	31c5ce30cd	Update zh-HANT.coffee	2015-02-11 03:38:43 +08:00
Imperadeiro98	92b8e2354e	Small fix to last merge	2015-02-10 19:27:27 +00:00
Imperadeiro98	94cfe2011c	Merge pull request #2282 from matifol/patch-1 ... Translated share_progress_modal	2015-02-10 19:25:56 +00:00
Imperadeiro98	d8eea3923f	Small fix to last commit	2015-02-10 19:09:11 +00:00
Imperadeiro98	92b80b591d	Merge pull request #2283 from ArthurLu/master ... Update zh-HANT.coffee	2015-02-10 19:07:26 +00:00
Imperadeiro98	8264048f31	Merge pull request #2271 from jhoon/translations-es-419 ... Translating share_progress_modal section	2015-02-10 18:58:32 +00:00
Barney	2e4c261ada	Update zh-HANT.coffee	2015-02-11 02:27:54 +08:00
Martin Folkeseth	28f6c5dc38	Translated share_progress_modal ... Kept all the old strings for future reference.	2015-02-10 19:06:51 +01:00
divyanshu013	2b090a9841	Fixed the issue with the Leaderboard view to fit properly for #2254 ... The leaderboard view fits properly while scrolling down.	2015-02-10 23:27:23 +05:30
Barney	2546082eaf	Update zh-HANT.coffee	2015-02-11 01:02:37 +08:00
laituan245	70ec7996c2	Added more names for #53	2015-02-10 23:26:02 +09:00
Anirudh GP	b422508f2d	Added some quotes for #710	2015-02-10 14:41:04 +05:30
Anirudh GP	ada239b50d	Added some quotes for #710	2015-02-10 14:41:03 +05:30
Anirudh GP	9184588969	Added more names for #53	2015-02-10 14:32:02 +05:30
Barney	6b8e9ad808	Update zh-HANT.coffee	2015-02-10 14:04:43 +08:00
Barney	60ff41ccf4	Merge remote-tracking branch 'upstream/master'	2015-02-10 13:12:11 +08:00
Barney	16708aacc8	Update zh-HANT.coffee	2015-02-10 13:12:09 +08:00
FedericoTomas	fa5134d09b	Actualizando(Update) ... Actualice un poco.	2015-02-10 01:18:25 -03:00
Jhoon Saravia	f2534e2098	Translating leaderboard section and some tips	2015-02-09 18:22:52 -05:00
Jhoon Saravia	c9c8c3e755	Translating share_progress_modal	2015-02-09 18:08:59 -05:00
Matt Lott	c4620a7b2d	Refactor analytics event logging ... Clean up property slimming. Save explicit identity traits in properties.	2015-02-09 15:03:04 -08:00
Martin005	44fb8281bf	Update cs.coffee ... Finally done all translations :)	2015-02-09 23:22:04 +01:00
Nick Winter	abbab26d80	Using i18n for achievement descriptions in HeroVictoryModal.	2015-02-09 13:06:00 -08:00
Imperadeiro98	92531e366b	Update en.coffee	2015-02-09 20:01:51 +00:00
Imperadeiro98	8718cd280f	Added i18n	2015-02-09 20:00:52 +00:00
Imperadeiro98	f062f446d3	Fixed i18n	2015-02-09 19:57:28 +00:00
Imperadeiro98	bebada7f43	Update pt-PT.coffee	2015-02-09 19:50:18 +00:00
Imperadeiro98	8fb8e139b7	Small indentation fix	2015-02-09 19:47:09 +00:00
Nick Winter	19a9d8c9aa	Propagated i18n.	2015-02-09 11:31:42 -08:00
Nick Winter	16a8478f97	Merginated.	2015-02-09 11:30:52 -08:00
Nick Winter	5decf7ae36	Workaround for #2259, although I haven't been able to reproduce when it happens.	2015-02-09 11:11:52 -08:00
Nick Winter	7b34f90230	Added rough draft of subscribe button in gem shop.	2015-02-09 09:22:18 -08:00
Nick Winter	c2a4700aa2	Mergy merge merge... moved the latest quote to the .rare, since it doesn't fit too well.	2015-02-09 08:42:24 -08:00
Nick Winter	61896083a9	Missed my save on that last one.	2015-02-09 08:39:40 -08:00
Nick Winter	1c41c1df91	Merged more tips in en.coffee.	2015-02-09 08:38:29 -08:00
Nick Winter	65c0abd3ab	Merged those tips in en.coffee.	2015-02-09 08:35:38 -08:00
Nick Winter	b2dc80b467	Merged those loading tips.	2015-02-09 08:34:13 -08:00
Nick Winter	7ee7269d39	Merge pull request #2191 from JKniager/patch-1 ... Added More Names	2015-02-09 08:32:32 -08:00
Nick Winter	0cee873157	Moved new buy gems background from compiled output to input dir.	2015-02-09 08:31:06 -08:00
Nick Winter	22c2c7df63	Fixed bug with incompletely added levels jamming the campaign editor.	2015-02-09 08:19:59 -08:00
TJ Ledwith	292e679cc6	Update level_loading.jade	2015-02-09 07:08:33 -05:00
Nick Winter	38c6d6f531	Merge pull request #2263 from divyanshu013/master ... Improved upon the Buy Gems Window for #2238	2015-02-08 21:44:57 -08:00
divyanshu013	4269f6a652	Improved upon the Buy Gems Window for #2238 ... Added the header and close button for the Buy Gems Window.	2015-02-09 02:31:03 +05:30
Imperadeiro98	983d8c761a	Merge pull request #2262 from ArthurLu/master ... Update zh-HANT.coffee	2015-02-08 19:55:00 +00:00
Imperadeiro98	2bca3e1733	Merge pull request #2255 from tutosfaciles48/patch-1 ... Update fr.coffee	2015-02-08 19:47:43 +00:00
TJ Ledwith	a7b7d61c08	Update en.coffee	2015-02-08 14:06:25 -05:00
Barney	245de23aff	Update zh-HANT.coffee	2015-02-08 21:21:32 +08:00
Barney	5f0adfae0c	Update zh-HANT.coffee	2015-02-08 20:56:23 +08:00
Barney	c88ccd7d8f	Update zh-HANT.coffee	2015-02-08 20:41:20 +08:00
Erik Mogensen (@mogsie)	00f4e1e894	lint complained	2015-02-08 12:47:49 +01:00
Erik Mogensen (@mogsie)	eab4174f78	More norwegian translations.	2015-02-08 12:38:17 +01:00
Imperadeiro98	d876c81c97	Made #back-button a button	2015-02-07 22:33:48 +00:00
tutosfaciles48	6ccba1b1a9	Update fr.coffee ... changement d'une phrase encore en anglais.	2015-02-07 22:23:09 +01:00
Imperadeiro98	8b721a7c47	Better indentation	2015-02-07 10:47:31 +00:00
Matt Lott	d5ac001a55	Restrict share progress prompt to named players	2015-02-06 19:49:13 -08:00
Nick Winter	3e07e45766	Merge pull request #2246 from h3yduck/master ... Fix bug: cannot upload profile picture	2015-02-06 18:15:15 -08:00
Nick Winter	cf09f01b03	Some style fixes to prettify the new background image avatars in user dropdown for #2247.	2015-02-06 18:10:12 -08:00
Nick Winter	9a29f898a9	Merge branch 'fix-profile-pic-bug' of git://github.com/h3yduck/codecombat into h3yduck-fix-profile-pic-bug	2015-02-06 18:01:25 -08:00
Nick Winter	8ab6f36364	Crude initial version of ASCII representation for blind players.	2015-02-06 16:54:55 -08:00
Matt Lott	972c3d0d6f	Share progress modal ... Shown after forgetful-gemsmith	2015-02-06 14:49:50 -08:00
Nick Winter	e311eb2700	Fixed preloading of level sessions before starting a level.	2015-02-06 13:04:15 -08:00
Imperadeiro98	d2f0f3d1fc	Update pt-PT.coffee	2015-02-06 20:49:51 +00:00
Nick Winter	0f7b7c7a9c	Propagated i18n. Fixed #2253.	2015-02-06 12:08:31 -08:00
Imperadeiro98	b30de2bfa8	Small fix to last commit	2015-02-06 20:04:44 +00:00
Imperadeiro98	5b04bdcaba	Merge pull request #2252 from JulR43/patch-3 ... Update fr.coffee	2015-02-06 20:04:14 +00:00
Nick Winter	2bd7c86638	Added bottom footer background texture.	2015-02-06 11:17:48 -08:00
Nick Winter	3da36ccc5d	Added new level loading bar art. Using illustrated Start Level button.	2015-02-06 10:26:38 -08:00
JulR43	ef2f610ba2	Update fr.coffee ... Translations	2015-02-06 19:06:10 +01:00
Matt Lott	f6bcc94bf8	Fix oneTimes email schema ... Changing ‘targetEmail’ field to ‘email’.	2015-02-06 09:47:06 -08:00
Imperadeiro98	b3d432d3ae	Some fixes to last commit	2015-02-06 15:19:05 +00:00
newmilktea	5e0c266094	Update zh-HANT.coffee	2015-02-06 22:14:15 +08:00
newmilktea	5e4a1ba4c8	Update zh-HANT.coffee	2015-02-06 22:08:26 +08:00
newmilktea	cf5b14e2c5	Update zh-HANT.coffee	2015-02-06 21:13:06 +08:00
newmilktea	6f4897da4d	Update zh-HANT.coffee	2015-02-06 21:08:39 +08:00
newmilktea	1752f12b32	Merge remote-tracking branch 'upstream/master' ... Conflicts: app/locale/zh-HANT.coffee	2015-02-06 20:52:02 +08:00
newmilktea	cee95397fa	Update zh-HANT.coffee	2015-02-06 20:49:09 +08:00
Nick Winter	860868c285	Stopped preloading sessions for now, since it's buggy.	2015-02-05 16:14:32 -08:00
Nick Winter	3cbf11d404	Added a back button to hit campaign selector view.	2015-02-05 15:40:45 -08:00
Nick Winter	1d8f91c42f	Added campaign world selector portal screen for half of players.	2015-02-05 15:05:33 -08:00
Scott Erickson	b686a7f4a1	Fixed running tests with karma.	2015-02-05 13:58:07 -08:00
Martin005	d7592018a8	Update cs.coffee ... Translated almost all new strings. Just want to save it and then will finish by translating rest of "teachers" strings.	2015-02-05 21:35:55 +01:00
Scott Erickson	f9ee100e73	Made Achievements and Campaigns patchable.	2015-02-05 12:01:19 -08:00
Scott Erickson	eafecaf492	Addressing #2173, part 1. It should now be possible to submit changes for non-versioned documents like Campaigns and Achievements.	2015-02-05 11:47:27 -08:00
h3yduck	a3b0a11c94	Update site-chrome.sass	2015-02-05 20:01:18 +01:00
h3yduck	15c6d32639	Update base.jade	2015-02-05 20:00:02 +01:00
Scott Erickson	f7403a6b77	Fixing #1866	2015-02-05 10:56:58 -08:00
Imperadeiro98	b92a029a04	Removed unused strings	2015-02-05 18:48:22 +00:00
Imperadeiro98	2dd90874da	Update subscribe-modal.jade	2015-02-05 18:44:07 +00:00
Nick Winter	45dd6fa9a6	Option to choose between ground and floating layer for AOE circles. Fixed cleave AOEs.	2015-02-05 09:36:11 -08:00
h3yduck	3221f71527	Fix bug: cannot upload profile picture ... In the code before, onInputChanged function was called manually, but the parameter was not passed. I think it's better to trigger the event, than calling the callback function of the event.	2015-02-05 17:56:51 +01:00
JulR43	1ca3a8d7e1	Update de-DE.coffee ... A few translations	2015-02-05 16:16:55 +00:00
h3yduck	29f5307cfd	Fix bug: can't upload profile photo ... The onInputChanged callback is using the event parameter to get the target DOM element. On #L72 the callback function was called manually, but no parameter was passed. I pass in an object that has a target attribute, so it can get the DOM element.	2015-02-05 07:00:12 -08:00
Imperadeiro98	7433e7a5ca	Update pt-PT.coffee	2015-02-05 14:57:21 +00:00
Imperadeiro98	230d2ce727	Merge pull request #2243 from JulR43/patch-1 ... Update fr.coffee	2015-02-05 14:44:49 +00:00
Imperadeiro98	f9e730ac30	Some fixes to last merge	2015-02-05 14:44:09 +00:00
Imperadeiro98	3ae135ac70	Merge pull request #2242 from Pammer/patch-2 ... Update ru.coffee	2015-02-05 14:42:50 +00:00
Imperadeiro98	c92caf8fc9	Small fix for last merge	2015-02-05 14:38:55 +00:00
Imperadeiro98	8c849aad18	Merge pull request #2241 from emmanuel-z/patch-2 ... Update es-419.coffee	2015-02-05 14:37:46 +00:00
Imperadeiro98	461ffecd4f	Merge pull request #2240 from emmanuel-z/patch-1 ... Update es-419.coffee	2015-02-05 14:36:21 +00:00
JulR43	e4553ac5a3	Update fr.coffee ... Correction	2015-02-05 08:33:26 +00:00
JulR43	5e1d8f9623	Update fr.coffee ... Some translations	2015-02-05 08:31:49 +00:00
Pammer	dc4f1c0142	Update ru.coffee ... "scores" + new part of "subcribe" + "parent_email"	2015-02-05 12:43:05 +09:00
Nick Winter	df68c3c108	Propagated i18n.	2015-02-04 16:19:13 -08:00
Emmanuel Zarzosa	fed29c6890	Update es-419.coffee	2015-02-04 21:18:13 -03:00
Imperadeiro98	3bfc7e1a9c	Small fix	2015-02-04 23:09:23 +00:00
Emmanuel Zarzosa	51c4ba5d0f	Update es-419.coffee	2015-02-04 20:04:38 -03:00
Nick Winter	8f996a44b0	Added replays to the campaign editor level analytics drilldowns for particular sessions.	2015-02-04 14:48:31 -08:00
Matt Lott	c842f45786	Update subscribe modal with parent help button	2015-02-04 13:54:38 -08:00
Nick Winter	35c04974dd	Added a difficulty badge when going to play a replayable level.	2015-02-04 13:42:49 -08:00
Nick Winter	11a3316dec	Preloading levels and sessions when clicking on a level, before clicking start.	2015-02-04 13:24:22 -08:00
Nick Winter	ac44acb867	Campaign status gets out of the way after four seconds on non-dungeon campaigns.	2015-02-04 13:00:07 -08:00
Nick Winter	46ef93190a	Show old difficulty instead of new difficulty when observing a replayable success. This will likely need revisiting when we are using observing for more than just leaderboards.	2015-02-04 11:31:43 -08:00
Nick Winter	18202b6852	Merge pull request #2237 from divyanshu013/master ... Fixed Comment Out My Code for infinite loops for #1788	2015-02-04 10:29:13 -08:00
Imperadeiro98	77778c7829	Merge pull request #2231 from Pammer/patch-1 ... Update ru.coffee	2015-02-04 18:00:18 +00:00
Imperadeiro98	df1018ab53	Uncommented header	2015-02-04 17:58:59 +00:00
divyanshu013	929c89d2ac	Fixed Comment Out My Code for infinite loops for #1788 ... Fixed the issue for incorrect comments by correcting the syntax per language	2015-02-04 21:48:01 +05:30
newmilktea	94499f670c	Update zh-HANT.coffee	2015-02-04 22:53:33 +08:00
newmilktea	fd56a0c218	Update zh-HANT.coffee	2015-02-04 22:34:05 +08:00
Nick Winter	5542bd8a89	Upgraded level info popover; made it a click instead of a hover; added view scores button to it when level has been completed.	2015-02-03 18:25:38 -08:00
Nick Winter	762192a4a7	A few visual improvements to leaderboadrs.	2015-02-03 17:07:15 -08:00
Nick Winter	d341e59b54	Merge branch 'master' of git://github.com/ArthurLu/codecombat into ArthurLu-master	2015-02-03 12:29:16 -08:00
Bård Eik-Hvidsten	5159ff56f7	Update nb.coffee	2015-02-03 20:25:05 +01:00
Imperadeiro98	2448be11b3	Small fix	2015-02-03 18:25:13 +00:00
Imperadeiro98	036ae7d7f7	Revert "Update zh-HANT.coffee"	2015-02-03 18:16:32 +00:00
Imperadeiro98	51f55bb376	Merge pull request #2230 from Coderaulic/patch-1 ... Update ja.coffee	2015-02-03 18:03:47 +00:00
Imperadeiro98	5fb9268603	Merge pull request #2229 from ArthurLu/patch-1 ... Update zh-HANT.coffee	2015-02-03 18:02:26 +00:00
Nick Winter	86aa265679	Added campaign label banner art.	2015-02-03 09:56:27 -08:00
Pammer	bd5ddab9e9	Update ru.coffee	2015-02-04 01:18:49 +09:00
newmilktea	275fb219a3	Update zh-HANT.coffee	2015-02-03 23:54:13 +08:00
newmilktea	89d4ca6039	Update zh-HANT.coffee	2015-02-03 23:26:17 +08:00
Pammer	641e8d7abf	Update ru.coffee	2015-02-03 14:37:58 +09:00
Coderaulic	d8cdb6960c	Update ja.coffee ... Updated misc translations.	2015-02-02 20:13:58 -08:00
Arthur	d47a04208a	Update zh-HANT.coffee ... Finish the rest of general	2015-02-03 11:50:55 +08:00
Arthur	752e71f74c	Update zh-HANT.coffee ... update the part of general	2015-02-03 11:36:21 +08:00
Nick Winter	60d68ca23c	Fixed some memory leaks and particle disposal problems. Re-enabled particles. Tweaked particle stylings.	2015-02-02 18:02:57 -08:00
JKniager	bc48cd8448	Moved 'Steve' to Ogre M	2015-02-02 14:17:06 -07:00
Imperadeiro98	837ad8b5a4	Update pt-PT.coffee	2015-02-02 20:20:41 +00:00
Nick Winter	b3db9962bd	Propagated i18n.	2015-02-02 11:51:15 -08:00
Nick Winter	3f78071e5e	A few small fixes.	2015-02-02 11:50:25 -08:00
Imperadeiro98	cd61969475	Small fixes for last PR	2015-02-02 19:48:42 +00:00
Imperadeiro98	3d5ae45565	Merge pull request #2201 from Coderaulic/patch-1 ... Update ja.coffee	2015-02-02 19:44:55 +00:00
Nick Winter	c8a5712d43	Merge pull request #2197 from purenickery/patch-3 ... Update en.coffee	2015-02-02 09:24:32 -08:00
Nick Winter	730753d67b	Merge pull request #2196 from purenickery/patch-2 ... Update level_loading.jade	2015-02-02 09:24:25 -08:00
Nick Winter	6e9db9f39b	Merge pull request #2189 from purenickery/patch-1 ... Update names.coffee	2015-02-02 09:20:36 -08:00
Nick Winter	59a6d369a3	Merge pull request #2183 from rishiloyola/patch-7 ... Update hero-victory-modal.sass	2015-02-02 09:00:27 -08:00
Coderaulic	92e779259a	Update ja.coffee ... Fixed miscellaneous translations from previous. Updated all of - game_menu: inventory: buy_gems: choose_hero: general: I left in the original English as comments for long translations should there be a need to revisit, unless single words. Lines 179, 186, 155, 396 all seem to cause 'compiler error'. They begin with key words so not sure how to fix those...maybe senior coder can take a look and fix?	2015-02-01 21:38:38 -08:00
Imperadeiro98	6551395278	A little fix	2015-02-01 19:19:22 +00:00
Imperadeiro98	734a401974	Merge pull request #2199 from nixel2007/master ... Update ru.coffee	2015-02-01 19:18:20 +00:00
Imperadeiro98	afe188104b	Fixed a typo	2015-02-01 19:16:51 +00:00
nixel2007	f70f1e2896	ru.coffee - teachers block	2015-02-01 21:58:23 +03:00
nixel2007	25190a5dfd	Update ru.coffee ... Leaderboard block + unlock_help_vidoes	2015-02-01 17:16:12 +03:00
Imperadeiro98	3068f18443	Added a translator	2015-02-01 11:01:18 +00:00
Nick Winter	55bc48c61d	Fixed problem with error messages in production.	2015-01-31 18:40:38 -08:00
Nick Winter	415cbceaf9	Disabling particles for now until performance can be fixed.	2015-01-31 16:59:03 -08:00
purenickery	b47bbe5704	Update en.coffee	2015-01-31 17:01:57 -07:00
purenickery	81b69e0c3c	Update level_loading.jade	2015-01-31 17:01:43 -07:00
JKniager	99c5d0f604	Added Tips ... Added english translations for the tips added to the loading tips.	2015-01-31 16:26:48 -07:00
JKniager	f1145852dd	Added Tips ... Added tips to the tip list.	2015-01-31 16:25:35 -07:00
JKniager	503575d86b	Added More Names	2015-01-31 15:51:27 -07:00
Nick Winter	1e410e0b14	Worked around bug with item portraits disappearing after item purchase. Fixed #1980.	2015-01-31 14:38:54 -08:00
purenickery	b7624c0c58	Update names.coffee ... -added new names for #53	2015-01-31 15:26:41 -07:00
Imperadeiro98	1b42dceb4f	Last merge fix	2015-01-31 22:02:26 +00:00
Coderaulic	bf54331f21	Update ja.coffee ... Updated translation in: nav: play: login: signup: recover: items: units: Note that in Japanese, measurements of time don't have individual or singular form: As in "a year" and "years" is still the same. play_level:	2015-01-31 13:47:40 -08:00
Imperadeiro98	95b6801dab	Update about.jade	2015-01-31 21:43:43 +00:00
Imperadeiro98	128dc55c1d	Merge pull request #2187 from SuperPranx/patch-2 ... Added a few translations	2015-01-31 21:23:08 +00:00
Nick Winter	936ebf67a7	Fixed #2140.	2015-01-31 13:18:32 -08:00
Nick Winter	26ac0c8947	Making sure tooltips are destroyed when their parent views are destroyed.	2015-01-31 12:48:44 -08:00
Nick Winter	4b388f2775	Fixed some memory leaks. Fixed a couple minor bugs.	2015-01-31 12:23:44 -08:00
Ivan Milanov	15939cbc17	Added a few translations	2015-01-31 21:19:23 +01:00
Imperadeiro98	b8214e8b3c	Last merge fixes	2015-01-31 19:02:24 +00:00
Imperadeiro98	a0e4a410f7	Merge pull request #2185 from jacobakkerboom/patch-2 ... Update nl-NL.coffee	2015-01-31 18:53:59 +00:00
Nick Winter	b538a83fd1	Oops, that was just for testing...	2015-01-31 10:37:43 -08:00
Popey Gilbert	ec5d54cc97	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-01-31 10:10:24 -08:00
Popey Gilbert	8098c76ba5	Changed Particles	2015-01-31 10:08:54 -08:00
Nick Winter	c977ecc16f	Adding easy observing of leaderboard matches (except top 5).	2015-01-31 10:04:11 -08:00
Jacob	cf76143e60	Update nl-NL.coffee ... Worked upwards from the bottom until the section "about". Edited some longer sentences reasonably carefully. Made use of the word email more consistent, by changing most to email. Wiki says the official spelling is e-mail, so perhaps we should revert this, but I think consistency is most important. I suppose we should work together with our Belgian partners, but I have only looked at the NL version. Again, feel free to contact me. I will browse some more in the Dutch version to see if everything looks ok.	2015-01-31 17:28:27 +01:00
Imperadeiro98	55d9731720	Removed Scott's website ... It was not working.	2015-01-31 15:04:50 +00:00
Imperadeiro98	850cd99069	i18n of teachers (part 2)	2015-01-31 14:17:24 +00:00
Imperadeiro98	06860f4338	Added teachers strings	2015-01-31 14:06:32 +00:00
Imperadeiro98	bae3053585	i18n of teachers (part 1)	2015-01-31 12:57:32 +00:00
Imperadeiro98	d497a3ac24	Update legal.jade	2015-01-31 12:42:57 +00:00
Imperadeiro98	7cb2a9403b	Using .spr and .spl ... Also removed an image that was not working	2015-01-31 12:35:02 +00:00
Imperadeiro98	24529d0d7c	Update legal.sass	2015-01-31 12:11:09 +00:00
Rishi	106d5f640e	Update hero-victory-modal.sass	2015-01-31 17:40:34 +05:30
Imperadeiro98	d99e790df1	Fixed last merge issue	2015-01-31 11:04:11 +00:00
Imperadeiro98	3db3b0790c	Merge pull request #2177 from negesti/patch-2 ... Update de-DE.coffee	2015-01-31 11:03:48 +00:00
sotonin	751ae0fac8	Adding support for hudName property	2015-01-31 00:07:23 -06:00
Nick Winter	e59f2bcc62	Recording scores even for non-real-time-submit levels.	2015-01-30 22:06:22 -08:00
Nick Winter	022d31c19a	Basic leaderboards are working.	2015-01-30 21:36:48 -08:00
Nick Winter	4efbe0a12f	Leaderboard skeletons.	2015-01-30 21:36:47 -08:00
Matt Lott	a092444455	Add browser info to level session	2015-01-30 14:45:36 -08:00
Nick Winter	848341dbd1	I guess I'll be finding these for a while.	2015-01-30 11:24:48 -08:00
Matt Lott	58f8eb6688	Add support for premium video tutorials	2015-01-30 10:48:49 -08:00
negesti	1eeeb25315	Update de-DE.coffee	2015-01-30 19:32:50 +01:00
Nick Winter	f78ea3d786	Yaaaaay	2015-01-30 09:40:46 -08:00
Nick Winter	2571b41cca	Found another one, missed due to insufficient grep-fu.	2015-01-30 09:24:07 -08:00
Nick Winter	9ca2663e0e	Fixed one more instance of the previous bug.	2015-01-30 08:12:34 -08:00
Nick Winter	36fcd1bb79	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-01-30 07:52:09 -08:00
Nick Winter	77cca7189f	Updated a bunch of code that got busted with CoffeeScript 1.9.0.	2015-01-30 07:51:57 -08:00
Imperadeiro98	ad05ddc221	Fixed merge issues	2015-01-30 15:33:53 +00:00
Imperadeiro98	32dc5fdc34	Merge pull request #2176 from jacobakkerboom/patch-1 ... Update nl-NL.coffee,	2015-01-30 15:30:32 +00:00
Imperadeiro98	cd7f09e626	Merge pull request #2172 from JulR43/patch-1 ... Update fr.coffee	2015-01-30 15:29:23 +00:00
Jacob	6e08e5406e	Update nl-NL.coffee, ... Submitted reasonably many translations. Did not look how the translations looked on my own server, but I did recognise most texts for which I provided a translation (so that for most options I had a good idea what their purpose was). This is my first edit, so I am not well aware of any unwritten rules about translating. I tried to be reasonable in using comments. For some things like the translation of subscriber (abonnee), running (uitvoeren o.i.d.) and equipment (uitrusting) some discussion might be nice, in order to have consistency. I have however refrained from using very long comments. I am actually not even aware of what the default action is when no translation is present, which I assume is simply to use the English version. I suppose the main purpose of the Dutch translation is to help children, so this is what I mainly had in mind. Feel free to contact me about subjects like this. I will try to learn more by inspecting previous edits.	2015-01-30 12:42:27 +01:00
Nick Winter	39ad9b8e35	Show hero unlocks in campaign editor, too.	2015-01-29 19:29:37 -08:00
Nick Winter	1630b30351	Fixed showing hero unlock portraits on world map. Showing them now even before their levels are unlocked, and showing until you purchase, not just unlock them.	2015-01-29 19:05:30 -08:00
Nick Winter	fd0e7a8c44	Picked some slightly less awful particle colors for different terrains and level types. Enabled for half the players.	2015-01-29 18:19:03 -08:00
Matt Lott	92f070ecca	Fix help video events ... Removing the protocol broke the video player event hooks.	2015-01-29 16:45:18 -08:00
Nick Winter	5addacddf0	First draft of ParticleMan particle emitters for showing hidden levels in CampaignView.	2015-01-29 16:11:13 -08:00
Nick Winter	57d12c199e	Tweaks to campaign status view. Hooking up i18n for Campaigns, but it doesn't work yet.	2015-01-29 09:07:25 -08:00
JulR43	0c1897bbb3	Update fr.coffee ... Several translates	2015-01-29 16:56:37 +00:00
Nick Winter	aab6d17047	Added campaign completion progress indicator.	2015-01-29 08:26:12 -08:00
Imperadeiro98	239b72dd01	Merge pull request #2169 from scenix007/patch-1 ... add some translation for tips	2015-01-29 16:17:34 +00:00
Jhoon Saravia	8325d522fb	Finished translations on tips	2015-01-29 08:57:29 -05:00
Long Shao	14af5c309d	add some translation for tips ... Update zh-HANS.coffee : add some translation for tips	2015-01-29 18:13:10 +08:00
Nick Winter	a6043ca1be	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-01-28 17:59:11 -08:00
Nick Winter	22070ddff2	Identifying lastLevel to Segment. Added Ogre Headhunter names.	2015-01-28 17:58:56 -08:00
Nick Winter	f9d2a06379	Merge pull request #2168 from yaur/master ... Fix windows build	2015-01-28 17:52:49 -08:00
Matt Lott	8b51c3cb5d	Stop subscribe modal A/B test ... Group A (original) wins.	2015-01-28 16:20:10 -08:00
yaur	dc39a55cf8	remove logging	2015-01-28 18:37:07 -05:00
yaur	30f9188090	Remove the scheme from help videos so that they maintain the scheme of the ... calling page	2015-01-28 18:33:28 -05:00
nixel2007	1ff5832436	fix ru.coffee	2015-01-28 22:07:19 +03:00
nixel2007	d086555fb7	Update ru.coffee	2015-01-28 21:50:16 +03:00
Imperadeiro98	354a7cb71b	Merge pull request #2160 from rsiwady29/spanish_translations ... Update es-419.coffee	2015-01-28 18:18:35 +00:00
Imperadeiro98	8cf424f7ef	Update pt-PT.coffee	2015-01-28 18:16:34 +00:00
Nick Winter	bf3c997d9d	Merge pull request #2139 from katemamba/long-name ... #2125 Long player names overflow	2015-01-28 08:56:26 -08:00
Richard Siwady	8d001a6281	Update spanish translations for es-419	2015-01-28 00:12:40 -06:00
Richard Siwady	7cb6791a58	Fixed lua_blurb es-419 translation.	2015-01-27 23:16:08 -06:00
Nick Winter	5f8ec2b21b	Propagated i18n.	2015-01-27 20:36:40 -08:00
Nick Winter	7cb92136cc	Added some Skeleton names.	2015-01-27 18:04:07 -08:00
divyanshu013	cfdbabb576	Added some quotes for #710	2015-01-27 21:53:37 +05:30
Nick Winter	2e09a94736	Asking for feedback when cancelling subscriptions.	2015-01-26 16:48:32 -08:00
Matt Lott	019406a341	Update campaign analytics ... Increase line graph dots for larger hover targets. Update missing day data handling to fill in graph points for any missing day, not just most recent end days. Fix level completion div0 bug.	2015-01-26 14:58:38 -08:00
Nick Winter	e41652730d	Don't warn about missing misc System.	2015-01-26 14:51:04 -08:00
Matt Lott	24f8029aff	🐛Fix campaign editor analytics ... Line graph checkboxes need their own labels.	2015-01-26 13:36:07 -08:00
Matt Lott	48a8ed109d	Update campaign editor analytics ... Add line graphs to level view.	2015-01-26 13:19:10 -08:00
divyanshu013	59df5a2a8c	Added some names for #53	2015-01-27 01:21:04 +05:30
Imperadeiro98	462b60191f	Don't force https	2015-01-25 18:56:30 +00:00
Imperadeiro98	19c03952e1	Merge pull request #2129 from chess9876543210/patch-1 ... Propagated i18n.	2015-01-25 18:34:44 +00:00
Pavan Kate	2004e91e38	#2125 Long player names overflow	2015-01-25 06:03:41 +05:30
Imperadeiro98	8acb5a5ac8	Update teachers.jade	2015-01-24 12:44:06 +00:00
jmigual	5e58986e75	Added some translations	2015-01-23 22:12:18 +01:00
Nick Winter	8f4b3cb85f	Deleted unneeded campaign label.	2015-01-22 16:33:35 -08:00
Nick Winter	e3bf8f74ab	Trying to stagger LevelSessions saves on wins on replayable levels to see if that might help #2108 at all.	2015-01-22 12:26:37 -08:00
Imperadeiro98	0d00917ca0	Fixed order	2015-01-22 19:28:17 +00:00
Imperadeiro98	ca792b1edc	Merge pull request #2133 from nixel2007/master ... Update ru.coffee	2015-01-22 19:26:49 +00:00
Nick Winter	64008276c2	Finally translating level names and descriptions in the campaign view.	2015-01-22 11:22:35 -08:00
nixel2007	6b5c69f889	ru.coffee - small fix	2015-01-22 22:16:37 +03:00
nixel2007	44c97428e3	Update ru.coffee	2015-01-22 22:14:56 +03:00
Imperadeiro98	bb0a820638	Update pt-PT.coffee	2015-01-22 19:04:41 +00:00
Nick Winter	e49a70a62e	Fixed mountain map background ratio.	2015-01-22 10:48:41 -08:00
Nick Winter	9e496fa9d0	Propagated i18n.	2015-01-22 10:45:51 -08:00
Nick Winter	9b1923d943	Merge pull request #2119 from AdnanZahid/patch-2 ... Added 6 new tips for the loading screen	2015-01-22 10:44:32 -08:00
Nick Winter	d24469d8ce	Merge pull request #2118 from AdnanZahid/patch-1 ... Added 6 new tips for the loading screen	2015-01-22 10:44:22 -08:00
Nick Winter	ccf4f0180e	Resolved ca.coffee merge conflicts.	2015-01-22 10:42:04 -08:00
Imperadeiro98	76906a15fc	Uncommented an header	2015-01-22 16:28:27 +00:00
Imperadeiro98	4a45b5290e	Merge pull request #2132 from z3t1/patch-1 ... Translation of several pharses	2015-01-22 16:27:31 +00:00
Imperadeiro98	45f4ae9e42	Merge pull request #2131 from probil/patch-1 ... Update Ukrainian l18n	2015-01-22 16:24:25 +00:00
z3t1	1e5ef588d8	Translation of several pharses	2015-01-21 20:56:13 -05:00
Matt Lott	3f40364616	Update campaign editor analytics ... Add date range picker to level view.	2015-01-21 16:03:50 -08:00
Maks Lyashuk	82bc526bd7	Update Ukrainian l18n ... Translated some new lines	2015-01-22 00:17:03 +02:00
Matt Lott	e49c74259b	Update campaign editor analytics ... Adding shown and purchased subscription counts. Locking down analytics to admin-only.	2015-01-21 13:41:38 -08:00
Matt Lott	6b271799be	Update level loading view sub event data ... Sending level slug instead of name.	2015-01-21 13:41:38 -08:00
chess	a118a7cf75	i18 update ... old non abonement text replaced with new version	2015-01-21 21:28:53 +01:00
Nick Winter	7dd128780f	Unlocking all audition levels in Auditions campaign.	2015-01-21 11:49:56 -08:00
Matt Lott	3c36d1cc06	Update campaign editor analytics ... Adjust level completion line graph stroke-weight based on daily started count in campaign overview.	2015-01-20 16:04:02 -08:00
Matt Lott	d51eddef29	Update campaign editor analytics ... Double-click level row in overview to open level details view.	2015-01-20 15:02:24 -08:00
Matt Lott	ffb59d5cec	Disable prod admin internal analytics tracking	2015-01-20 14:18:31 -08:00
Imperadeiro98	25f01db701	Merge pull request #2116 from McGiogen/patch-1 ... Added some simple translations all over the file	2015-01-20 20:40:17 +00:00
Matt Lott	f38a67b96a	Update campaign editor analytics ... Add playtime bar graphs.	2015-01-20 11:43:13 -08:00
Matt Lott	d368e3ffd8	Fix campaign editor analytics ... Dividing by zero for level completion spark lines in campaign overview analytics modal.	2015-01-20 11:14:50 -08:00
Matt Lott	7fda59ee2d	Update campaign editor analytics ... Adding help click counts and help videos start counts to level view analytics.	2015-01-20 10:43:02 -08:00
Matt Lott	d0a0c95623	Update campaign editor analytics ... Display little level completion line graphs in the level completion table cells.	2015-01-19 21:59:25 -08:00
Matt Lott	499e7c2999	Update campaign editor analytics ... Color in level name based on number of users remaining.	2015-01-19 15:21:42 -08:00
tboutefara	1a8f6b5819	Update ar.coffee ... First translation session	2015-01-20 00:04:04 +01:00
Imperadeiro98	e00e699e6f	Update pt-PT.coffee	2015-01-19 20:50:08 +00:00
Imperadeiro98	7e7945fc04	Activated some translations	2015-01-19 20:30:05 +00:00
Marielle Bannink	41239494e5	Update nl-NL.coffee ... Added some translations to the file	2015-01-19 20:33:51 +01:00
Adnan Zahid	f46160fff9	Added 6 new tips for the loading screen (Also written in level_loading.jade) ... Added the following tips: 1) play_level.tip_control_destiny 2) play_level.tip_no_code 3) play_level.tip_code_never_lies 4) play_level.tip_reusable_software 5) play_level.tip_optimization_operator 6) play_level.tip_lines_of_code	2015-01-20 00:12:21 +05:00
Adnan Zahid	375d388fe3	Added 6 new tips for the loading screen ... Added the following tips: 1) play_level.tip_control_destiny 2) play_level.tip_no_code 3) play_level.tip_code_never_lies 4) play_level.tip_reusable_software 5) play_level.tip_optimization_operator 6) play_level.tip_lines_of_code	2015-01-20 00:06:29 +05:00
Matt Lott	05f028d944	Update campaign editor analytics ... Adding ‘left game’ counts to overall campaign view. This is the number of players that left the game after playing the given level.	2015-01-18 16:29:47 -08:00
McGio	6473c7e94a	Added some simple translations all over the file	2015-01-18 16:56:35 +01:00
nixel2007	19802cd0c5	Update ru.coffee	2015-01-18 00:44:31 +03:00
Imperadeiro98	c12d10a06b	Fixed some issues	2015-01-17 18:54:34 +00:00
Shuyu Zhang	1bc4846c5e	Update zh-HANS.coffee	2015-01-17 10:14:45 -08:00
Imperadeiro98	165582a55c	Some fixes	2015-01-17 10:19:31 +00:00
Imperadeiro98	95d2d36129	Merge pull request #2110 from noiseorigin/patch-1 ... Update zh-HANS.coffee	2015-01-17 10:17:03 +00:00
Shuyu Zhang	13ad53ee04	Update zh-HANS.coffee	2015-01-17 00:06:04 -08:00
Nick Winter	706b2ca930	Don't includeFlow for Thangs with skipProtectAPI on, because we don't care about their flow anyway (non-read-write custom Programmables).	2015-01-16 18:47:30 -08:00
Matt Lott	d532d9fe6e	Add date picker to campaign editor analytics ... Only for overall campaign editor analytics. Still need to add date pickers to individual level views. Moving campaign editor analytics to its own modal to support reloading with new dates. The date picker widget works poorly, but you can type in dates if necessary. Also moving analytics button up into the top right header, with a little stats glyph icon.	2015-01-16 15:44:28 -08:00
Shuyu Zhang	1039afc85b	Update zh-HANS.coffee	2015-01-16 15:03:04 -08:00
Shuyu Zhang	e46c6828b9	Update zh-HANS.coffee	2015-01-16 14:34:24 -08:00
Imperadeiro98	974c9e538d	Update add-thang-components-modal.jade	2015-01-16 21:08:32 +00:00
Imperadeiro98	91515ef5a1	Update pt-PT.coffee	2015-01-16 20:58:17 +00:00
Imperadeiro98	699a15919c	Update loading-error.jade	2015-01-16 20:55:20 +00:00
Nick Winter	3051dc32fa	Propagated i18n.	2015-01-16 12:53:14 -08:00
Imperadeiro98	feae3694f7	Update en.coffee	2015-01-16 20:52:55 +00:00
Imperadeiro98	653263a069	Update save-version-modal.jade	2015-01-16 20:52:47 +00:00
Nick Winter	f86d106077	Showing replayable level difficulty in control bar.	2015-01-16 12:50:10 -08:00
Imperadeiro98	08b5f0cc27	Update thang-components-edit-view.jade	2015-01-16 20:37:41 +00:00
Imperadeiro98	5981399a43	Update en.coffee	2015-01-16 20:37:32 +00:00
Nick Winter	fefc962c3c	Added Mountain terrain type.	2015-01-15 17:10:52 -08:00
Matt Lott	770d3f5229	Add playtimes to overall campaign editor analytics	2015-01-15 16:07:26 -08:00
Matt Lott	e67532cf5d	Mark top3 and bottom3 levels in campaign analytics	2015-01-15 15:19:16 -08:00
Imperadeiro98	5edc8543e5	Update en.coffee	2015-01-15 20:01:11 +00:00
Imperadeiro98	b6cf226a67	Update patch_modal.jade	2015-01-15 20:01:09 +00:00
Nick Winter	d69e9c43df	Merge pull request #2105 from Imperadeiro98/master ... Update campaign-view.jade	2015-01-15 11:34:07 -08:00
Matt Lott	116c7d0bf2	Update internal analytics ... Adding level session ID where applicable. Slimming down fields for most common events.	2015-01-15 11:04:52 -08:00
Imperadeiro98	f403c9d3e6	Update en.coffee	2015-01-15 18:36:16 +00:00
Imperadeiro98	ea07cfdd62	Update campaign-view.jade	2015-01-15 18:35:38 +00:00
Imperadeiro98	1ab2ea6910	Update pt-PT.coffee	2015-01-15 18:00:00 +00:00
Nick Winter	a329de6d90	Propagated i18n.	2015-01-15 09:37:08 -08:00
Imperadeiro98	e6234b0771	Update en.coffee	2015-01-15 17:34:49 +00:00
Imperadeiro98	fa3d8a2dd0	i18n duplicate strings	2015-01-15 17:34:39 +00:00
Imperadeiro98	ab2d3fbb10	i18n a title	2015-01-15 17:34:14 +00:00
Imperadeiro98	12be17ebd6	Update pt-PT.coffee	2015-01-15 17:11:37 +00:00
Nick Winter	e50b6f508c	Propagated i18n.	2015-01-15 09:08:13 -08:00
Nick Winter	38297a1fd7	Fixed problem with levels that don't have next levels in campaign editor.	2015-01-15 09:07:47 -08:00
Imperadeiro98	b0d00ce213	Added generate terrain stuff	2015-01-15 17:07:11 +00:00
Imperadeiro98	16ad0de722	Removed spaces	2015-01-15 17:06:36 +00:00
enricpc	9dc45bdf45	Update ca.coffee	2015-01-15 09:44:27 +01:00
Matt Lott	c5977c00fe	Add shortened fields to analytics.log.event ... We’ll remove the old long fields after we’ve got enough data to switch over our analytics queries without complication.	2015-01-14 17:51:34 -08:00
Matt Lott	10dc0c4794	Enable Google+ on login modal for IE	2015-01-14 14:16:08 -08:00
Scott Erickson	3c02f14f95	Reworking PlayHeroesModal to use Lanks and LayerAdapter to control hero animations.	2015-01-14 14:10:33 -08:00
Matt Lott	e79cadc761	Remove analytics.log.event created field ... _id field already has created data: http://docs.mongodb.org/manual/reference/object-id/ Also some misc analytics cleanup.	2015-01-14 13:03:02 -08:00
Matt Lott	140a93b453	Log world map and homepage events internally ... Need these for conversion rates.	2015-01-14 11:09:56 -08:00
Matt Lott	3fd5f49220	Analytics data revamp ... Add analytics per-day aggregation collection. Add analytics strings collection. Add per-day aggregation mongo insertion script. Update campaign editor to use aggregation collection. Update queries to use _id instead of created field.	2015-01-14 11:09:01 -08:00
Imperadeiro98	6b46e45526	Merge pull request #2097 from enricpc/patch-4 ... Update ca.coffee	2015-01-14 17:14:59 +00:00
Imperadeiro98	c9f0a9ec07	Merge pull request #2096 from RubenDjOn/master ... Added new es-ES translations	2015-01-14 17:13:23 +00:00
enricpc	6bb3a77dad	Update ca.coffee	2015-01-14 15:46:28 +01:00
RubenDjOn	ddec7b7f5a	Added new es-ES translations	2015-01-14 00:53:05 +01:00
Scott Erickson	afe590c5cc	Hid the misc tab until you have unlocked defense of plainswood, and by extension, the forest.	2015-01-13 15:34:06 -08:00
Imperadeiro98	6993f52740	Corrected indentation	2015-01-13 21:45:52 +00:00
Imperadeiro98	68bc4e1c39	Tried to make i18n work	2015-01-13 21:38:34 +00:00
Imperadeiro98	7f645ce019	Update pt-PT.coffee	2015-01-13 21:18:22 +00:00
Nick Winter	268f5a5b0d	Propagated i18n.	2015-01-13 13:10:39 -08:00
Imperadeiro98	6491105f68	Update save-campaign-modal.jade	2015-01-13 20:06:53 +00:00
Imperadeiro98	12ada4f30c	Update campaign-editor-view.jade	2015-01-13 20:04:49 +00:00
Nick Winter	beb61ba8d4	Merge pull request #2094 from rishiloyola/patch-6 ... Update spell_palette_entry.sass	2015-01-13 11:06:50 -08:00
Nick Winter	f691eb9a86	Reimplemented next-level arrow highlighting. Campaign Editor now draws lines to show level unlock patterns. Removed more old WorldMapView stuff. Can now configure Hero Placeholder say cooldowns per-level.	2015-01-13 09:04:20 -08:00
Rishi	8a4b6eebf4	Update spell_palette_entry.sass	2015-01-13 15:30:37 +05:30
Scott Erickson	22e1318970	Added a rudimentary (aka programmer-designed) hero-type filter for the item store.	2015-01-12 15:30:18 -08:00
Nick Winter	38948137b9	Merge branch 'master' of https://github.com/codecombat/codecombat	2015-01-12 14:43:53 -08:00
Nick Winter	382e10dbb4	Fixed missing ] in names.coffee.	2015-01-12 14:43:33 -08:00
Scott Erickson	5cb8f14065	Fixed the HeroVictoryModal handling of earned achievements which were earned a while ago. Before they were appearing as if achievements were always newly achieved.	2015-01-12 14:43:29 -08:00
Popey456963	9ecb2822c0	Removed Duplicates	2015-01-12 20:18:35 +00:00
Popey456963	8d1ae770cb	Added bunch of soldier names to names.coffee ... Title pretty much says it all.	2015-01-12 20:04:22 +00:00
Imperadeiro98	8480fe7836	Update names.coffee	2015-01-12 19:35:37 +00:00
Nick Winter	7230f96daa	Fixed syntax errors on names.coffee from #2089.	2015-01-12 10:49:55 -08:00
Nick Winter	1f377cf7ee	Merge pull request #2089 from popey456963/master ... Ordered names by alphabetical order	2015-01-12 10:49:06 -08:00
Popey Gilbert	bd14892cf2	Ordered names by alphabetical order ... So that it is easier to see whether the names are in order or not.	2015-01-12 11:58:11 +00:00
Nick Winter	ea2392b2fe	Removed buildTime annoyance from level save diffs.	2015-01-11 10:10:55 -08:00
Nick Winter	778647bf19	Fixed layout of non-short item detail property labels. Commented out campaign editor analytics load for now to not kill things.	2015-01-11 10:04:24 -08:00
Imperadeiro98	a9682a8cbe	Update ladder-tab-view.jade	2015-01-10 22:52:41 +00:00
RubenDjOn	a8542d8f7f	New es.ES translations	2015-01-10 22:32:50 +01:00
Nick Winter	5c352699b0	buildTime stuff.	2015-01-10 09:33:41 -08:00
Imperadeiro98	b5103aaa49	Merge pull request #2075 from 182mick44/patch-1 ... File revision.	2015-01-10 11:19:43 +00:00
Ivan Milanov	d8c5ecbbf8	Added new translations	2015-01-09 22:35:00 +01:00
Scott Erickson	82eb47bf5f	Fixed #1056.	2015-01-09 12:56:48 -08:00
Scott Erickson	c8298679a4	Tweaked achievement notification handling, also disabling an endless loop of achievement fetching.	2015-01-09 12:38:00 -08:00
Miguel	f46df1de34	File revision. ... There were many errors, attending grammar and ortography. Now everything is more or less correct.	2015-01-09 20:57:19 +01:00
Matt Lott	29c6b7c9f1	Prune internal analytics event data	2015-01-09 09:27:33 -08:00
Imperadeiro98	83efcb5113	Some spacing corrections	2015-01-09 15:00:38 +00:00
Imperadeiro98	3ec86b3e14	Merge pull request #2070 from steveshining/master ... I hope this commit could be helpful	2015-01-09 14:59:49 +00:00
Imperadeiro98	2563c5b896	Merge pull request #2074 from nixel2007/master ... Update ru.coffee	2015-01-09 14:58:29 +00:00
Imperadeiro98	b8e995c72b	Merge pull request #2072 from RubenDjOn/master ... Added es-ES translations	2015-01-09 14:55:38 +00:00
Nick Winter	3900af043d	Added an es-419 Diplomat.	2015-01-08 20:49:18 -08:00
nixel2007	f65c464eb1	small fix	2015-01-09 05:40:11 +03:00
nixel2007	5b089c29d5	Update ru.coffee	2015-01-09 05:37:16 +03:00
RubenDjOn	6dd39dd99b	Added es-ES translations	2015-01-09 01:19:28 +01:00
Matt Lott	8977450fed	Add levelID to Saw Victory analytics event	2015-01-08 16:09:39 -08:00
Matt Lott	bc93a2b181	Update campaign editor analytics ... Restrict level view completion rates to unique users. Super slow, perf work to do here. Increase level view completion rate date range to 2 weeks. Increase level view average playtimes date range to 2 weeks. Display player name if available in level view recent sessions.	2015-01-08 16:01:49 -08:00
Scott Erickson	d69c5941b3	Fixed #1968.	2015-01-08 11:57:31 -08:00
Nick Winter	04e0624268	Possible hacky workaround for #2068.	2015-01-08 11:42:42 -08:00
Scott Erickson	d8e89f31b1	Fixed #1967.	2015-01-08 11:29:10 -08:00
Nick Winter	c1d9a5ae13	Merge pull request #2066 from GeetikaBatra/patch-1 ... Added soldiers,librarian and ninja	2015-01-08 08:13:00 -08:00
Nick Winter	fbcbfc7368	Merged nl-BE.coffee.	2015-01-08 08:04:15 -08:00
izumi	6a6102fd75	I hope this commit could be helpful ... Your guys realy do a great job!	2015-01-08 17:09:33 +08:00
Nick Winter	d66243ad75	Beating replayable levels now shows you the proper gems and xp.	2015-01-07 18:36:02 -08:00
Scott Erickson	aeebee891e	Added 'submitting...' text to the i18n translation form button to show when a submission is successful.	2015-01-07 16:15:26 -08:00
Scott Erickson	c235b1cc15	The noty error for server errors now shows more detailed info.	2015-01-07 16:02:52 -08:00
Scott Erickson	2a4f997b1d	Fixed registration point scaling for vector portraits, so they match their raster versions.	2015-01-07 15:11:43 -08:00
Matt Lott	c54fea929e	Update campaign editor analytics ... Optimize analytics.log.event user event data find() to use stream() instead of exec(), which is better for large result sets Fix startDay formatting bug Per-level recent sessions to 100	2015-01-07 14:49:24 -08:00
Imperadeiro98	b47fc93912	Update ambassador.jade	2015-01-07 21:45:36 +00:00
Imperadeiro98	3c51d4d014	Update scribe.jade	2015-01-07 21:45:11 +00:00
Imperadeiro98	2a3892a572	Removed unnecessary titles	2015-01-07 21:44:05 +00:00
Nick Winter	1455dc0550	Working on repeatable achievement posting. Two tests still fail, though, so it's not there yet.	2015-01-07 12:25:43 -08:00
Geetika Batra	1480baf000	Added soldiers,librarian and ninja	2015-01-07 22:56:27 +05:30
Imperadeiro98	a0a8b2a961	Merge pull request #2064 from Kindleme/patch-2 ... Update zh-HANS.coffee	2015-01-07 17:14:04 +00:00
Imperadeiro98	41080daaad	Merge pull request #2063 from RubenDjOn/master ... Added es-ES translations.	2015-01-07 17:09:43 +00:00
Kindleme	ac46e65ec9	Update zh-HANS.coffee	2015-01-07 18:24:50 +08:00
Nick Winter	4ea2a51ff6	In middle of debugging non-functioning repeatable achievements.	2015-01-06 21:32:58 -08:00
RubenDjOn	ac4925b2da	Added es-ES translations.	2015-01-07 01:08:53 +01:00
Imperadeiro98	9a6933023c	Update patches.jade	2015-01-06 21:22:20 +00:00
Imperadeiro98	c0c0ecace7	Update en.coffee	2015-01-06 21:22:13 +00:00
Nick Winter	9a3f18e60a	Save more UserCodeProblems and LevelSessions.	2015-01-06 13:03:09 -08:00
Nick Winter	677ba56ce9	Make sure to save level sessions after difficulty increase.	2015-01-06 12:40:24 -08:00
Matt Lott	36921f7644	Fix IE9 script loading ... Script tags weren’t loading sequentially. IE9 doesn’t support the defer attribute: https://github.com/h5bp/lazyweb-requests/issues/42 Conditional comments: http://msdn.microsoft.com/en-us/library/ms537512%28v=vs.85%29.aspx Breaking change: https://github.com/codecombat/codecombat/commit/b698745e0505857ef8a21de9 fa2729ff5ab473ce	2015-01-06 10:53:32 -08:00
Imperadeiro98	54f8adb1cc	Update pt-PT.coffee	2015-01-06 16:58:19 +00:00
Nick Winter	ab82bd972b	Propagated i18n.	2015-01-06 08:01:42 -08:00
nixel2007	364e6c8617	Update ru.coffee ... Sync to en.	2015-01-06 18:37:29 +03:00
Imperadeiro98	f723a2d5e9	Removed unnecessary title	2015-01-06 15:11:37 +00:00
Imperadeiro98	704f9e41e1	Merge pull request #2025 from A-Man/master ... Added more names for #53	2015-01-06 14:37:08 +00:00
Nick Winter	9272ceb23e	Trying to restore functionality of achievement plugin but without memory leak.	2015-01-05 21:57:23 -08:00
Nick Winter	45b90804ec	Noting some TODOs to fix soon.	2015-01-05 20:49:59 -08:00
Nick Winter	ac525c53b5	Merge pull request #2056 from Imperadeiro98/patch-1 ... Trying to i18n	2015-01-05 17:39:46 -08:00
Imperadeiro98	19756b3be2	Update LevelEditView.coffee	2015-01-05 23:49:47 +00:00
Matt Lott	1a401230f4	Add recent sessions to campaign editor analytics ... In level view. Shows latest 10, and you can double-click them to open in modalmodal.	2015-01-05 15:40:28 -08:00
Scott Erickson	ffc33279b8	Made i18n coverage more strict about making sure every property that needs to be translated is translated.	2015-01-05 15:33:20 -08:00
Imperadeiro98	b6de218fa1	Fixed typo	2015-01-05 23:14:44 +00:00
Scott Erickson	ba1ffe194c	Deferring user creation until after the client app loads, to try and lower the massive number of anonymous users that are created.	2015-01-05 14:43:20 -08:00
Imperadeiro98	fb29bfa71e	Merge pull request #2057 from RubenDjOn/master ... Added es-ES translations	2015-01-05 22:14:29 +00:00
RubenDjOn	0bb220de81	Added es-ES translations	2015-01-05 22:55:07 +01:00
Matt Lott	b4a0fe146e	Add common user code problems to campaign editor ... In level view, showing data from last 30 days, with top 20 issues by count.	2015-01-05 13:42:19 -08:00
Imperadeiro98	45b553fbcb	Update en.coffee	2015-01-05 20:24:49 +00:00
Imperadeiro98	029b28853f	Update LevelEditView.coffee	2015-01-05 20:24:42 +00:00
Imperadeiro98	9c0d992868	Update edit.jade	2015-01-05 20:19:46 +00:00
Imperadeiro98	0df9de551c	Fixed last commit issues	2015-01-05 19:51:07 +00:00
Imperadeiro98	b7a7bb2c23	Merge pull request #2054 from Apoc-/patch-2 ... Update de-DE.coffee	2015-01-05 19:48:02 +00:00
Imperadeiro98	4a351e99e6	Uncommented translation	2015-01-05 19:34:56 +00:00
Imperadeiro98	e639a62085	Fixed errors from last commit	2015-01-05 19:26:23 +00:00
Imperadeiro98	97cce946eb	Merge pull request #2053 from divaDseidnA/patch-7 ... Update hu.coffee	2015-01-05 19:25:13 +00:00
Imperadeiro98	0d8834da95	Merge pull request #2047 from Kindleme/patch-1 ... Update zh-HANS.coffee	2015-01-05 19:22:34 +00:00
Imperadeiro98	a3c624b061	Uncommented translation	2015-01-05 19:19:45 +00:00
Imperadeiro98	d01738755c	Merge pull request #2051 from SuperPranx/patch-1 ... Additions and modifications	2015-01-05 19:19:01 +00:00
Imperadeiro98	7c6115ba9b	Merge pull request #2050 from RubenDjOn/master ... Added one translation to Spanish (es-ES). Testing github pull request.	2015-01-05 19:15:12 +00:00
Imperadeiro98	f0ffb2d576	Uncommented header	2015-01-05 19:13:15 +00:00
Imperadeiro98	d6e1902278	Merge pull request #2055 from StijnBerendse/master ... Update nl-NL.coffee	2015-01-05 19:12:01 +00:00
Nick Winter	947811c01b	Replayable once-per-day increasing-difficulty level basics.	2015-01-05 10:44:24 -08:00
Matt Lott	61180c640d	Add completion % to campaign analytics	2015-01-05 10:28:56 -08:00
StijnBerendse	dc6995059e	Update nl-NL.coffee	2015-01-05 18:33:06 +01:00
Apoc-	25b689f678	Update de-DE.coffee ... Finished translation, added some remarks to words / phrases who cannot be translated directly Fixed some translation errors	2015-01-05 14:22:00 +01:00
David Nagy	13f3f5d3af	Update hu.coffee	2015-01-05 12:51:57 +00:00
Ivan Milanov	d75c45baa0	Minor correction	2015-01-05 01:49:42 +01:00
Ivan Milanov	b90d08a64d	Additions and modifications ... Added new translations and made minor modifications to existing ones where the translation didn't make sense in the context required.	2015-01-05 01:45:36 +01:00
RubenDjOn	a88f991a72	Added one translation to Spanish (es-ES). Testing github pull request.	2015-01-04 23:19:43 +01:00
Scott Erickson	15be292573	Added a little focus styling to treemas in editors so it's easier to copy/paste.	2015-01-04 09:26:40 -08:00
Nick Winter	6ec7066309	Using a couple more percentage margins/paddings in spell palette.	2015-01-04 09:08:59 -08:00
Nick Winter	ca4d861bac	Merge pull request #2045 from Imperadeiro98/master ... Update spell_palette.sass	2015-01-04 09:06:51 -08:00
Omar S.	e117c56f10	Update es-419.coffee ... Almost everything is done :D	2015-01-04 11:37:21 -05:00
Imperadeiro98	41deb10a0f	Uncommented translations	2015-01-04 16:17:29 +00:00
Imperadeiro98	e4e8b9bccc	Merge pull request #2046 from StijnBerendse/master ... Update nl-NL.coffee	2015-01-04 16:12:44 +00:00
Scott Erickson	1446f77a17	Refactored away from having the underscore string library added to the String prototype.	2015-01-04 08:05:46 -08:00
Imperadeiro98	94a1b3c06f	Fixed an error I made	2015-01-04 15:20:18 +00:00
Kindleme	734b91583b	Update zh-HANS.coffee	2015-01-04 22:51:43 +08:00
StijnBerendse	587dfe4c5f	Update nl-NL.coffee ... Translated the rest of the Home, Login, Signup, and Recover portions.	2015-01-04 14:59:35 +01:00
Imperadeiro98	28744264c5	Update level-component-edit-view.jade	2015-01-04 13:20:43 +00:00
Imperadeiro98	00550adbc7	Update level-system-edit-view.jade	2015-01-04 13:18:52 +00:00
Imperadeiro98	c529c3d874	Update spell_palette.sass	2015-01-04 12:41:16 +00:00
Nick Winter	163cf50528	Fixed processing of default Programmable config.	2015-01-03 13:22:54 -08:00
Nick Winter	c2d74a812d	Updates to require/restrict level logic.	2015-01-02 15:44:43 -08:00
Matt Lott	b5969e0abc	Update campaign analytics level ordering ... Reading campaign levels from database. Assumes database order is roughly progression order.	2015-01-02 13:31:50 -08:00
Omar S.	c68cad1556	Update es-419.coffee	2015-01-02 15:49:10 -05:00
Imperadeiro98	434c921cb9	Merge pull request #2040 from SuperPranx/patch-1 ... Added new translations and corrected existing ones	2015-01-02 20:46:53 +00:00
Nick Winter	f66afa1dc0	Trying latest sass-brunch (which happened to alphabetize our devDependencies.) Fixed bug with required/restricted items not showing up properly. Added quick links to open level editors from campaign editor.	2015-01-02 12:40:17 -08:00
Ivan Milanov	e7b80b0a01	Added new translations and corrected existing ones	2015-01-02 16:03:17 +01:00
Imperadeiro98	42166bf623	Merge pull request #2037 from flauta/patch-4 ... Update it.coffee	2015-01-02 11:59:59 +00:00
Nick Winter	bf9aa27e73	Added tasks view to Thang editor search.	2015-01-01 14:59:55 -08:00
Nick Winter	dbc42fb7e1	Added task system to Thang Editor.	2015-01-01 14:07:11 -08:00
Matt Lott	2d410fa57f	Update editor analytics level completions ... We have to grab all the level data at once, so we should cache it all too. Only the first level completions call should be uncached/slow.	2015-01-01 12:26:19 -08:00
Matt Lott	e65887ec79	Add campaign drop-offs analytics to editor	2015-01-01 12:01:51 -08:00
flauta	811fd89bfe	Update it.coffee	2015-01-01 16:55:29 +01:00
Nick Winter	0e9f1e0370	Fixed #2036 (making it less likely that the mistake will ercur, anyway).	2014-12-31 16:55:14 -08:00
George Saines	b0056127af	changing the xp icon in the play view	2014-12-31 15:23:33 -08:00
Matt Lott	56b4346556	Update average playtimes query to match level	2014-12-31 13:19:46 -08:00
Matt Lott	9b6d327c7f	Add average playtimes to levels in campaign editor	2014-12-31 12:25:18 -08:00
Matt Lott	fcf5346aa3	Add completion rates to levels in campaign editor	2014-12-31 11:49:29 -08:00
Imperadeiro98	9d55be8ab1	Merge pull request #2033 from osanseviero/patch-19 ... Update es-419.coffee	2014-12-31 11:41:41 +00:00
Imperadeiro98	ee206f2428	Merge pull request #2032 from Martin005/patch-8 ... Update cs.coffee	2014-12-31 11:39:35 +00:00
Omar S.	9e8c344208	Update es-419.coffee ... More more more	2014-12-30 23:29:14 -05:00
Omar S.	58499392e8	Update es-419.coffee ... Upp to line 667	2014-12-30 20:22:00 -05:00
Nick Winter	9e9d69ec9b	Removed try_it text (which was accidentally used in the wrong place anyway).	2014-12-30 16:24:31 -08:00
Martin005	cf72abd2a2	Update cs.coffee	2014-12-31 00:21:22 +01:00
Imperadeiro98	72be5c35f0	Fixed link	2014-12-30 21:38:07 +00:00
Ivan Milanov	62e3b6b733	Added and modified translations ... - Added new translations - Made modifications to existing translations after consulting a friend well versed in macedonian linguistics	2014-12-30 10:38:02 +01:00
Ivan Milanov	cac2a5b7fa	Added translations in the 'play' segment	2014-12-30 07:36:16 +01:00
Anshuman	287817063b	Added more names for #53	2014-12-30 10:39:35 +05:30
Nick Winter	c13922a2d8	Transferring voice range from Hero Placeholder to heroes.	2014-12-29 20:06:27 -08:00
Nick Winter	a5b5bb1085	Ctrl/cmd+click a level in campign editor to open level editor in new tab.	2014-12-29 13:22:35 -08:00
Nick Winter	728f726748	Fixed problem opening GameMenuModal when there are no help videos.	2014-12-29 13:04:03 -08:00
Nick Winter	1440584633	Added tasks to campaign editor; fixed/added campaign editor level click/double-click handling; improved campaign editor level Treema status view formatting.	2014-12-29 12:47:53 -08:00
Nick Winter	c54fd5ab4b	Moved editors from PUT to POST so that version saving behavior is preserved and admins can PUT without saving new versions.	2014-12-29 09:14:43 -08:00
Nick Winter	d85bf8d59a	Fixed disabled level logic.	2014-12-29 08:46:02 -08:00
Omar S.	d67a329cb9	Added submitter	2014-12-29 10:51:14 -05:00
Omar S.	a9875fd19d	More translations ... Up to 591 + some ones that were missing	2014-12-29 10:40:29 -05:00
Imperadeiro98	3b8fdecc18	Fixed a mistake	2014-12-29 15:38:26 +00:00
Ivan Milanov	0c43b21078	Added more translations	2014-12-29 14:33:06 +01:00
Imperadeiro98	6249427103	Added 'mk-MK' to diplomat page	2014-12-29 00:03:09 +00:00
Nick Winter	664003ec4a	Propagated i18n.	2014-12-28 15:28:19 -08:00
Nick Winter	913de5dc8c	Additional tweak for #2005.	2014-12-28 15:26:04 -08:00
Nick Winter	aba154fad9	Merge pull request #2004 from SuperPranx/master ... Initial translation for Macedonian(mk_MK)	2014-12-28 15:25:58 -08:00
Nick Winter	f5678bd536	Merge pull request #2005 from Imperadeiro98/master ... Fixed a issue	2014-12-28 15:20:53 -08:00
Nick Winter	448acbb6b5	Fixed a problem choosing heroes from within levels with new level options loading.	2014-12-28 15:18:34 -08:00
Imperadeiro98	9018e41c2c	Fixed a issue	2014-12-28 22:43:08 +00:00
Ivan Milanov	b371de9503	Commented out non-translated parts	2014-12-28 23:23:20 +01:00
Nick Winter	588e0266af	Fixed ordering problem I introduced with /play/ladder routes.	2014-12-28 13:55:20 -08:00
Nick Winter	fa9f3e2a61	Fixed typo in HeroVictoryModal.	2014-12-28 13:53:50 -08:00
Nick Winter	fb948b19cd	Merged it.coffee and uncommented section headers.	2014-12-28 13:28:50 -08:00
Nick Winter	afa9b6c544	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-12-28 13:25:27 -08:00
Nick Winter	744d30737e	Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents.	2014-12-28 13:25:20 -08:00
Imperadeiro98	12b5969fde	Merge pull request #1997 from MinecraftWidget/patch-1 ... Edits and Additions	2014-12-28 20:58:21 +00:00
Imperadeiro98	cef4a09abe	Merge pull request #2002 from osanseviero/patch-6 ... Translated up to 470	2014-12-28 20:54:21 +00:00
Ivan Milanov	03e199c127	Translated lines 19-50 ... Only exception is the translation for 'nav.code' because I require further clarification on the context in which it is used here	2014-12-28 21:06:54 +01:00
Nick Winter	a9c1846e41	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-12-28 11:15:17 -08:00
Ivan Milanov	4b59f8e0c8	Initial translate of 'home' section (4-16)	2014-12-28 20:08:47 +01:00
Ivan Milanov	af2795b4e7	Created mk-MK.coffee ... The contents were copied from 'en.coffee'. This is the initial file with no translations, just the description is set to it's proper value. Once the translation is done the comment "Translation not finished (work in progress)", should be removed.	2014-12-28 19:13:44 +01:00
Ivan Milanov	dbf2790ae9	Added 'mk-MK' description to locale.coffee	2014-12-28 19:05:30 +01:00
Omar S.	d676bc1ea3	Translated up to 470	2014-12-28 12:24:48 -05:00
nixel2007	45fe2ca9a2	Update ru.coffee ... More translations after propagination	2014-12-28 01:32:18 +03:00
Nick Winter	b4341ad46c	Merge branch 'feature/campaign-editor'	2014-12-27 11:03:51 -08:00
Imperadeiro98	2f1f4d8594	Update pt-PT.coffee	2014-12-27 18:50:58 +00:00
Nick Winter	d9265c6624	Propagated i18n.	2014-12-27 10:39:44 -08:00
Imperadeiro98	b91f8eb927	Fixed last merge issues	2014-12-27 18:27:43 +00:00
MinecraftWidget	eb60d1b186	Minor Additions	2014-12-27 11:12:24 -07:00
Omar S.	1b0ab789ca	Checked up to line 340 ... Checked the translations of the next lines and added one tip translation	2014-12-27 10:35:46 -05:00
Imperadeiro98	598ca7d2ad	Merge pull request #1995 from mileshayter/patch-1 ... Update de-AT.coffee	2014-12-27 11:48:01 +00:00
MinecraftWidget	b4f48764ff	More Additions	2014-12-26 23:47:39 -07:00
MinecraftWidget	af7dbfb9ca	Edits and Additions	2014-12-26 22:59:28 -07:00
Omar S.	b91f9e8e65	Checked and improved all up to timeunits (line 210) ... I will continue tomorrow. I have changed some lines and added somemore	2014-12-26 23:29:24 -05:00
mileshayter	4719818dad	Update de-AT.coffee ... Some translation done, will try to continue ASAP :)	2014-12-26 22:38:55 +01:00
Imperadeiro98	9fbd1076f9	Fixed a link	2014-12-26 18:02:40 +00:00
Imperadeiro98	4dbdf60f10	Fixed link	2014-12-26 18:01:57 +00:00
flauta	4e93b3628d	Update it.coffee	2014-12-26 17:49:04 +01:00
flauta	8edb13b18d	Update it.coffee ... una piccola parte delle stringhe delle schermate iniziali, come esperimento	2014-12-26 15:29:18 +01:00
Martin005	ca810dd142	Update cs.coffee ... Fixed missing space.	2014-12-26 12:17:25 +01:00
Imperadeiro98	f6576d3984	Merge pull request #1989 from nixel2007/master ... Update ru.coffee	2014-12-26 10:32:49 +00:00
Martin005	275b66eb07	Update cs.coffee ... Finally translate ALL of the strings!!! *celebrate time* :)	2014-12-26 01:21:23 +01:00
Nick Winter	b116321deb	Tested and cleaned up comment detection for space disablement sensitivity.	2014-12-24 12:37:25 -08:00
Nick Winter	c7eadb5670	Merge branch 'patch-4' of git://github.com/rishiloyola/codecombat into rishiloyola-patch-4	2014-12-24 12:24:27 -08:00
nixel2007	b3bced93ac	Update ru.coffee	2014-12-24 22:57:54 +03:00
nixel2007	917a61b310	Revert "Fixed i18n-coverage bug" ... This reverts commit 97cdb76b82.	2014-12-24 22:15:52 +03:00
Nick Winter	1c1f2008a5	Now able to suggest required items for purchase before level start.	2014-12-24 11:01:50 -08:00
nixel2007	d74a86d06a	Merge remote-tracking branch 'upstream/master'	2014-12-24 15:19:43 +03:00
Nick Winter	f361674fb4	Enabling new levels for playtesting.	2014-12-23 17:14:59 -08:00
Nick Winter	f0826c865e	Preparing new campaign levels for migration to new campaign editor.	2014-12-23 17:14:35 -08:00
Nick Winter	f17b3bd03b	Fixed indentation and punctuation for superpower tip.	2014-12-23 07:57:07 -08:00
Nick Winter	48603e5bc8	Merge pull request #1985 from osanseviero/patch-3 ... New tip	2014-12-23 07:56:19 -08:00
Omar S.	9a30c35a3b	New tip ... Added superpower tip	2014-12-23 09:54:57 -05:00
Omar S.	f48c2b0def	New tip ... Added superpower tip	2014-12-23 09:54:31 -05:00
Scott Erickson	96c8e035cf	Added a CampaignLevelView stub that appears when you double click a level node or one of its children on the treema.	2014-12-23 09:42:24 -05:00
Scott Erickson	b567e737cd	Tweaked campaign editor styling.	2014-12-23 09:19:24 -05:00
Scott Erickson	e6c914f443	Tweaked campaign editor styling.	2014-12-23 09:19:08 -05:00
Scott Erickson	1bb76d5902	Fixed shadow placements.	2014-12-23 09:12:41 -05:00
Imperadeiro98	31ed540964	Merge pull request #1983 from tpai/patch-1 ... Update zh-HANT.coffee	2014-12-23 09:06:33 +00:00
tonypai	30eb96f151	Update zh-HANT.coffee	2014-12-23 16:01:33 +08:00
Nick Winter	5e3ae981d7	Merge pull request #1981 from Lynxbob/master ... Added 3 new name lists and 10 new names	2014-12-22 17:40:51 -08:00
Branden Webb	eb3e0621f2	Added Sand Yak name list, Ogre Scout M name list, and Ogre Scout F name list. Also added 10 names, 5 for Sand Yak, 3 for Ogre Scout M, and 2 for Ogre Scout F.	2014-12-22 20:07:22 -05:00
Omar S.	3ed3dd00fa	Added two names	2014-12-22 18:19:57 -05:00
Scott Erickson	d18260c20c	Merge branch 'master' into feature/campaign-editor	2014-12-22 16:39:07 -05:00
Scott Erickson	0bdec68cfc	Set up a save button.	2014-12-22 16:21:57 -05:00
George Saines	116feb5bea	turning off realtime playback on the riddling kithmaze	2014-12-22 11:11:43 -08:00
Imperadeiro98	72e426c0e0	Fixed another link	2014-12-22 18:16:06 +00:00
Scott Erickson	0dd2d9efbd	Handled merge conflict.	2014-12-22 12:33:52 -05:00
Scott Erickson	0d45e4a889	Set up the CampaignEditorView to trigger the CampaignView to re-render when things change.	2014-12-22 12:06:17 -05:00
Scott Erickson	1db8284236	When you select a level on the CampaignView while in edit mode, it selects the level in the CampaignEditView.	2014-12-22 11:09:58 -05:00
Scott Erickson	a31b385a4d	Moving levels and adjacent campaign links around in the CampaignView saves the new position to the CampaignEditorView.	2014-12-22 10:54:07 -05:00
Scott Erickson	efc83b88d0	Hooked up the CampaignView to show adjacent campaigns based on the data.	2014-12-22 10:29:29 -05:00
Rishi	364f40274d	Update SpellView.coffee ... hey i made changes. due to some error in downloading your data base i cannot test it. but check it . i think it will work .	2014-12-22 18:06:32 +05:30
Imperadeiro98	2bca94161e	Fixed a link	2014-12-22 11:22:06 +00:00
Nick Winter	e153a7ecce	Added some more world rand shortcut functions. Fixed a bug with toggling collision in level editor. Updated CommunityView contributor class i18n linking.	2014-12-21 21:38:12 -08:00
Matt Lott	e7c626656e	No-cache User fetch in hero victory ... After earning achievements. On IE, this call results in a cache hit, so the User object was never updated with the sweet sweet loot you just earned. Like a sword you need for True Names.	2014-12-21 21:14:38 -08:00
Imperadeiro98	8da578e106	Update en.coffee	2014-12-21 21:46:45 +00:00
Imperadeiro98	393860ffa4	Update en.coffee	2014-12-21 21:30:15 +00:00
Imperadeiro98	0c00f9f0c1	Delete contribute_nav.jade	2014-12-21 21:09:52 +00:00
Imperadeiro98	5d9e303fb1	Added Martin005	2014-12-21 20:53:43 +00:00
Imperadeiro98	2b0757810c	Merge pull request #1973 from uaMithril/patch-3 ... Update uk.coffee	2014-12-21 20:11:47 +00:00
Imperadeiro98	0cbf76bc36	Merge pull request #1972 from uaMithril/patch-2 ... Update uk.coffee	2014-12-21 20:09:58 +00:00
Imperadeiro98	81eb028025	Merge pull request #1971 from tpai/patch-1 ... Update zh-HANT.coffee	2014-12-21 20:09:14 +00:00
Imperadeiro98	0c01a4ed8c	Merge pull request #1964 from Martin005/patch-5 ... Update cs.coffee	2014-12-21 20:02:27 +00:00
Mithril	837b62ee9d	Update uk.coffee	2014-12-21 13:51:18 +02:00
Mithril	7ad505252b	Update uk.coffee	2014-12-21 13:03:48 +02:00
tonypai	e815dff1de	Update zh-HANT.coffee ... Hi, I've already sign the CLA, and this is my PR. :)	2014-12-21 16:13:40 +08:00
Nick Winter	e8d185a860	Embedding level completion checklist inside the level editor.	2014-12-20 20:01:07 -08:00
Nick Winter	f26b43f8a5	Fixed floor y scaling. Fixed issues with client-side disabling of new model / fork / revert population actions without permissions. Ameliorated some ensure_comprehensions warnings.	2014-12-20 16:02:41 -08:00
Nick Winter	8528f5039b	Linking to FAQ from contact page. Now showing all Components in level editor, not just ones that are present in the level.	2014-12-20 14:40:28 -08:00
Nick Winter	e4c6d07a4a	Added keyboard shortcuts to move, resize, minor-rotate, and toggle collision for Thangs in the level editor. Fixed some issues with stretchy Thangs and collision shapes not updating. Fixed #1699. Fixed #57. Colored collision overlays according to collision categories.	2014-12-20 13:39:51 -08:00
Martin005	eed3043a6d	Update cs.coffee	2014-12-20 19:00:56 +01:00
Imperadeiro98	a52bf08792	Fixed links	2014-12-20 09:32:59 +00:00
Imperadeiro98	6ebf25ad15	Linked community page to new i18n	2014-12-20 09:28:56 +00:00
Imperadeiro98	bd5184c23b	Update pt-PT.coffee	2014-12-20 09:12:31 +00:00
Nick Winter	08cb87c84d	Automatically take screenshots when submitting contact form from level view.	2014-12-19 18:37:42 -08:00
Nick Winter	0041ffe423	Propagated i18n.	2014-12-19 15:36:16 -08:00
Nick Winter	2df1318e1b	Hooked up i18n for redesigned contribute view.	2014-12-19 15:35:18 -08:00
Scott Erickson	0cd85d7aba	Got the CampaignView mostly off the hardcoded data.	2014-12-19 16:46:01 -05:00
Imperadeiro98	4ca342c389	Fixed spacing	2014-12-19 20:46:34 +00:00
Imperadeiro98	560a3aaf44	Merge pull request #1940 from uaMithril/patch-1 ... Update uk.coffee	2014-12-19 20:45:19 +00:00
David Nagy	0c88f9f39c	Update hu.coffee	2014-12-19 20:18:08 +00:00
Scott Erickson	a742772b8f	Also added campaign view jade and sass file clones.	2014-12-19 13:06:20 -05:00
Scott Erickson	23da22a559	Added a new CampaignView, cloned from WorldMapView. Will migrate to using db data rather than hardcoded data.	2014-12-19 13:04:04 -05:00
Scott Erickson	59318b2f78	Merge branch 'master' into feature/campaign-editor	2014-12-19 12:54:11 -05:00
Nick Winter	d801ed61ce	Separating contact emails into premium subscriber support and basic general support.	2014-12-18 20:35:14 -08:00
George Saines	31fb5fe80e	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-12-18 16:31:33 -08:00
George Saines	9e88caf1e1	redesigned the contribute page	2014-12-18 16:31:30 -08:00
Matt Lott	f853259304	Updating help videos ... Moving dungeons-of-kithgard to Vimeo Adding original style for haunted-kithmaze	2014-12-18 14:04:48 -08:00
Matt Lott	f2835a998a	Add second kith maze help video	2014-12-18 12:05:10 -08:00
Matt Lott	7c87dc0c3a	Make spell palette help label a button	2014-12-18 00:19:40 -08:00
Matt Lott	70cd8aa20d	Update Vimeo embed player params	2014-12-17 23:59:59 -08:00
Matt Lott	9d4c3cc163	A/B Test video tutorial styles	2014-12-17 23:55:11 -08:00
Scott Erickson	b63b4d64da	More work on the CampaignEditorView. Data gets saved to models now.	2014-12-17 22:53:04 -08:00
Matt Lott	d494dc9c79	Add video tutorials to game guide	2014-12-17 22:26:36 -08:00
Nick Winter	fe0c89e433	Reverting 1167655f and 30ed0a0e to re-enable the analytics log handler.	2014-12-17 21:54:56 -08:00
Nick Winter	1b584ae72c	Some fixes for desert campaign options.	2014-12-17 19:37:57 -08:00
nemoyatpeace	0496c9338d	Update SpellView.coffee ... Fixed issue #1950 so attack defaults to enemy if player has findNearest or findNearestEnemy	2014-12-18 09:10:07 +08:00
Nick Winter	da72991260	A few misc tweaks for the new desert level options.	2014-12-17 12:42:42 -08:00
nixel2007	97cdb76b82	Fixed i18n-coverage bug ... Added analysis of the translation of all available properties	2014-12-17 23:21:54 +03:00
Imperadeiro98	d1e4a98981	Merge pull request #1947 from Martin005/patch-4 ... Update cs.coffee	2014-12-17 15:42:48 +00:00
Martin005	821f31f02e	Update cs.coffee	2014-12-17 12:19:17 +01:00
Fernando H. Crozetta	a248828493	Update pt-BR.coffee	2014-12-17 08:56:31 -02:00
Nick Winter	a98deb1ff8	Making item requiring smarter about which slots can be required for non-warriors.	2014-12-16 18:57:54 -08:00
Scott Erickson	1cc6a97e43	Added basic campaign view, working on campaign handlers.	2014-12-16 17:46:24 -08:00
Nick Winter	6e6ce6cd27	Added Minesweeper original.	2014-12-16 16:40:14 -08:00
Matt Lott	1167655faf	Disable internal event tracking ... Tracking down a server CPU issue.	2014-12-16 16:38:17 -08:00
Nick Winter	688a8dc624	Thangs can now respect custom Component colorization.	2014-12-16 12:59:39 -08:00
Imperadeiro98	31953660f4	Fixed some commented translations	2014-12-16 20:16:42 +00:00
Martin005	50058147ed	Update cs.coffee ... Adding some translations again, hopefully will do them all.	2014-12-16 21:05:50 +01:00
George Saines	9d72c37876	removing gradient	2014-12-16 11:41:07 -08:00
Nick Winter	17db7c111c	Merged zh-HANS.coffee again.	2014-12-16 10:49:01 -08:00
Nick Winter	79b3d8d1a2	Merged zh-HANS.coffee.	2014-12-16 10:47:48 -08:00
nixel2007	fcc5fb7537	Update ru.coffee ... problem_alert_help	2014-12-16 15:28:02 +03:00
Eric Shen	ec00b74c92	Update zh-HANS.coffee - account profile & employer	2014-12-16 15:57:23 +08:00
Matt Lott	f1d7fb5fbd	Add help button to problem alert	2014-12-15 15:11:27 -08:00
Mithril	6554800fbd	Update uk.coffee ... Added some translations	2014-12-16 00:38:55 +02:00
Matt Lott	eadde0590e	Turn off fast hero victory modal A/B test ... Didn’t make a difference in level completion, opting for no delay in showing the modal buttons.	2014-12-15 14:05:37 -08:00
Matt Lott	c76662c967	Log analytics events internally	2014-12-15 11:45:12 -08:00
Matt Lott	5817553d54	Remove virtual page view tracking ... Wasn’t useful, and distorts our GA real page view analytics.	2014-12-15 10:28:40 -08:00
Rubiconline	52853a31b5	Update fr.coffee ... Only minor corrections	2014-12-14 21:06:06 +01:00
Igzok	d6642d83d2	Update fr.coffee	2014-12-14 18:48:42 +00:00
Rubiconline	37476e7849	Update fr.coffee	2014-12-14 19:30:44 +01:00
Nick Winter	72d4cad858	Fixed analytics tracking a whole level instead of just its name in one case. Fixed a Sarven typo.	2014-12-14 07:54:50 -08:00
Nick Winter	68678a6057	Add upcoming desert levels to the world map.	2014-12-13 19:43:12 -08:00
Nick Winter	3b2bebf427	Ended HoC sale.	2014-12-13 09:00:33 -08:00
nixel2007	6d480820f3	Update ru.coffee	2014-12-13 17:45:24 +03:00
Nick Winter	dec11d77f5	Uncommented some zh-HANT section headers.	2014-12-13 06:32:59 -08:00
Nick Winter	62ad7a3d10	Merge pull request #1927 from Imperadeiro98/master ... Update pt-PT.coffee	2014-12-13 06:30:52 -08:00
jibaigao	77202c9bd7	Update zh-HANT.coffee	2014-12-13 13:13:35 +01:00
Imperadeiro98	2c6756675d	Update pt-PT.coffee	2014-12-13 08:58:45 +00:00
Nick Winter	4d347e0d5f	Propagated i18n.	2014-12-12 16:13:18 -08:00
Nick Winter	719ca503fb	Merge pull request #1925 from jibaigao/patch-1 ... Update zh-HANT.coffee	2014-12-12 16:12:09 -08:00
Nick Winter	25b91f900d	Merge pull request #1926 from Imperadeiro98/master ... Internationalized more stuff	2014-12-12 16:11:03 -08:00
Scott Erickson	b0de331a10	Shored up stripe transaction payment defences to try and fix #1906.	2014-12-12 15:27:58 -08:00
Imperadeiro98	a6653501e5	Update en.coffee	2014-12-12 22:35:22 +00:00
Imperadeiro98	f98469122a	Update i18n-edit-model-view.jade	2014-12-12 22:35:16 +00:00
Imperadeiro98	9c911ce149	Update thang-type-edit-view.jade	2014-12-12 22:32:19 +00:00
Imperadeiro98	e609ea7c5c	Update edit.jade	2014-12-12 22:25:17 +00:00
jibaigao	023f150b5a	Update zh-HANT.coffee	2014-12-12 23:16:30 +01:00
Imperadeiro98	3ab5ee22c9	Update versions-modal.jade	2014-12-12 22:15:10 +00:00
Imperadeiro98	72485eb5a9	Update patches.jade ... Couldn't figure out how to handle "Pending", "Accepted", etc.	2014-12-12 22:04:21 +00:00
Imperadeiro98	237b022147	Update edit.jade	2014-12-12 21:43:20 +00:00
Scott Erickson	e5c5f0ba04	Fixed Karma client test runner.	2014-12-12 13:12:35 -08:00
Nick Winter	71ad9248ca	Merge pull request #1923 from Imperadeiro98/master ... Update pt-PT.coffee	2014-12-12 10:01:31 -08:00
Imperadeiro98	93e8691291	Update pt-PT.coffee	2014-12-12 16:55:08 +00:00
nixel2007	050de32163	Update ru.coffee	2014-12-12 19:51:49 +03:00
Nick Winter	f04bb3d030	Propagated i18n.	2014-12-12 08:40:57 -08:00
Imperadeiro98	091f80daff	Update en.coffee	2014-12-12 16:33:16 +00:00
Imperadeiro98	a793339ee1	Update contact.jade	2014-12-12 16:28:56 +00:00
Nick Winter	b897055618	Added translation key for subscription status label.	2014-12-12 07:27:28 -08:00
Nick Winter	5d030a96ac	Fixed some indentation typos in es-419.coffee.	2014-12-12 06:59:44 -08:00
Nick Winter	d90fb60eb2	Merge pull request #1910 from FedericoTomas/patch-5 ... Updated..	2014-12-12 06:58:01 -08:00
Nick Winter	ea22264d68	Fixed some indentation typos in de-CH.coffee.	2014-12-12 06:57:13 -08:00
Nick Winter	31ded35a97	Merge pull request #1899 from LetsPlentendo/patch-1 ... Some more translations made...	2014-12-12 06:55:42 -08:00
Nick Winter	3941606912	Merge pull request #1913 from Rubiconline/patch-4 ... Update fr.coffee	2014-12-12 06:48:37 -08:00
Nick Winter	5a66a914eb	Temporarily turning off achievement popups in IE and synchronous multiplayer sessions in PlayLevelView for non-admins due to bugginess.	2014-12-12 06:40:32 -08:00
Matt Lott	d17cd6a2c1	No multiplayer in game-menu for non-ladder levels ... This is a point fix to prevent single player level sessions from setting multiplayer=true, which results in a bus.connect() in playlevelview, which can result in a Firebase blocking error.	2014-12-11 22:05:18 -08:00
Matt Lott	0c81942c71	2nd HoC sub sale	2014-12-11 18:39:03 -08:00
Rubiconline	7736ce3f98	Update fr.coffee	2014-12-11 23:26:49 +01:00
FedericoTomas	ae0917511e	Updated.. ... I check it all on Microsoft World, the archive had a lot of wrong translations... i corrected a lot. Pd: Someone use google translate to edit the archive, and google translate sucks...(at least long sentences)	2014-12-11 19:09:45 -03:00
Nick Winter	2d7ac81221	Merge pull request #1907 from nykkole/patch-2 ... Update de-DE.coffee	2014-12-11 12:17:51 -08:00
Nick Winter	34bb14935a	Merge pull request #1908 from fcrozetta/patch-2 ... Update pt-BR.coffee	2014-12-11 12:17:21 -08:00
jibaigao	759a0675ad	Update zh-HANT.coffee	2014-12-11 21:12:50 +01:00
Fernando H. Crozetta	9c4c320542	Update pt-BR.coffee ... More text translated to PT-BR	2014-12-11 17:55:10 -02:00
nykkole	6096a4eef3	Update de-DE.coffee ... Translated some sentences.	2014-12-11 11:45:49 -08:00
Scott Erickson	0b81796333	Created the Campaign foundation: schema, model, handler.	2014-12-11 11:26:28 -08:00
Imperadeiro98	2a7d9eb934	Update pt-PT.coffee	2014-12-11 15:29:02 +00:00
Nick Winter	1ef58bcfce	Propagated i18n.	2014-12-11 07:02:08 -08:00
Nick Winter	ce36fa461f	Fixed i18n typo that Imperadeiro98 noticed.	2014-12-11 06:57:58 -08:00
Nick Winter	0bed8dc460	Merged es-419.coffee.	2014-12-11 06:49:26 -08:00
Nick Winter	d6d9888811	Merged ru.coffee.	2014-12-11 06:41:49 -08:00
Nick Winter	52400c8f18	Merged de-DE.coffee.	2014-12-11 06:37:01 -08:00
Nick Winter	0e5de952e3	Activated a few translations for #1896.	2014-12-11 06:34:54 -08:00
Nick Winter	629fe6188e	Merge pull request #1896 from AtaZh/patch-1 ... Update uk.locale	2014-12-11 06:31:31 -08:00
Nick Winter	01f31f5007	Merge pull request #1894 from Rubiconline/patch-3 ... Update fr.coffee	2014-12-11 06:30:10 -08:00
Nick Winter	21870a0ce3	Added some indentation for #1903.	2014-12-11 06:29:33 -08:00
Nick Winter	d129f29d05	Merge pull request #1903 from FedericoTomas/patch-3 ... Update es-419.coffee	2014-12-11 06:27:34 -08:00
Nick Winter	4cfff26b39	Uncommented some hu.coffee section headers for #1891.	2014-12-11 06:25:44 -08:00
Nick Winter	e7bcc61f76	Merge pull request #1891 from divaDseidnA/patch-5 ... Update hu.coffee	2014-12-11 06:23:54 -08:00
Nick Winter	9f909f28cf	Merged de-DE.coffee	2014-12-11 06:22:47 -08:00
Nick Winter	46b2906151	Merge pull request #1887 from nixel2007/master ... ru_RU.coffee. account_profile, ladder_prizes, employers, admin, misc	2014-12-11 06:16:22 -08:00
Nick Winter	bfbcdd4be6	Merge pull request #1886 from Imperadeiro98/patch-1 ... Update pt-PT.coffee	2014-12-11 06:15:44 -08:00
Nick Winter	7b9f4bcbc4	Merged pt-BR.coffee.	2014-12-11 06:15:07 -08:00
Nick Winter	f73bf73344	Merged zh-HANS.coffee.	2014-12-11 06:09:23 -08:00
jmigual	4554514532	Added some translations ... Added some translations and fixed spelling errors.	2014-12-11 12:59:08 +01:00
nixel2007	ae1aca8917	update ru.coffee. Line-sync to en, more translation	2014-12-11 13:55:01 +03:00
Nick Winter	e37c1afc17	Properly ended HoC sale price.	2014-12-10 21:24:42 -08:00
Nick Winter	dae39321e2	Properly ended HoC sale price.	2014-12-10 21:21:00 -08:00
Matt Lott	d4cfaac7e5	Sub price test	2014-12-10 16:05:55 -08:00
FedericoTomas	7aae2096de	Update es-419.coffee	2014-12-10 19:22:52 -03:00
Scott Erickson	02953d0e6c	Set up a subscription page with subscription info and the subscribe button, taking that logic out of the payments page.	2014-12-10 13:42:12 -08:00
Nick Winter	84cdc5d150	Undisabled new adventurer levels.	2014-12-10 11:28:06 -08:00
Scott Erickson	e870de6146	Tweaked SpriteParser to be smarter about finding root MovieClips and shifting their bounds.	2014-12-10 11:22:47 -08:00
Nick Winter	87c34e81c6	Using new border image popover backgrounds.	2014-12-10 11:00:52 -08:00
Scott Erickson	94a400bfd8	Hero icons now show up on the world map on levels where you can unlock them.	2014-12-10 10:45:11 -08:00
Nick Winter	f8661c4a96	Added the lock image, actually.	2014-12-10 10:40:10 -08:00
Nick Winter	239f94697f	Fixed IE hero lock image.	2014-12-10 10:37:57 -08:00
Nick Winter	d51db43823	Added desert campaign.	2014-12-10 10:00:52 -08:00
Nick Winter	2b0231e95f	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-12-10 09:45:34 -08:00
Scott Erickson	bf80307142	Put in new, smaller versions of the world map and loading wings for smaller screens.	2014-12-10 09:45:00 -08:00
LetsPlentendo	9fe8e80fba	Some more translations made...	2014-12-10 14:12:35 +01:00
kisik21	da843f2d57	Fixed ru.coffee ... fixed error: coffeescript_error at line 627	2014-12-10 16:05:04 +03:00
kisik21	6a13c9b0f8	Update ru.coffee ... Перевел еще немного. Можете кидаться в меня тапками, но большинство переведенного находится в разделе найма работников. Большая часть остального уже переведена. Вот какой должна быть командная работа! Translated more things. You can kill me, but big part of this update is in recruiting dashboard. Other things are mostly already translated. That's what the team work should be!	2014-12-10 15:55:34 +03:00
nixel2007	83033287ad	Update DiplomatView.coffee ... Added myself as ru-diplomat.	2014-12-10 13:20:54 +03:00
nixel2007	72d81630c4	update ru ... employers, admin blocks, misc	2014-12-10 13:15:55 +03:00
Nick Winter	b65bc2dd39	Show cool victory text image for players with language defaulted to English.	2014-12-09 19:23:11 -08:00
nykkole	d9a96c3812	Update de-DE.coffee ... Translated some sentences	2014-12-09 17:17:57 -08:00
George Saines	40582e97bd	adding desert map	2014-12-09 16:16:55 -08:00
Matt Lott	fbece1ddd0	Only show sync pvp UI to admins ... Sync PVP isn’t ready for primetime.	2014-12-09 14:30:50 -08:00
Nick Winter	33ea572cdf	You know, actually call the method that starts simulating.	2014-12-09 14:21:55 -08:00
Nick Winter	a9247c5018	Decreased amount of unintended menu-button-click sounds.	2014-12-09 14:01:03 -08:00
Matt Lott	8df3eed824	Add revenue tracking to analytics	2014-12-09 13:57:04 -08:00
Scott Erickson	46f7bbaaf5	Fixed client tests. Also updated mock-ajax to the latest version, carrying over my own tweaks.	2014-12-09 13:41:44 -08:00
Nick Winter	8791eded2c	Starting to add Patrol Buster to the world map.	2014-12-09 12:38:58 -08:00
AtaZh	4a5f2f0630	Update uk.locale ... Translated several strings, put some commas, capitalized letter 'в' in a polite form 'Ви' (=You), made some other corrections. Translated but didn't uncomment some unclear phrases for me. Hope, I didn't delete smth on the go. Would be glad to be helpful.	2014-12-09 22:07:59 +02:00
jonidimo	d9945c03ba	Update es-419.coffee ... Add some new lines in spanish	2014-12-09 17:02:58 -03:00
Rubiconline	2c92286e46	Update fr.coffee	2014-12-09 20:20:40 +01:00
Nick Winter	7651eaf6cc	Fixed A/B test to fire with default English language.	2014-12-09 11:15:03 -08:00
Nick Winter	6f437d11b1	Some work on making simulation unstoppable.	2014-12-09 09:00:34 -08:00
David Nagy	aec43c086b	Update hu.coffee	2014-12-09 14:46:58 +00:00
Nick Winter	a97baa2207	HoC sale.	2014-12-09 06:06:14 -08:00
Nick Winter	5365a9fdf1	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-12-09 05:38:28 -08:00
fcrozetta	0c890e6f6d	Some translation (pt-BR)	2014-12-09 11:35:30 -02:00
nykkole	9f97c3feb9	Update de-DE.coffee ... Translated some sentences. For the lines 378, 379, 610-613 it might be helpful for the translations to get a bit of context. Thank you! nykkole	2014-12-09 00:05:10 -08:00
Matt Lott	6c60f70914	Update subscribe modal copy A/B test	2014-12-09 00:04:07 -08:00
Matt Lott	1aff798c5e	A/B Test alternate subscribe modal copy	2014-12-08 23:43:52 -08:00
Nick Winter	58d549fa8a	Styled log out button on world map.	2014-12-08 18:49:45 -08:00
Nick Winter	595ca17c05	Make sessions a little more likely to save if we're not in production.	2014-12-08 16:25:21 -08:00
Matt Lott	a21a2f7c8f	Add tracking for FB and G+ signups	2014-12-08 15:00:49 -08:00
Matt Lott	b69bdfd360	A/B Test quick victory save/continue buttons ... Fixing typo in hu.coffee	2014-12-08 14:24:33 -08:00
Nick Winter	499666d7b3	Starting to add first three desert levels.	2014-12-08 13:59:13 -08:00
David Nagy	bbd72c568b	Update hu.coffee	2014-12-08 21:55:38 +00:00
Matt Lott	b9adcd1ab2	Add signup tracking to victory modal	2014-12-08 13:45:01 -08:00
PaulaThoelen	b2196feb1c	Update nl-BE.coffee	2014-12-08 22:30:07 +01:00
nixel2007	9a302fe3d4	ru. account_profile, ladder_prizes	2014-12-09 00:19:26 +03:00
Matt Lott	3fa95b698d	Add signup tracking to game menu signup tab	2014-12-08 13:13:30 -08:00
Imperadeiro98	7e02e636e0	Update pt-PT.coffee	2014-12-08 19:56:41 +00:00
Matt Lott	fcafe5e249	Add a bit more Tracker debug info	2014-12-08 11:34:41 -08:00
Nick Winter	c42385637f	Fixed some typos with propagated i18n.	2014-12-08 11:17:55 -08:00
Nick Winter	f3f078f9e8	Propagated i18n.	2014-12-08 11:13:33 -08:00
Nick Winter	b3b3e250a1	Merge pull request #1877 from felipedelta0/patch-1 ... Update pt-BR.coffee	2014-12-08 11:10:32 -08:00
Nick Winter	5ccd5d6d24	Got rid of some memory leaks in the InventoryModal. Fixed fr subscribe section header.	2014-12-08 11:09:04 -08:00
Rubiconline	26c46d025b	Update fr.coffee ... Extra translations	2014-12-08 19:51:49 +01:00
Nick Winter	713645e3a9	Uncommented items section header to realize a section of hu translations.	2014-12-08 10:48:59 -08:00
Nick Winter	04858101a0	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-12-08 10:46:51 -08:00
Nick Winter	0c3c6fb181	Merge pull request #1884 from nixel2007/master ... Update ru. lines-sync and small fixes.	2014-12-08 10:46:41 -08:00
Nick Winter	52d55449b5	Merge pull request #1883 from carteluo/patch-1 ... Update es-419.coffee	2014-12-08 10:46:08 -08:00
Nick Winter	4f10bcb235	Merge pull request #1881 from divaDseidnA/patch-3 ... Update hu.coffee	2014-12-08 10:45:48 -08:00
Nick Winter	fc84003883	Merge pull request #1878 from divaDseidnA/patch-1 ... Update DiplomatView.coffee	2014-12-08 10:45:10 -08:00
Nick Winter	6bc9d6e7cc	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-12-08 10:42:31 -08:00
Nick Winter	39aa34e426	Updated teacher's page description now that core levels are free again.	2014-12-08 10:41:56 -08:00
nixel2007	8508118dcb	Merge remote-tracking branch 'upstream/master'	2014-12-08 21:40:04 +03:00
nixel2007	fac996e1e2	Update ru. lines-sync and small fixes.	2014-12-08 21:39:26 +03:00
Matt Lott	2da1a94ff1	Add GA page view tracking for signup finish	2014-12-08 10:34:36 -08:00
nixel2007	73731339be	Merge remote-tracking branch 'upstream/master'	2014-12-08 21:13:40 +03:00
nixel2007	c4cd59f9ae	ru	2014-12-08 21:12:56 +03:00
carteluo	5ac0c26b57	Update es-419.coffee ... In this context "About" is better translated as "Acerca" instead of "Sobre". (Line 31)	2014-12-08 13:30:46 -04:30
David Nagy	ba2fa04080	Update hu.coffee	2014-12-08 15:23:19 +00:00
Nick Winter	d5f953ae4f	Getting rid of indexes on employers and candidates.	2014-12-08 07:07:29 -08:00
Nick Winter	d9b116959f	Cleaned up a bit of indentation in hu.coffee.	2014-12-08 06:59:52 -08:00
Nick Winter	a0c6ba9d7e	Merge pull request #1880 from divaDseidnA/patch-2 ... Update hu.coffee	2014-12-08 06:57:31 -08:00
Nick Winter	cb54e08b9b	Reducing some writes to try to help us scale up.	2014-12-08 06:56:27 -08:00
David Nagy	535b97e19f	Update hu.coffee	2014-12-08 14:56:17 +00:00
Maks Lyashuk	390b6ab410	Ukrainian list of contributors update	2014-12-08 16:37:09 +02:00
Nick Winter	74b426ffbf	Fixed #1875.	2014-12-08 06:24:59 -08:00
fcrozetta	a5b053c87a	Revert "Update pt-BR.coffee" ... This reverts commit 869e27965f.	2014-12-08 12:14:23 -02:00
David Nagy	b8c1c37f5a	Update DiplomatView.coffee	2014-12-08 13:59:29 +00:00
Nick Winter	3cfa837327	Merge pull request #1873 from Imperadeiro98/patch-1 ... Update payments-view.jade	2014-12-08 05:57:59 -08:00
Nick Winter	32c75e1617	Merge pull request #1872 from ImmortalJoker/patch-3 ... Update uk.coffee	2014-12-08 05:57:18 -08:00
Nick Winter	43b9975d74	Merge pull request #1870 from Rarst/patch-1 ... Translated strings in ladder section to Ukrainian	2014-12-08 05:55:57 -08:00
felipedelta0	d7e055e756	Update pt-BR.coffee	2014-12-08 11:54:36 -02:00
Fernando H. Crozetta	869e27965f	Update pt-BR.coffee ... Alterações para tradução para PT-BR	2014-12-08 09:49:04 -02:00
Imperadeiro98	9655d6992e	Update en.coffee	2014-12-08 08:52:14 +00:00
Imperadeiro98	a96cd4f3c0	Update payments-view.jade	2014-12-08 08:50:12 +00:00
Krasnov Ehor	6860419352	Update uk.coffee	2014-12-08 10:30:40 +02:00
Eric Shen	7ad855b1b5	Update zh-HANS.coffee ... "account_profile" Simplified Chinese translation part 1 - 20141208	2014-12-08 16:12:13 +08:00
Matt Lott	8f5e82c54a	Update subscribe copy ... To be more inline with free track + subscription practice/bonus levels.	2014-12-07 23:53:04 -08:00
Matt Lott	fee328212d	Add missing signup tracking data ... And add level to subscription tracking data where appropriate.	2014-12-07 22:44:20 -08:00
Matt Lott	3deef7f5da	Turning off signup title and description A/B tests ... These have been on a long time. Using short title and no description. Data from Mixpanel: Description on: no 42.09 yes 41.91 Title length: short 42.26 long 41.74	2014-12-07 21:32:09 -08:00
Nick Winter	7854d6bf5a	Fixed #1868. Fixed #1846. Made sure that home view slogan always fits in all languages.	2014-12-07 20:17:22 -08:00
Nick Winter	4a659903fe	Started A/B test for whether the AnnouncesAction and take-damage audio help.	2014-12-07 19:39:23 -08:00
Nick Winter	346ace6ac3	Fixed goals not showing up when reloading level.	2014-12-07 19:39:23 -08:00
Matt Lott	06367d106b	IE8 unsupported message ... Had to go low-tech. IE8 doesn’t make it far enough for a nicely styled homepage with unsupported message.	2014-12-07 18:56:59 -08:00
Nick Winter	2278e28c42	Hid tooltip arrow for game menu controls.	2014-12-07 18:05:12 -08:00
Nick Winter	5d1a34519b	Fixed up our headings font family fallback.	2014-12-07 17:57:57 -08:00
Nick Winter	01c6709c36	Implemented George's WorldMapView user status line design.	2014-12-07 16:55:08 -08:00
Nick Winter	ac4a252a5e	Fixed some border images in Firefox, and hopefully in other browsers.	2014-12-07 15:51:32 -08:00
Nick Winter	1ba57c7ae1	Fixed issues with gems prompt not laying out properly from item store details view.	2014-12-07 15:29:42 -08:00
Matt Lott	343ad28761	Fix IE9 missing console object ... Debugging IE9 without debugging tools, when the debugging tools are kind of the problem. Fun.	2014-12-07 15:24:15 -08:00
Nick Winter	795e58778c	Fixed some problems in InventoryModal with unequipped items not loading their images.	2014-12-07 15:14:43 -08:00
Nick Winter	08a5f70fb1	Fixed wrong item showing up selected after an item is bought from inventory.	2014-12-07 15:05:39 -08:00
Nick Winter	9f0ae9ff09	Ditched dependency on index 0 as first unlocked level, instead explicitly granting Dungeons of Kithgard.	2014-12-07 14:57:23 -08:00
Nick Winter	774d366d96	Fixed error padding issue on AuthModal.	2014-12-07 14:37:13 -08:00
Nick Winter	6880a9621e	Fixed overeager modal selection on PlayHeroesModal.	2014-12-07 14:32:23 -08:00
Nick Winter	f50898ddf5	Ditched double game-menu-open sound when opening LevelSetupManager modals.	2014-12-07 14:27:34 -08:00
Nick Winter	7a9d09654d	Fixed ellipsis and font on item names in item details view when viewed from inventory modal.	2014-12-07 14:22:59 -08:00
Nick Winter	9054f70052	Implemented new victory modal design.	2014-12-07 14:03:11 -08:00
Scott Erickson	690a24cda9	Added static imagery to the world map to show better completed, started and premium levels.	2014-12-07 13:28:32 -08:00
Andrey Savchenko	f767d82af7	Translated strings in ladder section to Ukrainian	2014-12-07 21:41:07 +02:00
Maks Lyashuk	e583964d4d	Ukrainian translation update	2014-12-07 19:54:28 +02:00
Nick Winter	7bc38ef513	Merge pull request #1865 from richard-ma/master ... add some ZH-HANS translations	2014-12-07 08:08:49 -08:00
Richard Ma	9a4bce337d	add some ZH-HANS translations	2014-12-07 23:29:32 +08:00
nykkole	a8bcfd0cf5	Update de-DE.coffee	2014-12-07 03:57:40 -08:00
Nick Winter	12a109f146	Lowered ambient WorldMap volume. Hacked together ranger right-hand builder's hammer positioning for now.	2014-12-06 20:06:14 -08:00
Nick Winter	50624ca7bb	Hooked up some of the new voiceover sounds.	2014-12-06 18:45:15 -08:00
Nick Winter	f504490a37	Using big green button for account creation.	2014-12-06 18:18:42 -08:00
Nick Winter	d2d21db08b	Merge pull request #1862 from dmreinoso/patch-2 ... Update es-ES.coffee	2014-12-06 18:11:16 -08:00
Nick Winter	fbd0585379	Merge pull request #1861 from Imperadeiro98/master ... Removed more wizard i18n stuff	2014-12-06 18:10:15 -08:00
Nick Winter	d53d1d5ace	Merginated.	2014-12-06 17:28:11 -08:00
Nick Winter	9bde375dcc	Implemented new AuthModal design (sans green button for signup/login).	2014-12-06 17:27:02 -08:00
Diego Reinoso	01b11027d6	Update es-ES.coffee	2014-12-06 17:49:20 -05:00
Scott Erickson	83e1fe8bfe	InventoryModal loads item portraits when they are visible, getting rid of dozens of unnecessary web requests.	2014-12-06 14:21:56 -08:00
Scott Erickson	b976a11d65	Removed the module loader modal, replaced with a simple progress bar at the top of the screen.	2014-12-06 13:11:47 -08:00
Imperadeiro98	43c0b399ed	Update keyboard_shortcuts.jade	2014-12-06 20:52:30 +00:00
Imperadeiro98	9813e7584f	Removed more wizard i18n stuff ... I am not sure about line 278.	2014-12-06 20:41:01 +00:00
Scott Erickson	aac1aa379e	Set up stubs for future subscription sales.	2014-12-06 12:38:06 -08:00
Maks Lyashuk	bc4acde60f	Update and fix Ukrainian translation	2014-12-06 22:03:29 +02:00
Nick Winter	491a7ef456	Handling another error noted with Errorception. Updated minimum Firefox version to 25 based on seeing many (possibly non-critical) errors with it.	2014-12-06 12:02:48 -08:00
Nick Winter	708f0e543c	Fixed some issues I saw in Errorception. Stopped saving the session when the play state or frame changes.	2014-12-06 11:33:57 -08:00
Nick Winter	4348450a88	Removed old wizard_settings i18n keys. Propagated i18n.	2014-12-06 11:07:28 -08:00
Nick Winter	477ebb3c48	Fixed an error I saw in Errorception, and a Sass problem I saw in Webkit.	2014-12-06 11:05:52 -08:00
Nick Winter	bba78970ea	Deleted WizardSettingsView.	2014-12-06 10:23:26 -08:00
Scott Erickson	62cab1e76b	Admins can now give users discounts and free accounts from the MainAdminView view.	2014-12-06 10:05:52 -08:00
Nick Winter	f189eafe0c	Activated a few more Czech translations.	2014-12-06 09:51:05 -08:00
Nick Winter	dd0d58dcb5	Merge pull request #1855 from Martin005/patch-1 ... Update cs.coffee	2014-12-06 09:49:53 -08:00
Nick Winter	00e6ce5f45	Couldn't reproduce #1851, but this should work around the error if it happens again.	2014-12-06 09:46:37 -08:00
Nick Winter	175cdb5151	Now showing SubscribeModal before AuthModal for players who need to sign up before subscribing.	2014-12-06 09:35:13 -08:00
Nick Winter	e9ab0c1f4d	Merge pull request #1859 from dmreinoso/patch-1 ... Update es-ES.coffee	2014-12-06 09:09:24 -08:00
Nick Winter	7d2d2776c8	Restricted crude-glasses in more later levels so it'd be less likely to get them equipped after the wooden ones should be on your face.	2014-12-06 08:37:13 -08:00
dmreinoso	30d6db8ca4	Update es-ES.coffee	2014-12-06 10:31:00 -05:00
Nick Winter	061e52e181	Merge pull request #1858 from Imperadeiro98/master ... Update pt-PT.coffee	2014-12-06 07:21:08 -08:00
Nick Winter	560a8c7b72	Merge pull request #1856 from Lirai/patch-3 ... Update de-DE.coffee	2014-12-06 07:20:21 -08:00
Imperadeiro98	1a8bf81258	Update pt-PT.coffee	2014-12-06 12:55:07 +00:00
Anders Bernard	ac9d173201	Update de-DE.coffee	2014-12-06 12:35:44 +01:00
Anders Bernard	dbaffde2a0	Update de-DE.coffee	2014-12-06 12:16:10 +01:00
Martin005	56e243a656	Update cs.coffee	2014-12-06 12:07:23 +01:00
nixel2007	8619f43801	Update ru. ... Sync lines to en.coffee a bit	2014-12-06 13:16:58 +03:00
nixel2007	2e6ada0935	Update ru. ... Today subscription update and small fixes.	2014-12-06 13:07:25 +03:00
Nick Winter	6a26681fec	Minor level progression tweak.	2014-12-05 18:30:31 -08:00
Nick Winter	bbc25a0877	Updated next level links.	2014-12-05 18:29:15 -08:00
Nick Winter	c7e2398f7c	Fixed some bugs with hero doll placement and dungeon unlocks.	2014-12-05 18:16:58 -08:00
Nick Winter	07f7e7473d	Merged.	2014-12-05 17:27:33 -08:00
Nick Winter	6596bde758	Right, don't need that in there.	2014-12-05 17:25:20 -08:00
Scott Erickson	836d2905b9	Users who have paid or otherwise have access to all content are now called 'premium', and user objects on client and server have an isPremium getter which checks all relevant properties.	2014-12-05 17:19:52 -08:00
George Saines	640b841306	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-12-05 16:57:44 -08:00
George Saines	04a6ab3734	resizing large img files, adding buttons for victory modal	2014-12-05 16:57:39 -08:00
Nick Winter	6344b0c1a3	Unlocked core levels even for non-subscribers, moving extra levels to subscribers-only.	2014-12-05 15:46:15 -08:00
Nick Winter	8932cef46d	Merge pull request #1850 from Lirai/patch-1 ... Update de-DE.coffee	2014-12-05 15:46:09 -08:00
Matt Lott	d6265a4065	Fix default locked code css ... Couldn’t get multiple ranges to highlight ranges correctly, so leaving it on for python and coffeescript only.	2014-12-05 14:15:43 -08:00
Scott Erickson	209836c172	Fixed user patching to not also unsubscribe subscribers.	2014-12-05 14:11:38 -08:00
Anders Bernard	3304fedb16	Update de-DE.coffee	2014-12-05 22:16:48 +01:00
Nick Winter	fd88056123	Merge pull request #1849 from Imperadeiro98/master ... Update pt-PT.coffee	2014-12-05 12:54:38 -08:00
Imperadeiro98	074c16733b	Update pt-PT.coffee	2014-12-05 20:23:06 +00:00
Imperadeiro98	7a89d30bb6	Update pt-PT.coffee	2014-12-05 20:21:13 +00:00
nixel2007	9a2bc14bad	merge remote	2014-12-05 20:15:59 +03:00
nixel2007	793fbfcd18	Merge remote-tracking branch 'upstream/master'	2014-12-05 20:08:29 +03:00
Nick Winter	fb4646b1dd	Propagated i18n.	2014-12-05 09:08:26 -08:00
nixel2007	171d862fcf	ru ... community block, skill_docs done, small fixes	2014-12-05 20:07:50 +03:00
Nick Winter	723209642c	Merge pull request #1845 from Imperadeiro98/patch-1 ... Fixed some i18n	2014-12-05 08:56:11 -08:00
Nick Winter	b01b74cdc8	Merge pull request #1843 from Lirai/patch-2 ... Update de-DE.coffee	2014-12-05 08:54:57 -08:00
Nick Winter	8b62b6ec44	Temporary workaround for #1842.	2014-12-05 07:55:17 -08:00
Imperadeiro98	bf7872b059	Update legal.jade	2014-12-05 15:54:35 +00:00
Imperadeiro98	f089531aac	Update en.coffee	2014-12-05 15:43:54 +00:00
Imperadeiro98	e4be319875	Update legal.jade	2014-12-05 15:43:37 +00:00
Imperadeiro98	afbc669742	Update en.coffee	2014-12-05 15:41:31 +00:00
Imperadeiro98	7cd8a57d1e	Update legal.jade	2014-12-05 15:38:42 +00:00
Imperadeiro98	203b407b4b	Update en.coffee	2014-12-05 15:38:41 +00:00
Imperadeiro98	ecc94b411c	Update en.coffee	2014-12-05 15:29:18 +00:00
nixel2007	ef20e26484	ru ... subscribe block and strings above.	2014-12-05 18:00:14 +03:00
nixel2007	5703e3eb94	ru ... Play block	2014-12-05 17:42:19 +03:00
Lirai	e4120ceadf	Update de-DE.coffee ... some translations	2014-12-05 10:43:41 +01:00
Matt Lott	4616df6c23	Add virtual page views for subscribe paths	2014-12-04 21:14:22 -08:00
Scott Erickson	d0ee8cb7c7	Set up the server to allow admins to assign customers coupons. Fixed up how customers are created/updated by the server to allow setting new payment information rather than forever using the payment info first provided.	2014-12-04 17:41:27 -08:00
Matt Lott	bd797e8cfd	Highlight locked default code	2014-12-04 16:33:59 -08:00
Matt Lott	222e532006	Make default code locking contiguous ... Lock ‘del’ command too.	2014-12-04 16:04:44 -08:00
Nick Winter	b5b38d042a	Added i18n for extrapolation tip.	2014-12-04 15:35:31 -08:00
Nick Winter	3c3d98b0ec	Merge pull request #1841 from Zacharias030/master ... Added another tip to be displayed during loading	2014-12-04 15:34:16 -08:00
Zacharias Fisches	55f85e3682	Added another tip to be displayed during loading ... There are only two kinds of people: those that can extrapolate from incomplete data...	2014-12-05 00:21:36 +01:00
Nick Winter	0306d0ee31	Fixed bug with heroes not rendering in the hero picker.	2014-12-04 15:04:34 -08:00
Nick Winter	8318606457	Added a slot for the wizard hand hero doll images.	2014-12-04 14:35:25 -08:00
Nick Winter	b253eb9be8	Merged something.	2014-12-04 14:34:35 -08:00
Matt Lott	4ff6e95f62	Add show subscribe modal events	2014-12-04 14:23:47 -08:00
Nick Winter	bae90024b5	Merge pull request #1840 from nixel2007/master ... Update ru.coffee	2014-12-04 14:20:14 -08:00
Nick Winter	24c3f6aa3a	Merge pull request #1829 from jkohlin/patch-1 ... Update sv.coffee	2014-12-04 14:09:53 -08:00
Nick Winter	b895db3da2	Merge pull request #1831 from Rubiconline/patch-1 ... Update fr.coffee	2014-12-04 14:09:28 -08:00
Nick Winter	49dd6704c3	Merge pull request #1839 from Imperadeiro98/patch-1 ... Fixed translation, I think	2014-12-04 14:08:29 -08:00
nixel2007	7179236caa	Update ru.coffee ... G+ commands, skill_docs, about - team blocks, thangs and small fixes.	2014-12-05 01:00:50 +03:00
Nick Winter	dffc14f995	Put in a fallback in case somehow the gems weren't loaded for the PlayHeroesView locked hero gem costs.	2014-12-04 13:57:21 -08:00
Imperadeiro98	1c136b0657	Fixed translation, I think	2014-12-04 21:44:27 +00:00
Nick Winter	a25d306be7	Added restricted hero button where the choose hero would normally go, for heroes unavailable to a particular level.	2014-12-04 13:43:19 -08:00
Nick Winter	fa4f479107	Restricted Arcane Ally and Munchkin Harvest to warriors, since otherwise players will tend to suicidally pick their under-armored new ranger or wizard.	2014-12-04 13:37:17 -08:00
Nick Winter	a7eaac773d	Fixed some ranger paper doll stylings and a typo in the femaleRangeThumbr item doll image schema.	2014-12-04 13:30:20 -08:00
Nick Winter	c0842959e8	Avoid opening InventoryModal or ChooseHeroesModal until the session is loaded.	2014-12-04 13:18:06 -08:00
Scott Erickson	0edf4e0ca1	Fixed a MailChimp test. Fixed payment and subscription handlers to deny anonymous users. Hid the subscribe button from anonymous users.	2014-12-04 13:07:07 -08:00
Matt Lott	e3abb9ceb3	Capture active user metrics ... Watching for these events: Level completed User registered Playtime of 30s in a level Purchase Payment Subscribe Earned an achievement	2014-12-04 12:57:57 -08:00
Scott Erickson	7025f0a488	Another hotfix for people having preferredLanguage set to null. It's preventing people from subscribing because they can't put a User object that does not validate. Still can't repro, but it's happened to a lot of people and continues to happen to new people signing up.	2014-12-04 11:56:14 -08:00
Nick Winter	86be36621d	Sped up real-time playback on some more non-randomized levels.	2014-12-04 11:31:22 -08:00
Nick Winter	7bfe0e5c9e	Updated Programmaticon II requirements. Adjust editor height after reloading code.	2014-12-04 11:31:22 -08:00
Lirai	324a749149	Update de-DE.coffee ... uncommented...	2014-12-04 20:28:56 +01:00
Lirai	bde08dd24b	Update de-DE.coffee ... Checked for errors and better translations.	2014-12-04 19:34:28 +01:00
Matt Lott	7537817081	Update subscribe parent copy	2014-12-04 09:57:01 -08:00
Nick Winter	a1d8b02ca6	Moved simulation Aether requires to be more specific and not loaded all the time on normal play pages.	2014-12-04 08:33:26 -08:00
Nick Winter	3573a929e3	Added requires for other languages in Simulator.coffee so simulation can work.	2014-12-04 08:21:36 -08:00
Nick Winter	f48468c474	Merge pull request #1834 from ebirkenes/translation ... Bunch of norwegian translations	2014-12-04 07:40:10 -08:00
Maks Lyashuk	22fe41fd70	Fix another indent	2014-12-04 14:19:37 +02:00
Maks Lyashuk	8479f94ecb	Fix indent	2014-12-04 14:13:46 +02:00
Maks Lyashuk	f12d9b5598	New translation in uk.coffee	2014-12-04 13:14:19 +02:00
Nick Winter	69623edefb	WorldMapView no longer restricting access to adventurer and started levels.	2014-12-03 20:46:57 -08:00
Scott Erickson	41d78fd4c5	Payments view now sorts payments by date.	2014-12-03 19:44:04 -08:00
Nick Winter	4d72c1c84b	Show an AuthModal instead of a SubscribeModal to anonymous players.	2014-12-03 19:34:00 -08:00
Scott Erickson	0f706bfdf6	Fixed GPlus login.	2014-12-03 16:40:28 -08:00
Nick Winter	8cff42a843	Show SubscribeModal for non-admins, too.	2014-12-03 16:28:56 -08:00
Nick Winter	a8ce1bbfb2	Added unsubscribe button and subscription status on payments screen.	2014-12-03 16:11:46 -08:00
Nick Winter	1f2408a99f	Can actually edit requiresSubscription on levels.	2014-12-03 15:50:34 -08:00
Erlend Birkenes	4c4c263bb8	Fixed indentation error	2014-12-03 22:43:45 +01:00
Scott Erickson	eb98cf4952	Hooked up Level handler to deny creating new LevelSessions when the level requires a subscription and the user doesn't have one.	2014-12-03 13:32:28 -08:00
Nick Winter	4701ba22af	Got rid of a bit of skipping, enabled some other arenas for testing.	2014-12-03 13:17:57 -08:00
Nick Winter	6e57cbfb66	LevelLoadingView now handling when a subscription is required (although it can't be, yet, since LevelLoader doesn't tell it).	2014-12-03 12:04:12 -08:00
Nick Winter	50ec896fd8	Added a requiresSubscription property to the levels.	2014-12-03 11:46:03 -08:00
George Saines	371127a368	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-12-03 11:19:52 -08:00
George Saines	bcaad51b24	more level rearranging	2014-12-03 11:19:48 -08:00
Nick Winter	0ac9b3758b	Fixed bug with subscriptions not working. Added subscription status text to the world map.	2014-12-03 11:19:10 -08:00
Erlend Birkenes	861cb64fec	More norwegian translations	2014-12-03 20:01:00 +01:00
Matt Lott	898b22723e	Update subscribe copy	2014-12-03 11:00:45 -08:00
George Saines	103d1035a2	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-12-03 10:53:52 -08:00
George Saines	5dafe4b541	changing the placement of the level dots	2014-12-03 10:53:45 -08:00
Nick Winter	73b5f130b5	Repositioned ranger weapons.	2014-12-03 10:39:16 -08:00
Nick Winter	f82ccfc4cb	The sky darkened.	2014-12-03 10:04:50 -08:00
Nick Winter	65dde043c7	SubscribeModal is in.	2014-12-03 09:14:14 -08:00
Erlend Birkenes	5d4d631ae6	More norwegian translations. ... Conflicts: app/locale/nb.coffee	2014-12-03 16:36:04 +01:00
Matt Lott	201547e388	Revert autocomplete to support Enter too	2014-12-02 22:14:01 -08:00
Nick Winter	32d3745b77	A tiny bit more progress on the SubscribeModal.	2014-12-02 21:27:12 -08:00
Scott Erickson	cd3bb690f4	Created stripe subscription logic.	2014-12-02 20:02:35 -08:00
Nick Winter	15d7ac876a	Starting SubscribeModal.	2014-12-02 20:01:53 -08:00
Matt Lott	774260769d	Update pageview tracking ... Based on more feedback from segment.io support. Still trying to get Google Analytics virtual pageviews to work correctly.	2014-12-02 13:25:18 -08:00
Scott Erickson	3675c79b26	Hotfix for #1828. Still doesn't figure out why user preferredLanguage properties are being set to null.	2014-12-02 13:19:05 -08:00
Rubiconline	e1326f1698	Update fr.coffee	2014-12-02 21:25:58 +01:00
Scott Erickson	5dcdabfd62	Refactored stripeCustomerID to stripe object in the user object so we can put more stuff in there.	2014-12-02 11:47:15 -08:00
Nick Winter	6cfb45e7a6	Pausing branchingGroup temporarily for school testing.	2014-12-02 09:18:39 -08:00
Matt Lott	1773744bcd	Turn off a/b test hide locked levels ... Minor increase in level completion for hiding locked levels was not statistically significant. We can run this test again after level banners and world map paths have been ironed out.	2014-12-02 09:13:42 -08:00
Johan	06dcb8c48b	Update sv.coffee	2014-12-02 17:03:33 +01:00
Nick Winter	19dde10a54	Fixed jade comment syntax error.	2014-12-01 18:33:37 -08:00
Nick Winter	8c7e62b9bd	Added back doll image buckets.	2014-12-01 18:19:20 -08:00
Scott Erickson	7f97a3b91e	The PlayItemsModal now dynamically loads portrait images as they scroll into view.	2014-12-01 17:33:45 -08:00
Nick Winter	4f9dc39567	Fixed item details view shadow.	2014-12-01 17:17:27 -08:00
Matt Lott	5965d319d6	Fix Firefox world map level hover flicker	2014-12-01 17:12:02 -08:00
Nick Winter	4b75516a88	Fixed Amara's positioning.	2014-12-01 17:08:48 -08:00
Scott Erickson	cd5b57a658	Set up our resource retrying mechanism to stop after 20 tries.	2014-12-01 16:09:59 -08:00
Nick Winter	8ce192bf7c	Got modularized Aether imports working for PlayLevelView and its workers.	2014-12-01 15:43:22 -08:00
Scott Erickson	7f3f1a6038	Set up aether module loading, but it's not working, so creating a branch until it works.	2014-12-01 15:43:22 -08:00
Scott Erickson	a48fa41edd	CocoViews and CocoModels now notify users of connection errors and automatically retry when getting and putting data goes wrong.	2014-12-01 15:29:19 -08:00
Matt Lott	b2b25f354c	Narrow pageview tracking to only Google Analytics	2014-12-01 14:53:11 -08:00
Matt Lott	35adea61e0	Update trackPageView integrations call ... Based on feedback from segment.io support. Was unclear from documentation how to provide only name and options object.	2014-12-01 13:58:21 -08:00
Nick Winter	ca6c95b0f7	Migrated getting nextLevelURL to the new campaign organization.	2014-12-01 13:46:55 -08:00
Imperadeiro98	6036d2bd74	Update pt-PT.coffee	2014-12-01 20:45:29 +00:00
Imperadeiro98	1e4d6b3bd5	Update pt-PT.coffee	2014-12-01 20:27:52 +00:00
Scott Erickson	1b12eee3ac	Fixed signup in victory modals and ContributeClassView.	2014-12-01 10:49:38 -08:00
Scott Erickson	57b154810b	Added a placeholder me for iPad which inspects the object once the page loads.	2014-12-01 10:45:19 -08:00
Scott Erickson	43ac0e8572	Proxied 'lib/auth' to 'core/auth' for the iPad which can't be updated so quickly.	2014-12-01 10:35:45 -08:00
Nick Winter	f9b239ded7	Fixed #1820.	2014-12-01 08:18:38 -08:00
Björn Kimminich	4d1130a9c6	Update de-DE.coffee	2014-12-01 14:00:36 +01:00
Matt Lott	23e60116d5	A/B test hiding locked levels in world map	2014-11-30 22:11:39 -08:00
Nick Winter	748fcf2a65	Fixed not showing locked items in inventory modal.	2014-11-30 19:45:40 -08:00
Nick Winter	88849d6dfb	Propagated i18n.	2014-11-30 18:13:30 -08:00
Björn Kimminich	5432be27f5	added some german translations	2014-12-01 03:11:28 +01:00
Nick Winter	35f1ed1e82	Implemented George's new level loading view design.	2014-11-30 18:02:45 -08:00
Nick Winter	d007f5337e	Fixed up inventory slot images for minions and wrists, and added Wizard/Ranger placeholder images.	2014-11-30 16:13:39 -08:00
Matt Lott	153c39b30b	Reverting larger currently-executing-line pointer ... Not compatible with Firefox, and not clear how to make it work in both browsers.	2014-11-30 16:03:23 -08:00
Matt Lott	2ecda7dbbf	Fix trackPageView options initialization	2014-11-30 15:28:01 -08:00
Nick Winter	44282cb946	Hooked up new menu music loop.	2014-11-30 14:57:34 -08:00
Matt Lott	070d3ec6c2	Fix Firefox code area border	2014-11-30 14:42:51 -08:00
Nick Winter	cf25b5c6ed	Made sure we can see the whole world map background, even though it looks bad when we stretch it.	2014-11-30 14:35:24 -08:00
Matt Lott	02eb254eba	Add virtual pageviews for level load and complete	2014-11-30 14:14:47 -08:00
Nick Winter	50eed15eed	Can now equip a second ring slot.	2014-11-30 14:12:07 -08:00
Nick Winter	9471beafd9	A few fixes for PlayHeroesModal and InventoryModal.	2014-11-30 14:00:29 -08:00
Nick Winter	68559a3aa5	Re-enabled top hero preloading on WorldMapView, but only when it makes sense.	2014-11-30 13:23:25 -08:00
Michael Schmatz	3cf80c895e	Removed log infos, iPad language selection	2014-11-30 16:19:01 -05:00
Nick Winter	8cb6c09889	Properly show paper doll equipment when inventory modal first loads.	2014-11-30 13:00:45 -08:00
Nick Winter	bd494dd513	Adding in what will eventually be our App Store URL.	2014-11-30 12:44:18 -08:00
Nick Winter	77a4cea387	Improvements for mobile layouts and mobile and iPad browser detection.	2014-11-30 12:27:34 -08:00
Matt Lott	066b1798ab	Make default code read-only	2014-11-30 11:47:54 -08:00
Scott Erickson	85f3972bfc	Fixed #1821	2014-11-30 10:57:17 -08:00
Matt Lott	94ae4bf6aa	Updating analytics integration selection ... Context property has been renamed from providers to integrations. https://segment.com/docs/libraries/analytics.js/#selecting-integrations	2014-11-29 22:16:18 -08:00
Scott Erickson	be809337c4	Refactored to make TreemaUtils generally available but TreemaNode only available for views that need it.	2014-11-29 17:51:40 -08:00
Nick Winter	412955c6be	Got rid of some CSS filters that were making the PlayItemsModal take way too much memory.	2014-11-29 17:34:59 -08:00
Nick Winter	af24857255	Do not load silhouetted or hidden items. More importantly, remove the absolute positioning on the .required-level tag inside the item element to save 150MB (!!!) of memory for no discernible reason. (But actualy just remove that whole .required-level tag, because who even needs it.)	2014-11-29 17:06:56 -08:00
Scott Erickson	3a4eaa718f	Did what I needed to do to get d3 to not be loaded during play: refactored the ladder views out of the play wad, and got the Router to handle viewClass being a string rather than a fully loaded module.	2014-11-29 16:46:51 -08:00
Nick Winter	ad913024c0	Merge pull request #1817 from Imperadeiro98/master ... Update pt-PT.coffee	2014-11-29 15:57:59 -08:00
Scott Erickson	6fccae579a	Made d3 load dynamically for the pages that use it. Refactored a bunch of templates and sass files to have their names match with their respective views.	2014-11-29 15:31:56 -08:00
Nick Winter	fe55811075	Fixed a bit of repaining that was going on when it shouldn't.	2014-11-29 15:06:54 -08:00
Nick Winter	c226856204	Fixed typo in previous rewadding.	2014-11-29 14:42:46 -08:00
Nick Winter	65280454bf	Merge pull request #1818 from kerradus/master ... update RU translation	2014-11-29 14:42:18 -08:00
Dmitry	52311bd256	update RU translation	2014-11-30 01:24:19 +03:00
Scott Erickson	02ddd7f698	Fixed #1816. Cleaned up logging in config.coffee.	2014-11-29 13:47:04 -08:00
Scott Erickson	129e07e231	Refactored a bunch of editor stuff to be included in the wads. Fixed a bug with the I18NEditModelView.	2014-11-29 13:36:48 -08:00
Imperadeiro98	abf75281ca	Update pt-PT.coffee	2014-11-29 21:25:46 +00:00
Imperadeiro98	8d9c7cf0be	Update pt-PT.coffee	2014-11-29 21:22:06 +00:00
Nick Winter	155ead86cf	Removed unneede catiline lib. Trying speedups for updating HUD property values and Lank Thang inventory.	2014-11-29 13:09:38 -08:00
Scott Erickson	17f2d76512	Undid some apparent changes from the last commit.	2014-11-29 12:53:57 -08:00
Scott Erickson	9b5228afd9	Refactored the GameMenu to be part of play.js. Set up the config to automatically bundle templates into their respective views, if their names match.	2014-11-29 12:46:04 -08:00
Scott Erickson	1c33842125	Refactored core templates into a core folder.	2014-11-29 11:39:37 -08:00
Nick Winter	912df310a2	Disabled GitHub login for now, since it's too buggy and also makes the server mad slow.	2014-11-29 10:52:53 -08:00
Scott Erickson	1bd70591a0	Added new mongodb versions to be allowed. ... Added error logging for every which reason a user may be unable to pay. Added more info for users when they hit unknown errors.	2014-11-29 10:46:01 -08:00
Nick Winter	b8d4f00cd4	Merge pull request #1813 from ebirkenes/tmp ... Fix for #1795	2014-11-29 10:40:48 -08:00
Nick Winter	98199ac72e	Propagated i18n.	2014-11-29 10:38:55 -08:00
Nick Winter	891b78eb44	Hiding some ThangTypes from view in level editor.	2014-11-29 10:34:04 -08:00
Nick Winter	306f599673	Merge pull request #1815 from ewertonorg/translate-to-pt-br ... Update pt-BR.coffee	2014-11-29 10:33:22 -08:00
Scott Erickson	0bbcdd5698	Made all of lib into a wad. Fixed AuthModal.	2014-11-29 08:54:18 -08:00
Nick Winter	d2aabbdacc	A couple workarounds for crashing server tests. Including method in HipChat error messages. Trying to work around undefined ThangType fetch during level loading.	2014-11-29 08:43:40 -08:00
Nick Winter	dbbcfe3789	Fixed a couple requires needed for level editor.	2014-11-29 06:50:50 -08:00
ewertonorg	4b7fc0322c	Update pt-BR.coffee	2014-11-29 11:53:27 -02:00
Scott Erickson	82e2344fa5	Fixed new module loading system when optimized.	2014-11-29 00:34:55 -08:00
Nick Winter	89af30f436	Using home play i18n tag instead of common play tag.	2014-11-28 19:49:13 -08:00
Nick Winter	8400eb6016	Reverted Thang Editor style from my item overhaul batch mode. Fixed what I think was a typo in the latest refactoring.	2014-11-28 19:39:51 -08:00
Scott Erickson	31214e854e	Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways.	2014-11-28 17:49:41 -08:00
Scott Erickson	b698745e05	Set up the site to load its logic and templates piecemeal rather than in one giant app.js file.	2014-11-28 16:38:56 -08:00
Scott Erickson	12b3428aee	Got rid of some styling in the achievement edit view that was messing with the new site chrome.	2014-11-28 16:38:56 -08:00
Nick Winter	32a271d17e	Updated to new paper doll positioning.	2014-11-28 14:23:44 -08:00
Nick Winter	4b45385571	Working on paper dolls.	2014-11-28 12:11:59 -08:00
Matt Lott	fc2c68a7af	Update Tracker.trackEvent ... Mechanics have changed a bit: first param is an action string, second param has specific properties if Google Analytics. Updating some of the trackEvent calls to use correct actions and categories.	2014-11-28 15:06:25 -05:00
Erlend Birkenes	6efb03ec40	Translated the Legal page to norwegian. Plus some other stuff and cleaned up a little.	2014-11-28 19:30:41 +01:00
Erlend Birkenes	744b856092	Fixed padding on language-dropdown	2014-11-28 12:10:57 +01:00
Matt Lott	fead762d04	Stopping tracking analytics for admins	2014-11-27 23:55:28 -05:00
Erlend Birkenes	434b71c887	Added myself as translator on norwegian nb	2014-11-27 20:45:27 +01:00
Erlend Birkenes	5f7f1c2b65	Translated the entire contributing page plus some other stuff to norwegian.	2014-11-27 20:17:33 +01:00
Nick Winter	2d2a9ad681	Updated Hour of Code visitor counting.	2014-11-27 09:44:08 -08:00
Nick Winter	b5c7a4e0f2	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-11-27 07:28:31 -08:00
Erlend Birkenes	37601efa17	More norwegian translations. ... Conflicts: app/locale/nb.coffee	2014-11-27 16:11:13 +01:00
Nick Winter	81495fd722	Added suspect code fragment to Known Enemy.	2014-11-26 19:30:23 -08:00
Nick Winter	0499702e10	Translated IFC Videira description to English, and added an image.	2014-11-26 19:22:39 -08:00
Nick Winter	bef466304d	Merge pull request #1805 from leocadiotk/patch-1 ... Update MainPlayView.coffee	2014-11-26 19:20:45 -08:00
Nick Winter	4e51289de8	Merge pull request #1800 from ShadowTrainer/patch-2 ... Update tr.coffee	2014-11-26 19:20:10 -08:00
Nick Winter	12253fc472	Resolved nb.coffee merge conflicts.	2014-11-26 19:19:30 -08:00
Nick Winter	167595789d	Merged tr.coffee.	2014-11-26 19:09:39 -08:00
Nick Winter	4c900b8870	Working on paper doll equipping.	2014-11-26 19:06:57 -08:00
leocadiotk	d2b394aaf2	Update MainPlayView.coffee	2014-11-26 23:16:07 -02:00
Nick Winter	7a7d82e8e4	Merge pull request #1792 from ccdarkness/patch-1 ... Update zh-HANS.coffee	2014-11-26 16:51:07 -08:00
Nick Winter	6e7e11a884	Merge pull request #1791 from nadian/patch-1 ... Update id.coffee	2014-11-26 16:50:50 -08:00
Nick Winter	16e0c2b4fb	Merge pull request #1804 from ebirkenes/translation ... Lots of translations to norwegian bokmål	2014-11-26 16:49:58 -08:00
Nick Winter	ab1e256b98	Merge pull request #1803 from ebirkenes/master ... Fixed wrong I18n suffix in Thang Editor section on Community page.	2014-11-26 16:48:31 -08:00
Nick Winter	915a3243f5	Added feature image hair and thumb slots to the ThangType.	2014-11-26 16:29:48 -08:00
Erlend Birkenes	c8a34e78e8	Lots of translations to norwegian bokmål	2014-11-27 01:00:02 +01:00
Erlend Birkenes	83e41bb38e	Fixed wrong I18n suffix in Thang Editor section on Community page.	2014-11-27 00:41:29 +01:00
Nick Winter	53c6da5ef8	Allowing upload of paper doll images for items.	2014-11-26 14:18:17 -08:00
Nick Winter	fc18ed0153	Undisabled the new Adventurer levels we just emailed about.	2014-11-26 12:56:58 -08:00
Matt Lott	cf6450201f	Fix IE9 simulation problems ... World.deserialize call had mixed up parameters. flagHistory wasn’t being initialized. Error logging using unsupported CoffeeScript splats invocation.	2014-11-26 15:40:18 -05:00
Nick Winter	e538808c76	Merge branch 'master' of git://github.com/notno/codecombat into notno-master	2014-11-26 12:34:35 -08:00
Nick Winter	12394b6bba	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-11-26 12:33:36 -08:00
Nick Winter	9feb4e6add	Using ACE to add syntax highlighting to code documentation.	2014-11-26 12:33:29 -08:00
Nathan Rosquist	da4116ee2e	Add tree_stand thangs to Generate Terrain modal in level editor. Use as border for grassy terrain.	2014-11-26 12:18:57 -08:00
Scott Erickson	c4fdcab6fe	The HeroVictoryModal now has the server check for and upsert any missing items, levels and heroes earned.	2014-11-26 12:02:42 -08:00
Nick Winter	e8ed205038	Added original data to all WorldMapView levels.	2014-11-26 11:03:24 -08:00
Nick Winter	55eaed0cd2	Updated AI/Vision pathfinding/line-of-sight default terrain updates.	2014-11-26 10:51:30 -08:00
Nick Winter	c701ca9eb0	Sorting items by tier instead of gems so that the unlock order will be consistent, and so that we can show the Ring of Speed early despite its high price.	2014-11-26 09:22:30 -08:00
Nick Winter	2c0bf2fef1	Requiring certain heroes for certain levels, and showing the choose hero view when they go to play a level where the hero has changed.	2014-11-26 08:53:06 -08:00
Nick Winter	3f9aa1ba79	Changed 'Your Skills' to 'Help' for hero level spell palette.	2014-11-26 07:39:13 -08:00
Nick Winter	18238a1781	Silhouetted items show what level they'd need to unlock after a while on hover from inventory modal.	2014-11-26 07:33:07 -08:00
Nick Winter	48e78aa0d0	Messed around with equip button and active item css.	2014-11-26 07:11:55 -08:00
Nick Winter	24ac3050bd	Added a bunch of button click sound triggers.	2014-11-26 06:58:23 -08:00
Nick Winter	09d67a8189	Gradually reducing the initial size of the highlight arrow as the player levels up.	2014-11-25 17:55:10 -08:00
Nick Winter	6f2ac13c5a	Not duplicating spell docs if they're explicitly granted.	2014-11-25 17:49:31 -08:00
Nick Winter	9fe5e277a3	Forcing a Programmaticon II upgrade when you get it.	2014-11-25 16:54:24 -08:00
Scott Erickson	425da04ab6	Looks like I left a wee bit of debugging code in PlayItemsModal, and it was messing things up.	2014-11-25 16:27:42 -08:00
Scott Erickson	790217f227	Tweaked how the I18N editor works to guard against garbage English submissions and make the chosen language more consistent.	2014-11-25 16:22:06 -08:00
Scott Erickson	b018746565	Switched the ThangNamesCollection to use GET instead of POST.	2014-11-25 16:22:05 -08:00
Nick Winter	0b4bc61b01	Exposed home slogan for the smaller screens. Re-hid App Store button for now.	2014-11-25 14:31:24 -08:00
Scott Erickson	464f06c031	Turned off saving automatically when you toggle subscriptions in the AccountSettingsView, as it was triggering the PlayAccountModal to save and close.	2014-11-25 13:32:43 -08:00
Scott Erickson	0f29e098cc	ThangTypes with empty portraits now upload them with blank images, to overwrite extant portraits.	2014-11-25 13:28:28 -08:00
Nick Winter	c2f77470a0	Fixed a couple typos Jade was complaining about.	2014-11-25 13:26:04 -08:00
Scott Erickson	8f55b9bc1b	Refactored the AccountSettingsView to be both in the site and in the PlayAccountModal.	2014-11-25 12:43:17 -08:00
ShadowTrainer	28acb28912	Update tr.coffee	2014-11-25 21:23:43 +02:00
Scott Erickson	426202d80a	Added a simple payments page.	2014-11-25 11:09:29 -08:00
Scott Erickson	b27ac94382	Fixed the loading screen in the new site-chrome. As a result, found and removed all the extraneous loading logic from MainAccountView.	2014-11-25 11:06:34 -08:00
Scott Erickson	2a135eeaf1	Reworked the account modal links and a little bit of the styling.	2014-11-25 10:39:53 -08:00
Scott Erickson	bb766e9610	Reworked the MainAccountView, AccountSettingsView, and MainUserView to try and simplify things a bit.	2014-11-25 10:39:53 -08:00
Scott Erickson	6b8a9593ef	Set up the new site chrome to compress when the height of the screen is < 800px tall.	2014-11-25 10:39:53 -08:00
Nick Winter	bbc9b615ea	ItemDetailsView showing item descriptions now.	2014-11-25 10:28:31 -08:00
Nick Winter	5c77eea304	You can now buy heroes.	2014-11-25 10:15:10 -08:00
Nick Winter	98f1eec10c	Upgraded choose hero view for locked heroes. Went back to animated heroes instead of feature images. Removed some server logs.	2014-11-25 09:28:50 -08:00
Matt Lott	3c161268f0	Don't register createjs.FlashPlugin if undefined ... This was completely breaking IE 11/10/9. Audio still seems to work fine with this change.	2014-11-25 12:19:16 -05:00
Imperadeiro98	77c7381e40	Update pt-PT.coffee	2014-11-24 19:55:12 +00:00
Imperadeiro98	6cd32857ac	Update pt-PT.coffee	2014-11-24 19:35:07 +00:00
Nick Winter	9accd0cb04	You can now buy cross-class items once you have a hero of that class. When you click to buy an item you can't afford, it takes you to the gem shop. Increased amount of items you can purchase a bit more.	2014-11-24 10:51:20 -08:00
Aase Mestad	5a10ec8a23	Some norwegian updates	2014-11-24 18:18:40 +01:00
Nick Winter	f9e6c167bc	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-11-24 09:06:05 -08:00
Nick Winter	a1ebdb7101	Adjusted amount of items you can buy so that you can theoretically spend much more than you earn, while still not unlocking powerful stuff too early.	2014-11-24 09:05:59 -08:00
Matt Lott	48d5dd9dc6	Make sync pvp level sessions publicly readable	2014-11-23 23:49:03 -08:00
Matt Lott	6b7e146084	Reduce problem alert jiggle duration to 1s	2014-11-23 21:58:29 -08:00
ccdarkness	1ce776f9e2	Update zh-HANS.coffee	2014-11-24 12:54:38 +08:00
Nick Winter	b87cf462fc	Shrinking home page height as much as easily possible to be able to fit it on anyone's screen.	2014-11-23 20:13:06 -08:00
Nick Winter	cbf3aab374	Removed hero team color in non-multiplayer levels.	2014-11-23 20:04:07 -08:00
Nick Winter	df162080c3	Totally hid code stepper toolbar for now, since it's proving difficult to make room for it in the new design.	2014-11-23 19:40:50 -08:00
nadian	b429e5f26a	Update id.coffee	2014-11-24 08:45:21 +07:00
Matt Lott	c203ff15a2	Fix sync PVP opponent syncing issue ... Ripped out backfire from PlayLevelView so we have more control over data synchronization. These changes should wait properly for the opponent data to load before blazing ahead, after a PlayLevelView reload. Fixes #1767	2014-11-23 17:15:59 -08:00
Nick Winter	0c8b5ec9a8	Turned off dead Thang underlayering when in the air.	2014-11-23 16:06:28 -08:00
Nick Winter	1535b6bdd2	Fixed play footer in new styling regime.	2014-11-23 15:48:08 -08:00
Nick Winter	1cd781233c	Press enter to start level, esc to skip real-time playback. Reduced likelihood of repetetive aural say messages. Updated required code for Bonemender.	2014-11-23 15:25:12 -08:00
George Saines	e7a5cadfb0	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-11-23 13:32:31 -08:00
George Saines	294a8497ed	making the editor error more visually distinctive	2014-11-23 13:32:26 -08:00
Nick Winter	0b97ef5f0b	Properly using the skill docs i18n. Fixed issue with markdown getting to #{spriteName} before our replacer did.	2014-11-23 13:26:19 -08:00
Nick Winter	294a37e2a2	Propagated i18n.	2014-11-23 12:54:42 -08:00
Nick Winter	f248de0dc5	Adding i18n to skill docs.	2014-11-23 12:52:34 -08:00
Nick Winter	ffaa42cb9b	Added detection of suspect code fragment deletion. Implemented Chloe's styling advice on restricted items. Fixed purchasing items clobbering inventory changes.	2014-11-23 12:18:42 -08:00
Nick Winter	c7f8565ae7	Getting a few more placeholder stats filled in automatically in ItemDetailsView. Showing buildTypes for Builder's Hammer docs. Fixed font casing / humanizing for skills granted.	2014-11-23 11:08:20 -08:00
Nick Winter	b359c25c97	Fixed multiplexed-by-code-and-spoken-language component documentation i18n.	2014-11-23 10:22:06 -08:00
Scott Erickson	994584f13a	Shapes now handle radial gradient fills. Handled one sprite (new Anya attack) export including initializing a container with movie clip arguments for no apparent reason, so loosened SpriteParser a bit to handle this.	2014-11-23 09:39:02 -08:00
Scott Erickson	1f3b02440a	Fixed a harmless bug where the Lank would try to add new sprites to old containers.	2014-11-23 08:51:45 -08:00
Matt Lott	692569f655	Update problem alert width to be more dynamic	2014-11-22 22:48:03 -08:00
Nick Winter	b7949424e6	Re-enabled branchingGroup A/B test. Restricted Builder's Hammer in The Gauntlet.	2014-11-22 21:36:14 -08:00
Nick Winter	5d54332ed7	Round inferred cooldown docs. Show grabber/grabbing cursor when Surface is enabled, playing, and zoomed in.	2014-11-22 21:22:46 -08:00
Nick Winter	f16c1b5030	Fixed a few UX issues Chloe found.	2014-11-22 20:56:46 -08:00
Matt Lott	c16b0f97bf	Update sync PVP to use transpiledCode	2014-11-22 20:48:07 -08:00
Scott Erickson	1a85fea33b	Fixed the editor views, get that site chrome outta there.	2014-11-22 18:51:21 -08:00
Nick Winter	6851c309fb	Moved older campaigns from world map view to site footer.	2014-11-22 18:45:22 -08:00
Nick Winter	6fd0d024eb	Moved overlapping level dot.	2014-11-22 18:45:22 -08:00
Scott Erickson	96f9b60780	Set George's new hero stat colors.	2014-11-22 18:43:02 -08:00
George Saines	1bdc331f40	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-11-22 18:00:28 -08:00
George Saines	c98e875c68	making the error message more blood red	2014-11-22 18:00:23 -08:00
Scott Erickson	0e6965d097	Hiding the iPad link for now.	2014-11-22 17:44:26 -08:00
Scott Erickson	cfcd09c112	Set up the new Heald-designed site chrome.	2014-11-22 17:41:13 -08:00
Matt Lott	fbed0dd13d	Jiggle spell palette popover onclick in hero level	2014-11-22 17:35:05 -08:00
Matt Lott	fcb098b3aa	Remove cast button text A/B test	2014-11-22 16:50:49 -08:00
George Saines	2151cd6799	added the additional default inventory icons, added the dungeon map path	2014-11-22 16:14:43 -08:00
ShadowTrainer	48a0be91d8	Update tr.coffee	2014-11-23 01:32:59 +02:00
George Saines	2875cb09a5	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-11-22 15:18:23 -08:00
George Saines	9a2c52545f	adding carpeting to the dungeon floor	2014-11-22 15:18:19 -08:00
Matt Lott	496d52b2aa	Add moveRight to loop snippet for first 2 mazes	2014-11-22 12:29:37 -08:00
Dmitry	41b3d066d6	update RU translation	2014-11-22 19:58:05 +03:00
Nick Winter	2fc6f7a8a2	New required inventory items for ranger/wizard levels.	2014-11-21 22:35:03 -08:00
Matt Lott	c012cd4e30	Prevent continuous deletion of a single line	2014-11-21 21:02:39 -08:00
Nick Winter	904d605e42	Getting ready to add new levels.	2014-11-21 20:36:56 -08:00
Nick Winter	549fb8aa37	Attempting to require purchase of tarnished bronze breastplate in The Raised Sword.	2014-11-21 16:23:26 -08:00
Nick Winter	dae3c9cef6	Always show Buy Gems menu on iPad.	2014-11-21 14:55:04 -08:00
Nick Winter	d00c7d6a3a	Allow buying gems when not logged in on iPad.	2014-11-21 14:41:04 -08:00
Nick Winter	ca73a049dd	Paths for non-admins. Making sure paths are showing when level first loads and playback ends (not sure why they are not showing up at first otherwise).	2014-11-21 14:22:02 -08:00
Michael Schmatz	1d52562070	Publish signed up message	2014-11-21 17:18:02 -05:00
Nick Winter	074d9f33c2	Fixed bugs with unequipping restricted items not then requiring the proper item afterward.	2014-11-21 12:20:24 -08:00
Nick Winter	cee017c7ec	Moved spell palette popovers to top placement if dialogue view is active.	2014-11-21 12:14:37 -08:00
Nick Winter	c5ae253a45	Fixed next-level popovers appearing in wrong place on world map.	2014-11-21 11:56:31 -08:00
Nick Winter	cfe1b020c3	Fixed esc shortcut when editor is disabled.	2014-11-21 11:07:57 -08:00
Nick Winter	16a717aec1	Disallow finding enemy names by selecting them before the HUD is fully enabled.	2014-11-21 10:14:02 -08:00
Nick Winter	c3398ed8ed	Required topEnemy in Thornbush Farm.	2014-11-21 09:53:46 -08:00
Nick Winter	5550c695e2	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-11-21 08:19:37 -08:00
Nick Winter	6f3485f089	Fully removed A/B test that was causing hero victory modals to not fully work.	2014-11-21 08:16:03 -08:00
Thomas Abend	145535f465	Update names.coffee	2014-11-21 09:49:01 -05:00
Scott Erickson	624f164b54	Set up the WorldMap to load earned achievements and modify the User object to include absolutely everything.	2014-11-20 23:03:16 -08:00
Scott Erickson	b86e3c30dc	Set up level achievements to be created manually by the client, hopefully making them a bit more stable.	2014-11-20 22:09:54 -08:00
Nick Winter	2393165d9a	Turned off some completed A/B tests. Fixed an achievement recalculation typo Scott found.	2014-11-20 21:57:47 -08:00
Nick Winter	e97ba54c94	Reduced how much we're sending to Mixpanel. Turned off experimental languages A/B test.	2014-11-20 20:31:17 -08:00
Nick Winter	33ef8f9760	Added Programmaticon II dependency.	2014-11-20 20:06:59 -08:00
Nick Winter	f5f2d57db6	Paused branchingGroup A/B test and set everyone to no-practice. Realized that no-practice wasn't working at all, so fixed that.	2014-11-20 19:56:44 -08:00
Nick Winter	fcfe81c63e	Added endangered-burl and village-guard.	2014-11-20 19:32:09 -08:00
Nick Winter	6d7bc9ce11	Fixed #1729.	2014-11-20 17:09:29 -08:00
Michael Schmatz	f84e92595b	Changed UDID to identifierForVendor	2014-11-20 20:03:24 -05:00
Scott Erickson	a18537b065	Added the ability to assign a user an iOS UDID, and login with it.	2014-11-20 15:54:15 -08:00
Matt Lott	ef8e7563b4	Increase autocomplete font size in dungeon levels ... Also moving getCampaignForSlug to new CampaignOptions file.	2014-11-20 12:41:56 -08:00
Nick Winter	79ac94d84a	Fixed busted item crash.	2014-11-20 11:59:49 -08:00
Nick Winter	df51e28a1d	Fixed camera zoom killing coordinate hover unnecessarily.	2014-11-20 11:37:10 -08:00
Nick Winter	46c4601ac6	Levels (back) link now embiggened.	2014-11-20 11:11:38 -08:00
Matt Lott	f80baf3eb2	Update autocomplete instruction to 'press tab' ... Enter no longer autocompletes, instead dismisses popup and executes a Return	2014-11-20 10:56:38 -08:00
Nick Winter	83bbb6bef2	Merge pull request #1766 from iAladdin/master ... improved Chinese localization zh-HANS.coffee	2014-11-20 09:02:32 -08:00
Nick Winter	7b7ceeba53	Right, it's long-sword, not longsword.	2014-11-20 08:49:18 -08:00
iAladdin	0fcffc9736	improved Chinese Localization ... Signed-off-by: iAladdin <ialaddin@me.com>	2014-11-21 00:16:45 +08:00
iAladdin	84c6ed0193	Merge branch 'master' of github.com:codecombat/codecombat	2014-11-20 11:14:05 +08:00
iAladdin	55f725de93	fixed error ... Signed-off-by: iAladdin <ialaddin@me.com>	2014-11-20 11:13:47 +08:00
Nick Winter	b0f65a4da8	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-11-19 18:36:30 -08:00
Nick Winter	8280347752	Fixes to spell palette doc hovering and ensuring at least two column layout.	2014-11-19 18:36:09 -08:00
Matt Lott	81d6c186dc	Add time to missing null check error messages	2014-11-19 17:13:00 -08:00
Nick Winter	afff1056cb	Don't be draggin' all these images around yo.	2014-11-19 16:36:06 -08:00
iAladdin	dff443bc07	Merge branch 'master' of github.com:codecombat/codecombat	2014-11-20 08:22:23 +08:00
iAladdin	883a58ed2d	improved Chinese Localization ... Signed-off-by: iAladdin <ialaddin@me.com>	2014-11-20 08:22:10 +08:00
Scott Erickson	09087428b9	Got lanks to update healthbars when the floating layer spritesheet is recreated.	2014-11-19 16:09:48 -08:00
Nick Winter	716f8864f1	Increased dialogue strong tag color contrast.	2014-11-19 16:09:25 -08:00
Nick Winter	5c0f007c4f	Toning down executing highlights when errored out as well as when ended.	2014-11-19 16:05:00 -08:00
Nick Winter	89f0f52714	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-11-19 16:04:29 -08:00
Scott Erickson	e10af778ca	Added some logs to figure out why that one time the GPlus logging in process just left things hanging.	2014-11-19 15:55:44 -08:00
Nick Winter	a1038af32b	Make it much less likely to get to frame 0, since that frame is often pretty weird.	2014-11-19 15:46:50 -08:00
iAladdin	038e8cf776	Merge branch 'master' of github.com:codecombat/codecombat	2014-11-20 07:43:04 +08:00
iAladdin	42997c4bb2	improved Chinese Localization ... Signed-off-by: iAladdin <ialaddin@me.com>	2014-11-20 07:42:35 +08:00
Matt Lott	41db27c709	Apply markdown to error messages and hints	2014-11-19 15:27:06 -08:00
Nick Winter	f310719cee	Restarting level now doesn't clear anything except code unless you hold down shift.	2014-11-19 15:24:50 -08:00
Nick Winter	6755c90f02	Properly continue to Haunted Kithmaze from The Raised Sword if that's the A/B test group.	2014-11-19 15:18:59 -08:00
Nick Winter	c82d1d0f36	Additional scriptable property on thang-died events.	2014-11-19 15:13:45 -08:00
Nick Winter	07a09e34d8	Fixed small-caps font-variant on docs popover titles.	2014-11-19 15:01:30 -08:00
Scott Erickson	13de055c0b	Set up a basic achievements list modal for the world map.	2014-11-19 14:56:40 -08:00
Nick Winter	fe018309d0	Don't show blurbs for aggro messages. Big announces action blurbs for heroes.	2014-11-19 14:29:11 -08:00
Nick Winter	5a71d93d8a	Hid play button for a couple more levels.	2014-11-19 14:29:11 -08:00
Nick Winter	0640f382ba	Fixed coordinate hover cursors fighting flag cursors. Added suspect code check functionality for scripts to slap hands.	2014-11-19 14:29:11 -08:00
Scott Erickson	63c516c5f5	Quick fix to get people to the forest levels even if, for some reason, the first forest level isn't in the User list of earned levels.	2014-11-19 10:05:13 -08:00
Nick Winter	2af8271829	Some size/styling tweaks for goals and gold.	2014-11-19 09:01:01 -08:00
iAladdin	0b9d6ea5c3	Merge branch 'master' of github.com:codecombat/codecombat	2014-11-19 12:51:59 +08:00
iAladdin	d24db06e0e	improved Chinese Localization ... Signed-off-by: iAladdin <ialaddin@me.com>	2014-11-19 12:51:39 +08:00
Nick Winter	96ff44017e	A few fixes for unequippable cross-class item state.	2014-11-18 19:37:08 -08:00
iAladdin	43f56c7ff7	Merge branch 'master' of github.com:codecombat/codecombat	2014-11-19 11:19:41 +08:00
iAladdin	5f1f02f8e8	improved Chinese localization	2014-11-19 11:19:31 +08:00
Nick Winter	3ad67130c7	A few bugfixes for new EaselJS problems and misaligned small-item-shop unequippable button.	2014-11-18 18:43:53 -08:00
Nick Winter	05b53fa10e	Merge branch 'iAladdin-master'	2014-11-18 18:16:35 -08:00
Nick Winter	b3119e300d	Resolved merge conflicts.	2014-11-18 18:16:17 -08:00
Nick Winter	666334b28c	Made paths more visible, because I couldn't see them.	2014-11-18 18:13:59 -08:00
iAladdin	4bd578c18e	improved Chinese localization	2014-11-19 09:45:15 +08:00
Scott Erickson	e93de815c2	Some tweaks to the TrailMaster, consolidating some changes and altering the dot style.	2014-11-18 16:18:51 -08:00
Scott Erickson	c40a7c1bb8	TrailMaster plays/pauses animations along with the rest of the Surface.	2014-11-18 16:03:47 -08:00
Scott Erickson	c23fb1d2b5	Removed TODO.	2014-11-18 15:57:06 -08:00
Scott Erickson	8ec016e4b2	Re-enabled RAF_SYNCHED, given the fix for https://github.com/CreateJS/EaselJS/issues/516	2014-11-18 15:56:33 -08:00
Scott Erickson	1444d84aea	Upgraded the CreateJS suite, handling its slight changes.	2014-11-18 15:42:11 -08:00
Matt Lott	957ca50c87	Disable spaces through The Raised Sword	2014-11-18 14:11:28 -08:00
Scott Erickson	5ee1289621	Goal states (for the purpose of triggering achievements) are now only saved as having succeeded when the overall level is succeeded.	2014-11-18 14:05:55 -08:00
Scott Erickson	1889c771f2	Added the close button to the GameMenuModal.	2014-11-18 13:57:44 -08:00
Scott Erickson	3008abed19	Made the Equip button in the inventory modal green.	2014-11-18 13:52:39 -08:00
Scott Erickson	6440ce528b	Fixed the CSS of the item details view in the scrunched item store.	2014-11-18 13:48:59 -08:00
Scott Erickson	acd94c4247	Fixed the nanoscroller in the item details view to be off the sheet and always visible.	2014-11-18 13:44:34 -08:00
Scott Erickson	46f9667311	Made the double click hint alert in the inventory modal more visible.	2014-11-18 13:28:04 -08:00
Scott Erickson	a04bc63b87	Equip hint and available header now are visible only when there are items to equip.	2014-11-18 13:20:59 -08:00
George Saines	6310dcbcac	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-11-18 13:02:36 -08:00
George Saines	c9d7754623	adding a close button to the main menu modal	2014-11-18 13:02:32 -08:00
Scott Erickson	208f05cf67	Added an equip button to every piece of available equipment.	2014-11-18 13:02:06 -08:00
Nick Winter	f5b5ee2206	Fixes for updating paths during world streaming.	2014-11-18 12:40:28 -08:00
Scott Erickson	aab51178e2	Added WebGL paths.	2014-11-18 11:46:47 -08:00
Nick Winter	f1a4249f18	More reductions in memory usage for iPad.	2014-11-18 11:21:29 -08:00
Matt Lott	b000389b3a	Add problem range highlighting back ... Now full line still pulses, and specific problem range has a darker red background.	2014-11-18 10:03:02 -08:00
Matt Lott	7b3b904ad1	Hide problem alert on code reload	2014-11-18 09:36:01 -08:00
Matt Lott	05cc9c2f46	Move sync pvp status UI to control bar ... Replaces level name UI for hero-ladder levels.	2014-11-18 09:01:07 -08:00
Nick Winter	547ba692e1	Turned off DOM highlight noise after A/B test insignificantly showed it hurting.	2014-11-18 08:05:20 -08:00
Nick Winter	d0233fc999	Fixed bug with primary spell being unreadable and thus no spells showing up in old, multi-spell levels.	2014-11-18 07:43:02 -08:00
Dloach	d9b4a63584	Update zh-HANS.coffee	2014-11-18 23:22:55 +08:00
Nick Winter	1a470a5745	Merge pull request #1762 from MountainWang/patch-1 ... Update zh-HANS.coffee	2014-11-18 07:03:12 -08:00
Nick Winter	daa4d63dcf	Merge pull request #1761 from Dloach/patch-1 ... Update zh-HANS.coffee	2014-11-18 07:03:00 -08:00
Nick Winter	6ef9532b1d	Fixed missing colon in bg.coffee.	2014-11-18 06:50:13 -08:00
Nick Winter	96e57a7520	Merge pull request #1759 from igornishka/patch-1 ... A couple of translations added :)	2014-11-18 06:49:26 -08:00
MountainWang	3615bc87e9	Update zh-HANS.coffee	2014-11-18 21:32:42 +08:00
iAladdin	d09c8c155b	improved Chinese localization	2014-11-18 18:43:37 +08:00
Dloach	f659240061	Update zh-HANS.coffee	2014-11-18 18:03:03 +08:00
Ehnydeel	fcb5f4246c	Add some more german translations ... Add some more german translations	2014-11-18 10:50:41 +01:00
Nick Winter	bf71893ddf	Significantly reduced memory usage and simulation time by further limiting the amount of Thangs which even start tracking ThangState in the first place.	2014-11-17 21:30:44 -08:00
Scott Erickson	95dca575d1	Set up stripe on the server and site to allow purchases through the website.	2014-11-17 15:15:08 -08:00
Nick Winter	d3da5e330a	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-11-17 15:09:14 -08:00
Matt Lott	f56d01419f	Update sync pvp teams and real-time playback ... -Non-creator will switch teams upon joining a sync pvp game, if creator is on same team -Team swapping should only affect level session -Real-time multiplayer submit now reloads PlayLevelView to ease loading both player’s latest level sessions, and then automatically starts real-time playback.	2014-11-17 15:07:10 -08:00
igornishka	3abe0db1e5	A couple of translations added :)	2014-11-18 01:00:28 +02:00
Nick Winter	9fabe74da6	Changed the name of incorrectly preloaded old spell palette background texture.	2014-11-17 14:45:09 -08:00
Nick Winter	736fbaa474	Merged de-DE.	2014-11-17 12:43:31 -08:00
Nick Winter	ec77a3b737	Builder's Hammer has been renamed to Crude Builder's Hammer.	2014-11-17 09:20:44 -08:00
Nick Winter	ccc4cf59db	Stop zooming in on hero during real-time playback, because it can mess with ability to place flags.	2014-11-17 09:09:04 -08:00
Nick Winter	a7069e19bd	Ignore (and warn about) achievements with empty queries. Fixed embarrassing bug with more-practice / skip-ahead branching not doing anything for non-admins.	2014-11-17 08:44:53 -08:00
Nick Winter	0d68ad250d	Fixed awardable items showing up in inventory/store items list when not earnned, and showing up at the end when earned.	2014-11-17 08:25:27 -08:00
Nick Winter	b6570236d8	Fixed flag history not getting cleared on real-time resubmission in single-player.	2014-11-17 08:00:44 -08:00
Nick Winter	e5aada2e5b	Incorporated tweaked victory modal background assets.	2014-11-16 21:26:21 -08:00
Nick Winter	5927b36402	Made a few new levels available for advance early playtesting.	2014-11-16 20:38:27 -08:00
Matteo Canu	b8abeed60c	Added more translations	2014-11-16 18:15:24 +01:00
Nick Winter	4aff5265c3	Fixed being unable to select important spells on a few old, multi-spell levels.	2014-11-16 08:11:39 -08:00
Nick Winter	f9a7aba5d9	Some fixes for programmatically generated flag events not polluting session flag history.	2014-11-15 16:56:35 -08:00
Imperadeiro98	eb23438f6a	Update en.coffee ... Updated achievements titles. Don't know if lines 750-752 are needed or not, as they do not display in the website.	2014-11-15 22:01:06 +00:00
Nick Winter	0f70b7e552	Admins can play all heroes. Fixed another bug with playback controls being disabled when they shouldn't be.	2014-11-15 12:46:57 -08:00
Imperadeiro98	2da1b7d65e	Update pt-PT.coffee	2014-11-15 19:05:04 +00:00
Imperadeiro98	0a0b3b2041	Update pt-PT.coffee	2014-11-15 19:02:51 +00:00
Nick Winter	74aefa42b9	Merged in sunxb10's translations.	2014-11-15 07:42:57 -08:00
Nick Winter	e28f6bf994	Propagated i18n.	2014-11-15 07:40:58 -08:00
Nick Winter	b7c2a33ddc	Fixed some i18n on the PlayHeroesModal, and started showing special hero skills.	2014-11-15 07:40:10 -08:00
Nick Winter	7bbc270f26	Merge pull request #1748 from Imperadeiro98/master ... Update achievements.jade	2014-11-15 07:32:28 -08:00
Nick Winter	61308feca7	Merge pull request #1745 from LuSilf/master ... Some translation in ru.coffee	2014-11-15 07:32:15 -08:00
Nick Winter	55196bc589	Fixed disabling of playback accidentally when disabling anything.	2014-11-14 18:25:07 -08:00
Ehnydeel	d23cf5c725	Added some german translations ... Added some german translations	2014-11-14 22:27:24 +01:00
Scott Erickson	8c953fffed	Hid the G+ "Welcome back" message, since we are managing logins manually now.	2014-11-14 11:14:08 -08:00
Scott Erickson	36305cde97	Altered the G+ login button to only login when you click it, it gives feedback on login progress, and fixed a bug where sometimes there would be a cross-domain error because we were trying to serialize a window.	2014-11-14 11:04:24 -08:00
Nick Winter	635c4e18df	Restricted Roughedge and Sharpened Sword for Kithgard Gates Builder's Hammer swap, too.	2014-11-14 11:03:01 -08:00
Nick Winter	7e12c10649	Temporarily disabled code toolbar for a few more levels. Worked around The First Kithmaze / Haunted Kithmaze switch for preventing level unlock problems.	2014-11-14 09:24:42 -08:00
Nick Winter	5fde9e6a64	Merge pull request #1740 from ann304/patch-1 ... Update vi.coffee	2014-11-14 06:59:17 -08:00
sunxb10	1c560511c3	Simplified Chinese translation (zh-HANS)	2014-11-14 18:01:51 +08:00
Nick Winter	01d6c6d239	Stop whole-line selection on gutter clicks.	2014-11-13 10:54:50 -08:00
Nick Winter	05a3577de9	Fixed a mistake with level progression around the Forgetful Gemsmith move. Fixed double-click-to-equip sizing. Locked purchases for cross-class items for real now. Additional insurance for clearing selection after code reload.	2014-11-13 10:49:37 -08:00
Imperadeiro98	4c8d959c8a	Update achievements.jade ... The titles were not being translated.	2014-11-13 17:02:32 +00:00
Nick Winter	29860caeea	Implemented new blue background texture for dialogue messages.	2014-11-12 20:45:15 -08:00
Nick Winter	4fe6fd3020	Some fixes for loading iPad gem products.	2014-11-12 20:21:14 -08:00
Scott Erickson	ed8285248f	Put in the new InventoryModal background.	2014-11-12 18:01:35 -08:00
Scott Erickson	73fee3e801	Added a gems icon to the world map.	2014-11-12 17:19:56 -08:00
Scott Erickson	5b034194ee	Put in the new BuyGemsModal design.	2014-11-12 17:17:24 -08:00
George Saines	50b4e79c7b	Merge branch 'master' of https://github.com/codecombat/codecombat	2014-11-12 16:48:10 -08:00
George Saines	8440f38bd4	added a buy gems icon to the map icon spritesheet	2014-11-12 16:48:05 -08:00
Scott Erickson	07cf741015	Changed the campaign switching icons arrows nested in the campaign maps.	2014-11-12 16:26:35 -08:00
Nick Winter	ba6565395e	Spell palette cool with multiple items offering same skills.	2014-11-12 15:28:08 -08:00
Scott Erickson	025780a575	Added loadingTip property to levels, set them up on the LevelLoadingView, and got them prepped for i18n-ing.	2014-11-12 15:00:24 -08:00
Scott Erickson	6e433e1b77	Filtered out achievement popups for level achievements.	2014-11-12 14:40:01 -08:00
Scott Erickson	1b73569072	Forgot jade != coffeescript.	2014-11-12 14:34:23 -08:00