Commit graph

1476 commits

Author SHA1 Message Date
Jasper D'haene
fa6ef5aa49 added authors to quotations 2014-03-28 19:58:33 +01:00
Jasper D'haene
cd3019296c added tips/quotes to loading bar 2014-03-28 19:01:31 +01:00
JasperDhaene
748081b4a7 Added myself to the diplomate list, fixed typos and made corrections to Dutch locale 2014-03-25 09:25:20 +01:00
JasperDhaene
58601e95f6 finished review of nl.coffee 2014-03-23 22:54:30 +01:00
JasperDhaene
e5d2c07ff1 general revision until line 254 2014-03-23 17:30:45 +01:00
JasperDhaene
dde626e759 Update nl.coffee - small revisions/additions 2014-03-23 16:57:33 +01:00
Nick Winter
fd2d9b6833 Merge pull request #658 from ItsLastDay/editor_tweaks
Added tooltip in level-editor (issue #174)
2014-03-22 17:30:52 -07:00
Nick Winter
487b2aae9b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-22 14:28:25 -07:00
Nick Winter
eec46dcb48 Don't try to draw a grid if it's not going to work (no lands). 2014-03-22 14:28:18 -07:00
Mikhail Koltsov
2316773cb1 removed Label requierment 2014-03-22 23:25:18 +04:00
Mikhail Koltsov
36cfdfda46 Added labels above selected thangs in level-editor (issue #174) 2014-03-22 23:17:15 +04:00
Michael Schmatz
c3b745b271 Added Catalan language file 2014-03-22 11:30:58 -07:00
Nick Winter
76ec738213 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-22 10:54:38 -07:00
Nick Winter
5e311cdefa Fixed css for IE warnings. 2014-03-22 10:54:35 -07:00
Nick Winter
96fe1e42f0 Merge pull request #657 from adi2412/reloadCode
Made changes to reloadAllCode to reload only the team's code.
2014-03-22 10:36:17 -07:00
Aditya Raisinghani
bee5d528ec Made changes to reloadAllCode to reload only the team's code. 2014-03-22 22:56:41 +05:30
Mikhail Koltsov
baf8adcc74 added nothing 2014-03-22 20:50:50 +04:00
Nick Winter
29e7b8e5c1 Fixed mail to correctly capture the matches. 2014-03-22 09:48:36 -07:00
Michael Schmatz
5141873725 Added resimulateAllSessions method 2014-03-22 09:07:01 -07:00
Nick Winter
808cf9280b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-22 08:53:02 -07:00
Nick Winter
d289ca825e Fixed Simulator to actually use protectAPI. 2014-03-22 08:52:47 -07:00
therealbond
7d03c2e520 Merge branch 'master' of https://github.com/therealbond/codecombat 2014-03-22 02:05:19 -04:00
therealbond
b2c500369b Added more names for #53 2014-03-22 01:56:32 -04:00
Scott Erickson
0df09f7f35 Fixed an ever-reloading bug. 2014-03-21 21:11:51 -07:00
Scott Erickson
2cdfbf1c48 Merged conflicts. 2014-03-21 19:56:25 -07:00
Scott Erickson
6445924598 Merge branch 'master' of https://github.com/codecombat/codecombat
Conflicts:
	app/templates/play/ladder/ladder_tab.jade
	app/views/play/ladder/ladder_tab.coffee
2014-03-21 19:53:32 -07:00
Scott Erickson
14ee9c30ce Added facebook friends to the ladder page. 2014-03-21 19:50:54 -07:00
Nick Winter
b91f3200c2 Merge pull request #649 from jayant1992/master
Fixes #641, the list of levels in editor reloads properly upon changing ...
2014-03-21 17:46:10 -07:00
Nick Winter
e101fb04eb For #648: Keeping localStorage fallback for played levels temporarily until most have migrated to user property. Fixed #627. 2014-03-21 17:42:13 -07:00
Nick Winter
5abe0746ba Merge pull request #648 from dpen2000/lastLevel
Implement saving lastLevel in database re #627
2014-03-21 17:27:31 -07:00
Jayant Jain
860c3a34d3 Fixes #641, the list of levels in editor reloads properly upon changing language 2014-03-22 05:51:44 +05:30
Nick Winter
dfcdcaa678 No email addresses for non-admins on CLA submissions. 2014-03-21 17:20:47 -07:00
Nick Winter
4bc1e6805b Improved page title. Fixed Twitter card image. 2014-03-21 17:06:51 -07:00
dpen2000
a35d0cb651 Implement saving lastLevel in database re #627 2014-03-22 00:01:32 +00:00
Nick Winter
f0640dd2e8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-21 16:22:51 -07:00
Nick Winter
ba66dbf5a1 Adding CLAs view. 2014-03-21 16:22:47 -07:00
Nick Winter
893f446b0a Merge pull request #645 from dpen2000/autocastDelay
Save autocastDelay as a setting on User re #627
2014-03-21 16:01:00 -07:00
dpen2000
b1b0579cb3 Save autocastDelay as a setting on User re #627 2014-03-21 22:46:14 +00:00
dpen2000
6363c40fe2 Update cla.jade
p -> a. Using html syntax to avoid linking full stop.
2014-03-21 21:59:31 +00:00
Sérgio Batista
ee4858f725 Update pt-PT.coffee
Some new additions and minor fixes to old ones
2014-03-21 16:39:47 +01:00
Nick Winter
b30bf35945 Fixed #638, I hope. 2014-03-21 08:09:08 -07:00
Nick Winter
a3dadd6a40 Merge branch 'editor_tweaks' of git://github.com/ItsLastDay/codecombat into ItsLastDay-editor_tweaks 2014-03-21 07:25:33 -07:00
Mikhail Koltsov
096c59b6cf fix some assymetry 2014-03-21 15:42:29 +04:00
Mikhail Koltsov
af18e7a27e Thang editor: components tab finally looks good and does not overlay other tabs 2014-03-21 15:40:32 +04:00
Mikhail Koltsov
45b87ed38e finally got it right 2014-03-21 13:45:56 +04:00
Mikhail Koltsov
0ece400a18 Level editor: selecting a thang now moves the scroll in existant-thang list 2014-03-21 11:54:55 +04:00
David Hallberg Jönsson
75138cb67b Update sv.coffee
Updated some existing translations, mostly grammar corrections.
2014-03-21 08:40:37 +01:00
Nick Winter
424390ae84 Moved antiscroll init; disabled it for now because of bugginess. 2014-03-20 22:00:34 -07:00
Karthig
f52dced0ce - initial implementation of antiscroll, squashed 2014-03-20 21:39:03 -07:00
Nick Winter
89d720dc30 Uncommented multiplayer modal i18n section for Polish. 2014-03-20 21:29:03 -07:00