Commit graph

6879 commits

Author SHA1 Message Date
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
ae60e3ab46 Merge branch 'popey456963-master' 2015-01-12 14:43:45 -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
Scott Erickson
f9a01db985 Added a delete endpoint for files. Fixes #33. 2015-01-12 13:37:01 -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
Elliott Seyler
70542acb04 Commenting out mongo autostart on Arch. 2015-01-12 12:03:54 -08:00
Scott Erickson
da93c45ef3 Tweaked emailLower and nameLower auto-setting to not set if their respective depending properties do not exist. With minimizing mongoose off, this was causing db duplicate key problems. 2015-01-12 11:51:48 -08: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
Elliott Seyler
a9974b2929 Adding build-essential for Ubuntu 2015-01-11 22:37:56 -08:00
Elliott Seyler
c638090cc9 Missing import 2015-01-11 22:35:24 -08:00
Elliott Seyler
84c2d3b9a7 Ubuntu starts mongo automatically 2015-01-11 22:32:51 -08:00
Elliott Seyler
9153e1463d Adjusting the subprocess call. 2015-01-11 20:42:34 -08:00
Elliott Seyler
ace7d3d64e Switching to a fresher source of node for Ubuntu 2015-01-11 20:23:44 -08:00
Elliott Seyler
6c731d1e03 Python2 fix 2015-01-11 19:08:59 -08:00
Elliott Seyler
33b505bd87 Fixing Ubuntu code slightly. 2015-01-11 19:01:01 -08:00
Elliott Seyler
9465a41efd Added Arch and Ubuntu distro-specific installation options. 2015-01-11 16:26:59 -08:00
Elliott Seyler
247db0c7f3 Testing for Python 2/3 before installing Node packages. 2015-01-11 16:26:21 -08: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
Imperadeiro98
b931f7824d Merge pull request #2081 from RubenDjOn/master
New es.ES translations
2015-01-10 22:24:45 +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
Imperadeiro98
29c37a376f Merge pull request #2076 from SuperPranx/patch-1
Added new translations
2015-01-10 11:15:05 +00:00
Nick Winter
58716f5b75 Revert "Fixed #1076, and all other instances of empty objects being stripped out of documents. Turns out mongoose was doing this intentionally as a feature? I don't understand why that's on by default. Oh mongoose."
Saw that this caused 500s on /auth/whoami with no cookies set, with this error:

debug: 500: MongoError: E11000 duplicate key error index: coco.users.$emailLower_1 dup key: { : null }

Probably we need to be much more careful about what changes this blanket change to the minimize Mongoose option might introduce, since tests didn't catch this, but it would have taken the site down for anyone not logged in already.

This reverts commit 121f07d020.
2015-01-09 18:30:05 -08: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
Scott Erickson
121f07d020 Fixed #1076, and all other instances of empty objects being stripped out of documents. Turns out mongoose was doing this intentionally as a feature? I don't understand why that's on by default. Oh mongoose. 2015-01-09 11:56:54 -08: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