Commit graph

8824 commits

Author SHA1 Message Date
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
Nick Winter
fc2f623fd0 Merge pull request #2365 from popey456963/master
Mismatched Tags and Header Syntax
2015-02-23 14:48:23 -08:00
Aman Kumar
d8a4803268 Issue #2267: Removed duplicates from TreemaData 2015-02-24 03:18:35 +05:30
Imperadeiro98
8da626f03b Merge pull request #2386 from Coderaulic/patch-1
Update ja.coffee
2015-02-23 20:27:27 +00:00
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
Nick Winter
768ef7818c Removed unneeded mongodb driver, since Mongoose uses its own. 2015-02-22 11:38:51 -08:00
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
Imperadeiro98
a4f50c4dd1 Merge pull request #2374 from Coderaulic/patch-1
Update ja.coffee
2015-02-22 13:30:52 +00:00
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
498eae328a Migrated from mongoose-text-search to new built-in operators. Fixed #2367. 2015-02-21 14:22:51 -08: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
Popey456963
af76960f7e Changed Syntax of Readme.MD
More widely supported
2015-02-21 06:15:52 +00:00
Ryan Marren
a7dadc34aa Added level indicator 2015-02-20 23:50:42 -05:00