codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-24 16:17:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
3995 commits 27 branches 0 tags 134 MiB
Commit graph

719 commits

Author SHA1 Message Date
Nick Winter
b2bf4db222 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-02-07 16:47:38 -08:00
Scott Erickson
0365998658 Began work on a ladder view. 2014-02-07 15:51:05 -08:00
Nick Winter
2efb9a0ea1 Simple team switch links in multiplayer menu. 2014-02-07 10:51:21 -08:00
Nick Winter
86de427204 Messing with team setting. 2014-02-06 17:31:08 -08:00
Michael Schmatz
b93b5d3062 Added xavismeh to french translators 2014-02-06 14:42:56 -08:00
Nick Winter
738b791683 Updated to new Aether range info, fixing error line numbers. 2014-02-03 13:58:25 -08:00
Nick Winter
546914052d A few tweaks to wizard floating. 2014-02-01 11:02:20 -08:00
Nick Winter
b502c24ece A few updates to the contributors lists. 2014-02-01 08:22:26 -08:00
Scott Erickson
6d5e9d13c9 Changed the links for artisan documentation to the new wiki pages. 2014-01-30 15:29:20 -08:00
Scott Erickson
3ca6a5709b Fixed a bug where systems tabs would change components tabs. 2014-01-30 15:27:10 -08:00
Scott Erickson
5f81eb670b Some styling fixes, removed commented out stuff. 2014-01-30 14:37:33 -08:00
Scott Erickson
231e8582fa Added some basic control tips to the thang components edit view. 2014-01-30 12:07:01 -08:00
Scott Erickson
827b5a3756 Fixed the world select modal. 2014-01-30 11:55:46 -08:00
Scott Erickson
65f74e9587 Improved the navbars in the level editor. 2014-01-30 11:37:40 -08:00
Nick Winter
e0108a3166 A few fixes for the Bootstrap 3 migration. Fixed #280. 2014-01-29 12:18:37 -08:00
Scott Erickson
065a1c4c27 New editor layout. 2014-01-28 13:16:50 -08:00
Scott Erickson
407d2c7768 Merge branch 'master' into feature/bootstrap3 
Conflicts:
	app/styles/editor/level/edit.sass

Also experimenting with a new layout for the level editor.
 2014-01-28 12:46:33 -08:00
Scott Erickson
6e9f93d299 Merge branch 'master' into feature/bootstrap3 
Conflicts:
	app/styles/editor/level/edit.sass

Also experimenting with a new layout for the level editor.
 2014-01-28 12:46:17 -08:00
Scott Erickson
55ea4d86e4 Made the level editor layout more stretchy. 2014-01-28 12:27:11 -08:00
Scott Erickson
9336a637ce Merge branch 'master' into feature/bootstrap3 2014-01-27 21:25:26 -08:00
Scott Erickson
a82a6a4188 Systems part of #266. 2014-01-27 21:25:01 -08:00
Scott Erickson
ca026610b1 Component part of #266. 2014-01-27 21:06:27 -08:00
Scott Erickson
0b7224e2f4 Tweaked the home page button. #279 2014-01-27 19:11:39 -08:00
Scott Erickson
b4cd7bdec4 Fixed #281 2014-01-27 19:03:22 -08:00
Scott Erickson
a239ba3465 Removed some more .controls from forms. 2014-01-27 18:50:03 -08:00
Scott Erickson
13af9febbf More fixes for #283 2014-01-27 18:44:05 -08:00
Scott Erickson
096d318e96 Fixed #283 2014-01-27 18:05:39 -08:00
Scott Erickson
d6e21192f5 Fixed #278 2014-01-27 16:59:34 -08:00
Scott Erickson
9c7ac3dfdc Fixed the top nav height. 2014-01-27 16:20:13 -08:00
Scott Erickson
22e6942165 Fixed account settings page. 2014-01-27 16:07:17 -08:00
Scott Erickson
056b81115d Fixed profile page. 2014-01-27 11:45:24 -08:00
Scott Erickson
26d6c2dc5b Fixed the new model modal in search. 2014-01-27 11:30:22 -08:00
Scott Erickson
b48fb6823e Fixed the progress bar for loading pages. 2014-01-27 11:12:58 -08:00
Scott Erickson
88c8c3896b Merge branch 'master' into feature/bootstrap3 2014-01-27 11:03:04 -08:00
Scott Erickson
9da955d1a2 Set up a backup system for the editor using localStorage. 2014-01-26 14:46:25 -08:00
Nick Winter
47c78d1758 Revamped SpellToolbarView. 2014-01-25 15:11:29 -08:00
Scott Erickson
0727e11669 Merge branch 'bootstrapMigration' of https://github.com/TomSteinbrecher/codecombat into feature/bootstrap3 
Conflicts:
	app/templates/play/level/playback.jade
 2014-01-23 20:15:36 -08:00
Tom Steinbrecher
cd33376dea Upgrade from Bootstrap 2 to Bootstrap 3 2014-01-23 21:49:29 -05:00
Scott Erickson
01a43bb3d7 Added filters to the extant thangs column. 2014-01-21 10:42:09 -08:00
Nick Winter
24c4051442 Merge branch 'feature/time-travel-debugger' 2014-01-21 09:04:09 -08:00
Nick Winter
6ea4f645f8 Added spell toolbar view. Made many time-travel debugger improvements. 2014-01-21 09:03:04 -08:00
Scott Erickson
e61d31f48c Level editor displays thangs in a more orderly fashion. 2014-01-20 23:02:23 -08:00
Scott Erickson
cc8bd156ec Put back the portraits in the thang type search view. 2014-01-20 22:38:14 -08:00
Scott Erickson
2cf19a4781 Renamed canvases to spritesheets in the edit thang view. 2014-01-20 22:37:47 -08:00
GlenDC
4186333cce Merge branch 'translation_fr2' of https://github.com/MartinDelille/codecombat 2014-01-19 18:44:25 +01:00
GlenDC
9313e5cc70 Found more tags. ar, bg and nl should have now the correct versions with the (re)moved i18n tags. 2014-01-19 18:43:55 +01:00
MartinDelille
5caa6870cc fix i18n tag in editor and setting template 2014-01-19 18:20:41 +01:00
Nick Winter
f87c3a37e8 More progress on debugger. 2014-01-19 09:14:42 -08:00
GlenDC
95c81e4672 Found more duplicate i18n tags and applied it both to the ar.coffee and nl.coffee file 2014-01-19 17:19:19 +01:00
GlenDC
6c46dc3fda Tracked down common used i18n tags and applied it already on the nl.coffee file 2014-01-19 17:00:41 +01:00
Nick Winter
0a8d64046a Starting work on time-travel debugging interface. 2014-01-19 07:08:28 -08:00
GlenDC
882302d66e Resolved issue #149 2014-01-19 15:59:33 +01:00
Scott Erickson
8b0a0c4e51 Added unsubscribe view. 2014-01-17 10:47:42 -08:00
Scott Erickson
6e47a6b8fd Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-17 09:53:40 -08:00
Scott Erickson
3caf16ae0c Set up sendwithus. 
Created a 'notification' email subscription.
 2014-01-17 09:53:17 -08:00
Nick Winter
053927eaec Fixed home page wizard scale. 2014-01-16 16:27:34 -08:00
Scott Erickson
c5b9b103c5 Merge branch 'feature/team-colors' 
Conflicts:
	app/lib/world/world.coffee
	app/models/ThangType.coffee
 2014-01-16 10:14:21 -08:00
Nick Winter
af7344175a Merged and tweaked phansch's save indicator from #205. 2014-01-16 10:10:27 -08:00
Nick Winter
6f5b37e86d Possible fix for Grab the Mushroom problems. 2014-01-16 09:20:02 -08:00
Philipp Hansch
ff5807adb8 New i18n tag 2014-01-16 13:37:52 +01:00
Michael Schmatz
74d5b1a845 Merge pull request #199 from GlenDC/master 
Issue #30 is resolved + Added Dutch Translations + Hotfixes
 2014-01-15 15:54:04 -08:00
Scott Erickson
47effcd50e Got the rest of team colors set up. 2014-01-15 15:16:31 -08:00
Michael Schmatz
0e40c8b20a Removed comma from diplomats template 2014-01-15 11:59:34 -08:00
Philipp Hansch
17afb62dc9 Add basic code-saved indicator 
Using the tome:spell-changed callback to determine when to
start showing the code-saved indicator
 2014-01-15 20:58:39 +01:00
GlenDC
6e5cf30c29 Hotfix for 2 url i18n tags. The Category wasn't prefixed. 2014-01-15 14:49:17 +01:00
GlenDC
8f5e80d101 Translated most of the Dutch version. (It's my native language) 2014-01-15 03:39:20 +01:00
GlenDC
eba0665616 Hotfix for issue #30 2014-01-15 03:38:33 +01:00
GlenDC
d5907059ed Resolved issue #30 2014-01-15 01:58:37 +01:00
GlenDC
92416dc4f2 Created view versions for components, systems and thangs (fix #30) 2014-01-15 01:33:24 +01:00
GlenDC
4633ced78d Created superclass & common templates for article & level (fix for #30) 2014-01-15 01:12:21 +01:00
Rehb
8e4c246e5e Update diplomat.jade 
Add name 91-Persian
 2014-01-15 01:05:10 +03:30
Nick Winter
704f9af864 Updated language progress; added Slovene placeholder. 2014-01-14 12:18:05 -08:00
Nick Winter
60850d5c48 Updated some tags. Added a script to copy tags from en.coffee. 2014-01-14 10:29:23 -08:00
Nick Winter
4a702176a6 Updated i18n, added /employers. 2014-01-13 22:29:58 -08:00
Scott Erickson
37f1ccdb51 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-13 20:32:41 -08:00
Scott Erickson
810eabef46 Tweaked some copy in prep for the new translations to be sent out. 2014-01-13 20:32:21 -08:00
Nick Winter
1041ce4b17 Added GitHub stars button. 2014-01-13 18:19:28 -08:00
Nick Winter
40bd91f415 Working on adding i18n tags from #23. 2014-01-13 17:17:41 -08:00
Nick Winter
d6f2f41cf8 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 12:24:24 -08:00
Nick Winter
acc6c2e4e6 Fixed a couple typos. 2014-01-12 12:24:02 -08:00
Nick Winter
1572228aa5 Merge branch 'master' of git://github.com/GlenDC/codecombat into GlenDC-master 2014-01-12 12:01:56 -08:00
Scott Erickson
6d60221668 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-12 11:58:24 -08:00
Scott Erickson
be80858648 Added wizard color setting. 2014-01-12 11:54:50 -08:00
GlenDC
1032fdb1d3 Enchangement for issue #23. Removed classes related ids from account_settings to classes category 2014-01-12 11:20:07 +01:00
GlenDC
683b72f67a First big fix for issue #23. The issue is as good as fixed besides some details I think. 2014-01-11 17:25:04 +01:00
Nick Winter
00f4699ce5 Further fixes for save modals. 2014-01-10 17:32:29 -08:00
Scott Erickson
ecd9ed8fef Fixed the save version modal. 2014-01-10 17:11:13 -08:00
Scott Erickson
95900f230f Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-10 16:48:45 -08:00
Scott Erickson
1a3c6498e8 Built the thang editor colors tab. 2014-01-10 16:48:28 -08:00
GlenDC
100a296951 Fixed Issue #26 2014-01-10 22:31:26 +01:00
Nick Winter
25d2f95db9 Not using subreddit any more. 2014-01-09 18:29:57 -08:00
Scott Erickson
8077c62ceb Set up talking portraits in the hud. 2014-01-09 11:04:22 -08:00
Scott Erickson
50beeb93bc Merge branch 'production' 2014-01-08 14:59:49 -08:00
Scott Erickson
4b8c8f22c1 Fixed logging out to update the header properly. 2014-01-08 14:57:59 -08:00
Michael Schmatz
ee3841b32c Merge pull request #110 from rhc2104/google-plus 
Make G+ button same size as other buttons
 2014-01-08 05:56:31 -08:00
Ronald Cheng
3658d5ca3a Make G+ button same size as other buttons 
The default G+ button size is slightly larger than the Facebook and Twitter buttons.  Use the "medium" size to make the size even.
 2014-01-08 02:15:52 -08:00
Ronald Cheng
a61756a816 Center text in 404 page 2014-01-08 01:28:38 -08:00
Nick Winter
70cd16cee4 Fixing bug with application require for now. Shoutout for Firebase. 2014-01-06 23:45:33 -08:00
Scott Erickson
a988c91a63 Fixed blog links. 2014-01-06 20:17:27 -08:00
Scott Erickson
f0147e8f7c More tweaks to the thang editor. 2014-01-06 19:33:36 -08:00
Scott Erickson
ddbf45b50c Made the thang editor a little more organized. 2014-01-06 19:09:43 -08:00
Scott Erickson
94cb6ea4e1 Fixed up the search optimization and installed thang portraits into the level editor. 2014-01-06 17:11:57 -08:00
Nick Winter
8b4ec9b263 Merged and cleaned up #79. 2014-01-06 15:18:40 -08:00
Tom Steinbrecher
60c4b360d5 Added ContribueClassView, which all contribute pages are now based off of. 
Moved nav in to contribute_nav.jad, allowing for easier addition of nav to contribute pages.

Fixed other small bugs.
 2014-01-06 17:30:35 -05:00
Scott Erickson
f656a4f4cf Set up portrait uploading for thangs. 2014-01-06 12:37:35 -08:00
George Saines
387eab5592 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-06 11:02:03 -08:00
George Saines
123affeec6 Fixing a typo in the CLA 2014-01-06 11:02:00 -08:00
Nick Winter
316b382d81 Fix for announcement duplicates. 2014-01-06 10:33:52 -08:00
Tom Steinbrecher
75894d1160 Issues 13 and 14. Contributor pages, and fixed the scrolling bug better than before 2014-01-06 00:56:32 -05:00
Tom Steinbrecher
34dd42a7ca Refactored contribute pages, each class has it's own page. Better fix to issue 13 and solution to 14 2014-01-06 00:41:31 -05:00
Scott Erickson
d1c33430d8 Tweaked the Archmage contribute copy. 2014-01-05 17:01:23 -08:00
Nick Winter
1185731fd0 Fixed two bugs with the CLA. 2014-01-05 15:07:30 -08:00
Nick Winter
f1186f6092 Contributor emails now indicate saved. 2014-01-05 14:45:55 -08:00
Nick Winter
ec20cac6f7 Allowed access to character class emails by prompting for signup on check. 2014-01-05 14:20:48 -08:00
Nick Winter
164dd49933 Fixed a GitHub link. 2014-01-04 22:20:17 -08:00
Scott Erickson
56fa98e76b Merge branch 'master' of https://github.com/codecombat/codecombat 2014-01-03 14:31:27 -08:00
Scott Erickson
594b54a40e Can now set admin permissions on the dev environment. 2014-01-03 14:28:00 -08:00
Nick Winter
ffebe45267 Updated uglify-brunch options to not break on for(;;). 2014-01-03 13:49:36 -08:00
Nick Winter
6009df26de Ready for action, sir! 2014-01-03 10:32:13 -08:00