codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-12-04 21:01:06 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
9442 commits 27 branches 0 tags 134 MiB
Commit graph

9442 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Erickson
1efb96f24a Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/templates/play/ladder/ladder_tab.jade
 2014-03-03 12:08:11 -08:00
Scott Erickson
4ef9280a46 Merge remote-tracking branch 'origin/master' 
Conflicts:
	app/templates/play/ladder/ladder_tab.jade
 2014-03-03 12:07:57 -08:00
Scott Erickson
fb75ad36e7 Added team icons to the ladder play view. 2014-03-03 12:04:31 -08:00
Nick Winter
cc9cf64539 Corrected link to view your own matches in leaderboard view. 2014-03-03 11:55:26 -08:00
Ruben Vereecken
942b69ea9f Created hasWriteAccess on Cocomodel, used it for level access 2014-03-03 20:41:35 +01:00
Scott Erickson
65d39e658d Removed the old team view cruft. 2014-03-03 11:15:46 -08:00
Scott Erickson
ff3f3e5a07 Removed a link to the old team view. 2014-03-03 11:11:27 -08:00
Scott Erickson
c5521a1311 Level now uses the universal wizard thang type. 2014-03-03 11:04:03 -08:00
Scott Erickson
0d054bec8e Refactored the universal wizard loading to happen silently when you import ThangType. 2014-03-03 10:42:11 -08:00
Scott Erickson
feaeb1dc98 Made the wizard icons colored based on user settings. 2014-03-03 10:21:51 -08:00
Michael Schmatz
ae4366bdb1 Merge pull request #463 from codecombat/master 
Merge ladder view into production
 2014-03-03 09:54:22 -08:00
Scott Erickson
d3b6836a06 Fixed some bugs with the new ladder view when you haven't played before. 2014-03-03 09:20:14 -08:00
Scott Erickson
5bb56ac818 Merge branch 'feature/new-ladder-view' 2014-03-03 09:05:52 -08:00
Scott Erickson
22e80f6d24 Set up a play modal, starting to refactor wizard thang type loading to be shared across the site. 2014-03-03 09:03:44 -08:00
Michael Schmatz
b737b2d9e2 Merge pull request #462 from codecombat/master 
Merge master into production
 2014-03-03 08:48:42 -08:00
Michael Schmatz
8399667b49 Fixed submit date checks 2014-03-03 08:47:11 -08:00
Nick Winter
7a670feefb Merge pull request #460 from karthigb/master 
Issue #1 - improve 404 page
 2014-03-03 08:45:44 -08:00
Karthig
b04d63d5bf - create sass file to center 404 image on page 2014-03-03 11:42:07 -05:00
Nick Winter
9a40eb623c Added translation by @rdxiang of server_config.js to server_config.coffee 2014-03-03 08:21:15 -08:00
Nick Winter
967d6cd889 Let's try this without the request timeout middleware, to see if we still need that. 2014-03-03 08:13:53 -08:00
Nick Winter
f2f8c00c6b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 08:10:57 -08:00
Nick Winter
a5adf5a1bf Tweaked status colors for production logging; applying it only when in production. 2014-03-03 08:10:36 -08:00
Karthig
357ef45cb0 - insert random error image into 404 page 2014-03-03 10:58:33 -05:00
Nick Winter
ab16c0f8e0 Merge branch 'master' of git://github.com/adi2412/codecombat into adi2412-master 2014-03-03 07:45:35 -08:00
Nick Winter
20fb9ba5b4 Merge pull request #461 from rubenvereecken/master 
Localization centred patches and additions
 2014-03-03 07:37:46 -08:00
Nick Winter
980a3b6f21 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-03 07:29:07 -08:00
Nick Winter
f0fdb24600 Merge branch 'mnmtanish-thanish-move-wizard' 2014-03-03 07:28:56 -08:00
Nick Winter
86fd098159 Localized WizardSprite movement hey handling to WizardSprite file. 2014-03-03 07:28:40 -08:00
Nick Winter
f2f0a993af Merge branch 'thanish-move-wizard' of git://github.com/mnmtanish/codecombat 2014-03-03 07:22:44 -08:00
Nick Winter
a665aca039 Merge pull request #443 from M-r-A/master 
Finalized Russian translations
 2014-03-03 07:21:49 -08:00
Nick Winter
c858fb5e24 Merge pull request #440 from FinnDS/patch-1 
Update names.coffee
 2014-03-03 07:20:55 -08:00
Glen De Cauwsemaecker
d57b6cd168 Merge https://github.com/codecombat/codecombat 2014-03-03 13:11:59 +01:00
Ruben Vereecken
b8b22bb739 Localized 'Create New ..' and 'Search .. Here' 2014-03-03 12:45:04 +01:00
Michael Schmatz
239ca83a84 Perhaps buggy fix to scheduling 2014-03-02 19:11:42 -08:00
Michael Schmatz
81466675ec Scheduling fixes 2014-03-02 18:55:10 -08:00
George Saines
94b98a2d46 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-02 18:21:46 -08:00
George Saines
4b6ebd6532 styled the victory modal a bit 2014-03-02 18:21:42 -08:00
Nick Winter
82b250b9a3 protectAPI off again for Brawlwood, too slow for now. 2014-03-02 17:51:57 -08:00
Nick Winter
ca274f9787 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-03-02 16:06:31 -08:00
Nick Winter
a8ef87c9ea Fixed a few bugs; re-enabled protectAPI for Brawlwood. 2014-03-02 16:06:22 -08:00
Ruben Vereecken
c2d247e686 Editor tables now load i18n correctly after search. 2014-03-03 00:31:49 +01:00
Ruben Vereecken
c3c699df49 Fixed wrong i18n name 'account_settings.autosave'. Added missing i18n name 'account_settings.email_notifications' 2014-03-02 23:28:16 +01:00
Ruben Vereecken
bea002a8d4 Fixed some wrong translations 2014-03-02 22:59:15 +01:00
Scott Erickson
956e2b3c40 Set up the my matches tab in the new ladder view. 2014-03-02 13:24:41 -08:00
Scott Erickson
d0f416f668 Rearranging the ladder view. 2014-03-02 12:43:21 -08:00
Nick Winter
de40405871 Merge pull request #457 from rubenvereecken/master 
Patched up Dutch (NL) Locale
 2014-03-02 11:47:47 -08:00
Ruben Vereecken
e4bf752e20 Changed Dutch (NL) ambassador_summary to match the English version 2014-03-02 20:30:18 +01:00
Ruben Vereecken
60f79e261d Patched up tonnes of minor language mistakes (Dutch-Nederlands) 2014-03-02 20:24:14 +01:00
Ruben Vereecken
fb57e634a5 Patched up some grammar mistakes (Dutch-Nederlands). 2014-03-02 18:44:47 +01:00
Muhammed Thanish
da2ebf857a Increase delay 2014-03-02 14:02:30 +05:30