8873 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Imperadeiro98	90e02cba48	Updated i18n	2015-06-30 20:33:05 +01:00
Imperadeiro98	0ef6dfcc30	Updated i18n in add-thangs-view.jade	2015-06-30 20:33:03 +01:00
Imperadeiro98	92052ceb5b	Update pt-PT.coffee	2015-06-30 19:59:50 +01:00
Nick Winter	4742b23854	Propagated i18n.	2015-06-30 11:29:18 -07:00
Nick Winter	b0c7b50761	Added programming concept tags to campaign and level editor.	2015-06-30 11:27:58 -07:00
Nick Winter	8df32b47d0	Some tweaks to #2876.	2015-06-30 10:31:52 -07:00
Nick Winter	1d6f777b58	Merge pull request #2876 from tahmidshahriar/master ... Fixed email requirement	2015-06-30 10:13:50 -07:00
tahmidshahriar	259c91b62d	fix unneeded changes	2015-06-30 09:37:39 -07:00
tahmidshahriar	56b81f175e	Fix email	2015-06-30 09:35:45 -07:00
Nick Winter	8155d6fba0	Merge pull request #2873 from UltCombo/gh-2740 ... updateLevelRequiredItems: special-case rings, fixes #2740	2015-06-29 19:46:55 -07:00
Nick Winter	be2f47c79a	Merge pull request #2857 from laituan245/for2806_teacher_survey ... Fixes #2806 (radio buttons of teacher survey page)	2015-06-29 19:37:06 -07:00
UltCombo	7d7d2d5f0e	updateLevelRequiredItems: special-case rings, fixes #2740 ... Rings often have unique effects instead of progressively enhancing another ring's effect, hence let's make rings required even if there's already non-restricted rings equipped. If, by any chance, there's ever a new ring which enhances the effect of a ring which is required for some level, then it should be easy enough to whitelist it in the given ring slot's allowed items array.	2015-06-29 21:25:43 -03:00
Imperadeiro98	e1e1328906	Updated i18n in account-settings-root-view.jade	2015-06-29 20:26:45 +01:00
Matt Lott	e36cf0ca3f	Initial courses mock UI ... Do not localize these files. This is under construction.	2015-06-29 12:15:10 -07:00
Imperadeiro98	e932d27242	Merge pull request #2871 from SuperPranx/patch-1 ... Added new translations and modified existing ones	2015-06-29 20:05:49 +01:00
Matt Lott	8c6fd49f43	Clans view class name typo	2015-06-29 11:51:38 -07:00
Nick Winter	11d69880f7	Merge pull request #2868 from UltCombo/required-rings ... Improved `updateLevelRequiredItems` logic regarding rings, fixes #2740	2015-06-29 11:19:04 -07:00
Nick Winter	ba3a1dd3df	Merge pull request #2869 from UltCombo/2828 ... fix #2828	2015-06-29 11:14:09 -07:00
Nick Winter	39f8a8a8af	Fixed #2870.	2015-06-29 11:13:15 -07:00
Nick Winter	d7f88c3d95	Merge pull request #2856 from laituan245/for2854 ... Fixes #2854	2015-06-29 11:03:47 -07:00
Nick Winter	3074737398	Merge branch 'tahmidshahriar-master'	2015-06-29 11:01:38 -07:00
tahmidshahriar	4d8c539b2c	Merge remote-tracking branch 'upstream/master'	2015-06-29 09:51:26 -07:00
Ivan Milanov	c7dc30ea64	Added new translations and modified existing ones	2015-06-29 17:23:13 +02:00
Imperadeiro98	d4f1fcaaed	Added i18n	2015-06-28 11:43:56 +01:00
Imperadeiro98	f4e54d4f54	Updated i18n in add system	2015-06-28 11:43:53 +01:00
UltCombo	cc8b8fa8be	fix #2828	2015-06-28 00:32:08 -03:00
UltCombo	63299c4d80	Improved updateLevelRequiredItems logic regarding rings, fixes #2740 ... This fixes the main issue of #2740, allowing the player to play the level if the required ring is equipped on either ring slot. There's still a small problem: if the player already had a ring equipped in the `right-ring` slot, the Ring of flowers will not display as required due to this [line](0df6da7efa/app/views/play/menu/InventoryModal.coffee (L436)). This seems to be a different issue though, probably related to the `unequipLevelRestrictedItems` logic.	2015-06-27 22:22:37 -03:00
Imperadeiro98	0df6da7efa	Merge pull request #2863 from Imperadeiro98/master ... Updated i18n	2015-06-27 12:41:14 +01:00
Imperadeiro98	5eed3361f3	Updated i18n	2015-06-27 12:40:48 +01:00
Imperadeiro98	737dd56754	Updated i18n in save-version-modal.jade	2015-06-27 12:40:41 +01:00
Imperadeiro98	d868894845	Updated i18n in play-account-modal.jade	2015-06-27 12:39:42 +01:00
Imperadeiro98	1587486c1c	Merge pull request #2860 from nixel2007/master ... Update ru.coffee. Sync type_in_email	2015-06-25 21:40:43 +01:00
Nikita Gryzlov	2d7e9e88f9	Update ru.coffee. Sync type_in_email ... Sync type_in_email	2015-06-25 23:31:33 +03:00
Lai Tuan	1453c132fe	Fixes #2806	2015-06-25 23:58:12 +09:00
Lai Tuan	29d19ffc37	Fixes #2854	2015-06-25 23:30:13 +09:00
tahmidshahriar	4ac7408166	Fix small change in not-found to keep change to minimum	2015-06-24 14:53:52 -07:00
tahmidshahriar	e287e515f1	Fix small change in not-found to keep change to minimum	2015-06-24 14:51:07 -07:00
tahmidshahriar	f6a35f1fd4	Fixed not found page (got rid of NotFoundView in core)	2015-06-24 14:49:26 -07:00
tahmidshahriar	6ac3ea9f5f	Fixed not found page	2015-06-24 14:46:59 -07:00
Nick Winter	270340a79f	Removed Learnable.	2015-06-24 09:18:13 -07:00
Imperadeiro98	f7fa760ea4	Merge pull request #2852 from nixel2007/patch-1 ... Update en.coffee. {change} added.	2015-06-23 12:15:21 +01:00
Nikita Gryzlov	8c5b67d826	Update en.coffee. {change} added.	2015-06-23 10:59:14 +03:00
Imperadeiro98	a9eeb7723b	Update pt-PT.coffee	2015-06-22 20:46:53 +01:00
Nick Winter	aa1150768f	Propagated i18n.	2015-06-22 11:59:28 -07:00
Nick Winter	b3b1235767	Merge pull request #2851 from Imperadeiro98/master ... Removed unnecessary i18n from about page	2015-06-22 11:55:51 -07:00
Imperadeiro98	80bb030951	Removed unnecessary i18n	2015-06-22 19:18:47 +01:00
Imperadeiro98	cbf65ff352	Removed unnecessary i18n from about page	2015-06-22 19:18:18 +01:00
Imperadeiro98	28bd871637	Merge pull request #2850 from nixel2007/master ... Update ru.coffee	2015-06-22 19:04:52 +01:00
nixel2007	8f3efeb97c	Update ru.coffee. teachers_survey	2015-06-22 20:00:42 +03:00
nixel2007	a3781d887a	Update ru.coffee ... Misc.	2015-06-22 17:56:12 +03:00