codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2024-11-29 18:45:48 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
6245 commits 27 branches 0 tags 134 MiB
Commit graph

1123 commits

Author SHA1 Message Date
Nick Winter
719e64e85f Added a quick visualization of language localization completion to the Diplomat page. 2014-08-14 11:43:40 -07:00
Nick Winter
18b0208aac Updated i18n. 2014-08-14 10:57:57 -07:00
Scott Erickson
c31a509472 Working on the inventory view. Added a way to get the current equipment config from the inventory view. 2014-08-14 10:44:04 -07:00
Nick Winter
99d29bd206 Merge pull request #1437 from Imperadeiro98/patch-1 
Update diplomat.jade
 2014-08-14 09:57:23 -07:00
Ruben Vereecken
dbff3e04d5 Job profile view works once again 2014-08-14 17:25:41 +02:00
Imperadeiro98
d7270335ca Update diplomat.jade 
Added all the languages and myself.
 2014-08-14 09:04:29 +01:00
Nick Winter
0084b64d67 Made some updates to the community page. 2014-08-13 20:45:33 -07:00
Nick Winter
7844a2b987 Some fixes for new user views breaking on bad data or certain configurations. 2014-08-13 19:17:26 -07:00
Nick Winter
4f3af4d64f Fixed #1433. 2014-08-13 14:57:07 -07:00
Nick Winter
bdb3e14189 Added missing ForkModal. 2014-08-13 14:26:56 -07:00
Scott Erickson
31e3e7f98e Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-13 14:06:03 -07:00
Nick Winter
b7d5428d5f Made Forking more abstract to apply to ThangTypes, too. 2014-08-13 11:36:00 -07:00
Scott Erickson
e3088ad813 Merge branch 'achievements' of https://github.com/rubenvereecken/codecombat into rubenvereecken-achievements 2014-08-13 10:49:10 -07:00
Ruben Vereecken
3fd396974d Merge branch 'master' into achievements 
Conflicts:
	app/views/DemoView.coffee
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
	server/users/User.coffee
 2014-08-13 10:43:42 +02:00
Nick Winter
2ab83328f3 Added item editor level preview window. 2014-08-12 12:50:41 -07:00
Nick Winter
6d04b583f9 Added volume slider to game options. 2014-08-12 10:10:54 -07:00
Ruben Vereecken
8ae116200f Achievements are now i18n'able 2014-08-12 18:18:16 +02:00
Nick Winter
9fd31c70e7 Hid parts of game menu that aren't ready yet. 2014-08-12 09:13:23 -07:00
Ruben Vereecken
d6f5b7512d i18n for all new pages 2014-08-12 14:05:01 +02:00
Ruben Vereecken
857d3ca02c Added some simple animations to achievement popups 2014-08-12 12:04:08 +02:00
Scott Erickson
b3572dfad9 Fixed some bugs with the ThangComponentsEditView, added AddThangComponentsModal. 2014-08-11 15:41:08 -07:00
Nick Winter
31d7e641e6 Fixes for equipping items and adding them to the World. 2014-08-11 11:04:38 -07:00
Ruben Vereecken
672b0f54f6 Worked away our NotifyJS dependency - horrible lib 2014-08-11 14:11:26 +02:00
Nick Winter
0074a04cfe Moved Restart into Game Menu. 2014-08-10 17:41:18 -07:00
Nick Winter
45c762fddc Moved multiplayer from modal into Game Menu. Deleted MultiplayerLaunchModal. Updated some i18n. 2014-08-10 17:26:30 -07:00
Nick Winter
fb95f48f73 Implemented GameMenu OptionsView. 2014-08-10 16:27:33 -07:00
Nick Winter
4dcc5bd8ee Adding some options to the game menu options tab. 2014-08-10 15:56:45 -07:00
Scott Erickson
6cac2371c1 Refactored and improved the ThangComponentsEditView and ThangComponentConfigView. Still some things to do. 2014-08-10 13:03:53 -07:00
Nick Winter
6b2c079ff5 More work on game menu skeleton. 2014-08-08 15:57:20 -07:00
Nick Winter
dc59aff9d0 Starting skeleton for GameMenuModal and its subviews. 2014-08-08 11:36:41 -07:00
Ruben Vereecken
e6569539dc User page now uses the supermodel for user loading 2014-08-08 19:26:24 +02:00
Nick Winter
cc0ea25262 Merge pull request #1412 from rubenvereecken/meh 
Table headers are now unhoverable
 2014-08-08 08:38:05 -07:00
Ruben Vereecken
47f00f9b5e Added achievement deleting and automatic achievement filling 2014-08-08 17:20:07 +02:00
Jayant Jain
164e049202 Hides randomize button overlay, resolves #1409 2014-08-08 18:02:20 +05:30
Ruben Vereecken
9f0add22a5 Worked in a lot of changes Scott proposed 2014-08-08 11:54:53 +02:00
Ruben Vereecken
e082d363be Table headers are now unhoverable 2014-08-07 13:12:30 +02:00
George Saines
0549273d14 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-08-06 17:42:33 -07:00
George Saines
b8ea89b4a8 community page redesign 2014-08-06 17:42:19 -07:00
Nick Winter
4d4e321265 Fixed #1062. Added Item kind to level editor Thang filters. 2014-08-06 08:24:50 -07:00
Ruben Vereecken
d42922871e Added related achievements tab to level editor 2014-08-05 15:15:53 +02:00
Ruben Vereecken
7d7d5300c0 Refactored New Model Modal (from SearchView originally) 2014-08-05 14:33:33 +02:00
Ruben Vereecken
3266e3b46b intermediate 2014-08-04 22:21:43 +02:00
Ruben Vereecken
fb3848359e Merge branch 'master' into achievements 2014-08-04 17:55:44 +02:00
Ruben Vereecken
6267352c6e Drastically changed the way achievements get grayscaled 2014-08-04 15:29:46 +02:00
Ruben Vereecken
26085f9f3e Added a bunch of achievements to the script. Restyled big parts. 2014-08-03 23:58:51 +02:00
Ruben Vereecken
871149b2bc Rechecked and added cool stuff for achievements 2014-07-30 22:23:43 +02:00
Ruben Vereecken
d4043ac3db Implemented singleplayer and multiplayer games played on profile 2014-07-29 20:11:45 +02:00
Ruben Vereecken
30a6cf1cca Merged in name changes from master 2014-07-29 17:28:13 +02:00
Ruben Vereecken
026e6e6378 Added some support to fetch level sessions for the user profile page 2014-07-29 16:50:07 +02:00
Ruben Vereecken
7987e1d05b Did a bunch related to achievements and user profile page 2014-07-28 20:04:44 +02:00
Ruben Vereecken
194463c113 Greatly redid achievement styling for various scenarios 2014-07-28 17:40:20 +02:00
Ruben Vereecken
a8df3df095 Default image for achievements. Redid border logic 2014-07-28 15:14:11 +02:00
Michael Schmatz
d7cb76d10c Merge branch 'pr/1387' 
Conflicts:
	app/views/editor/level/LevelEditView.coffee
 2014-07-25 19:17:16 -07:00
Jayant Jain
69713f5603 Adds randomize button in case of level with no thangs 2014-07-26 01:55:28 +05:30
Jayant Jain
df554360fe Updates glyphicons for undo-redo, adds placeholder text for add thangs search 2014-07-26 01:55:15 +05:30
Darredevil
b77b796cef Merge branch 'codecombat-master' 
Conflicts:
	app/views/docs/ComponentDocumentationView.coffee
	app/views/editor/level/LevelEditView.coffee
 2014-07-25 22:48:13 +03:00
Jayant Jain
dc66218c00 Adds undo and redo buttons in editor topbar 2014-07-25 18:06:34 +05:30
Jayant Jain
598e727500 Adds an initial dungeon preset, refactors border code to properly create dungeon walls 2014-07-25 18:05:49 +05:30
Jayant Jain
80da704d19 Background image paths automated, adds preset image files 2014-07-25 17:54:10 +05:30
Jayant Jain
c33491b04d Presets in terrain_generate_modal shown from a list instead of hardcoded 
Conflicts:
	app/templates/editor/level/modal/terrain_randomize.jade
 2014-07-25 17:51:48 +05:30
Jayant Jain
86cf344f28 Adds preset images to preview the generated terrain 2014-07-25 17:50:02 +05:30
Darredevil
f78c48c893 Docs tab v2 2014-07-25 01:26:34 +03:00
Michael Schmatz
d773c301fb Add message if no player code in profile 2014-07-24 10:47:27 -07:00
Michael Schmatz
2120657e5b Add login link to profile login prompt 2014-07-24 10:16:43 -07:00
Michael Schmatz
7910c5d9cc Implement #1370 2014-07-23 15:10:51 -07:00
Michael Schmatz
c4e3044a81 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-23 14:44:17 -07:00
Michael Schmatz
07cc01332d Merge branch 'pr/1383' 
Conflicts:
	app/views/play/level/tome/SpellListTabEntryView.coffee
 2014-07-23 14:44:15 -07:00
Nick Winter
26ac94367e Fixed #1372. Minor fixes. 2014-07-23 08:59:42 -07:00
Scott Erickson
1c3404d03e Refactored views. View file names now match view class names. Router lists routes explicitly rather than routing automagically. Hacking my way to renaming problem, spell. 2014-07-23 07:02:45 -07:00
Dominik Kundel
be50927fb6 disabled editor works again 2014-07-23 14:38:12 +02:00
Ruben Vereecken
8969311d82 Butons on profile page now nicer 2014-07-22 21:52:52 +02:00
Ruben Vereecken
411bb87985 Added contributor categories to user profile page 2014-07-22 12:50:56 +02:00
Michael Schmatz
283108da1e Added login message for anonymous users on job profile 2014-07-21 16:59:42 -07:00
Michael Schmatz
f100c4ebbe Add filter alerts to employer page 2014-07-21 16:10:02 -07:00
Ruben Vereecken
ebdbc0f891 Basis for user view is finished 2014-07-21 22:02:08 +02:00
Ruben Vereecken
0d87209fa8 Recently played is now shown on account page 2014-07-21 19:06:22 +02:00
Ruben Vereecken
1c6da9711b Added the Recently Played collection and endpoint 2014-07-21 14:36:10 +02:00
Ruben Vereecken
023a7adc81 Half the account page is there 2014-07-21 13:40:11 +02:00
Darredevil
61ebc4d15b Docs tab 2014-07-21 03:52:34 +03:00
Nick Winter
20df6b4ebe Merge pull request #1360 from Darredevil/master 
Docs page enhancement
 2014-07-20 17:00:37 -07:00
Darredevil
e43afcc0a9 Docs page enhancement 2014-07-21 02:23:01 +03:00
Nick Winter
a7905db316 Inferring and documenting cooldown, action/spell name, damage, range, radius, and duration when possible. 2014-07-20 15:51:48 -07:00
Darredevil
f8cc64dc4c fix for no user logged 2014-07-20 22:14:33 +03:00
Scott Erickson
e7a70bbd0b Merge conflict handling. 2014-07-18 17:09:41 -07:00
Scott Erickson
97964f7853 More work on renaming. Cleaned out sprite_parser_test_view, and fixed the TeachersView. 2014-07-18 17:06:20 -07:00
Scott Erickson
9ad166048d Some work the job profile page. Added a demo view, mainly added a modal view for viewing raw player code. 2014-07-18 16:12:28 -07:00
Nick Winter
2d7b6eb145 Updated code language logos. Added code language blurb i18n tags. 2014-07-17 20:12:59 -07:00
Scott Erickson
2b4b91733c Merge branch 'master' of https://github.com/codecombat/codecombat 2014-07-17 16:31:03 -07:00
Scott Erickson
45a8278e7e Work on the job profile view, initial work on the code modal. 2014-07-17 16:30:56 -07:00
Nick Winter
a1aa71084d Merge pull request #1344 from Darredevil/master 
fix for no user logged
 2014-07-17 16:30:51 -07:00
Michael Schmatz
a9d664b8ec Restored legacy candidates view 2014-07-17 13:16:17 -07:00
Scott Erickson
6f09e95d68 Removed background from job profile view. 2014-07-17 09:22:52 -07:00
Darredevil
80b420ebbf fix for no user logged 2014-07-17 19:11:23 +03:00
Darredevil
8da06f6c6b language sensitive docs added 2014-07-17 03:18:06 +03:00
Nick Winter
855461a67e Don't let test view interfere with normal body styles. 2014-07-16 16:01:37 -07:00
Nick Winter
6e9091fdf0 More fixes to documentation popovers. 2014-07-15 19:25:53 -07:00
Nick Winter
e06f9132d1 Fixed #469. 2014-07-15 10:24:18 -07:00
Ruben Vereecken
0288786098 Merge branch 'master' into achievements 2014-07-15 16:16:46 +02:00
Ruben Vereecken
c423fe989b Merge branch 'navbar' into achievements 2014-07-15 16:16:01 +02:00
Ruben Vereecken
40ba28f49b Basics for account and user home pages 2014-07-15 16:15:21 +02:00
Scott Erickson
b113e126a3 Fixes #1316 and #1318 2014-07-14 17:18:48 -07:00
Scott Erickson
9d22a35194 Merge branch 'nameable_users2' of https://github.com/rubenvereecken/codecombat 2014-07-14 15:13:52 -07:00
Nick Winter
cfeb6c34a4 Merge pull request #1324 from Darredevil/master 
docs page minor update
 2014-07-14 13:23:52 -07:00
Ruben Vereecken
1f1ff25a5a merge 2014-07-14 20:27:47 +02:00
Darredevil
c579742955 docs page update 2014-07-14 21:18:17 +03:00
Ruben Vereecken
e748417007 GET /auth/name/<name> now serves possible free names 
anonymous users are now warned if their new name is already chosen

User Settings is now without auto-save

Upon name conflict, a user will be suggested a new name which is then submitted if the user chooses to save after all.

Refactored conflicted name checking so it can be used in more places

Signup form now has an optional name field

Covered extra case where the debounced check happened too late. Support for submitting on enter.

Worked in scott's comments and got tests working again
 2014-07-14 20:07:58 +02:00
Ruben Vereecken
a60451368e Merged in master 2014-07-14 18:58:25 +02:00
Nick Winter
7446c9ee08 Don't break as badly on long method names and small windows. Make sure we can always see the spell tool buttons. 2014-07-14 09:38:55 -07:00
Nick Winter
f1c8983de2 Don't ask for team again if we already have a child window. 2014-07-14 08:40:36 -07:00
Ruben Vereecken
7a52c195eb More user navbar styling! Also need to investigate browser reflow 2014-07-14 15:32:02 +02:00
Ruben Vereecken
1aa566e4f7 Layout of navbar user dropdown about finished 2014-07-14 14:56:44 +02:00
Ruben Vereecken
5f2c7665ea Navbar refactored, starting to look good already. 2014-07-14 14:20:13 +02:00
Tery Lim
0f4a7df982 Use spl instead of trailing space for spacing 2014-07-14 13:56:27 +08:00
Nick Winter
1a016394fe Starting to show opponent code languages. 2014-07-13 20:19:51 -07:00
Nick Winter
f9822b65e4 Merge branch 'master' of git://github.com/jayant1992/codecombat 2014-07-13 18:21:27 -07:00
Jayant Jain
493ebd07e6 Changes randomise to randomize 2014-07-14 06:01:09 +05:30
Michael Schmatz
2a5a366c12 Made language selection in opponent modal 2014-07-13 17:22:06 -07:00
Nick Winter
01fdc5b520 Merge pull request #1311 from rubenvereecken/pretty_wizard_modal 
Bootstrappified Wizard Settings modal
 2014-07-13 17:07:07 -07:00
Ruben Vereecken
bd7c2d0d36 Bootstrappified Wizard Settings modal 2014-07-14 00:25:24 +02:00
Jayant Jain
1e5edb5efd Moves randomise modal template and view to editor/level/modal 2014-07-14 01:34:32 +05:30
Jayant Jain
be223197df Updates i18n tags and en.coffee 2014-07-14 01:33:45 +05:30
Ruben Vereecken
9c0353a2f0 Merged in master 2014-07-13 21:18:32 +02:00
Nick Winter
202a562c51 Merge pull request #1303 from maryannv/patch-1 
Add space before "Contribute"
 2014-07-13 12:08:27 -07:00
Nick Winter
868a6ed43b Fixed a couple i18n issues. Fixed #1302. 2014-07-13 09:31:56 -07:00
Maryann Vellanikaran
f9c92d2731 Add space before "Contribute" 
Before: http://cl.ly/image/0p1f1P1D0P2d
After: http://cl.ly/image/3a0x12070C28
 2014-07-12 15:45:53 -07:00
Nick Winter
45545796a0 Fixes, tweaks, and i18n for the employers page. 2014-07-10 19:17:51 -07:00
Jayant Jain
d6928eb1c4 Removes okay button, hides modal upon generation 2014-07-11 01:43:51 +05:30
Jayant Jain
da0b0d9830 Big terrain generator commit - 
1.Adds method for randomising decorations/doodads
2.Creates presets
3.Adds thang clusters which can be used to create presets easily
 2014-07-11 00:01:19 +05:30
Jayant Jain
b401b04893 Adds randomiseFloor and randomiseBorder functions 2014-07-11 00:01:19 +05:30
Jayant Jain
1436a4dac7 Cleans up some css for terrain generator modal 2014-07-11 00:01:18 +05:30
Jayant Jain
813ecaa59c Adds randomise option to dropdown on editor page 2014-07-11 00:01:18 +05:30
Jayant Jain
c40da260f0 Adds initial modal and view for terrain generator 2014-07-11 00:01:18 +05:30
Nick Winter
bcf3c19f81 Some slight improvements to the components docs page; still don't know how to get it to be full-height with independently scrolling columsn, though. 2014-07-09 15:32:57 -07:00
Nick Winter
4b16e2fc57 Merge branch 'master' of git://github.com/Darredevil/codecombat into Darredevil-master 2014-07-09 13:53:58 -07:00
Nick Winter
ca847329b1 Merge branch 'dkundel-feature/fullscreen-editor' 2014-07-09 13:41:57 -07:00
Nick Winter
0ed8d2b371 Merged in the full-screen editor, and fixed a spell palette multi-language bug while at it. 2014-07-09 13:41:42 -07:00
Darredevil
4309bfbe67 new Documentation page 2014-07-09 23:01:53 +03:00
Scott Erickson
d74a778f67 Made creating components open to everyone! 2014-07-09 12:21:32 -07:00
Ruben Vereecken
5dc54c784d Added case and demo for user not found. Should be made prettier as soon as users can be queried by name 2014-07-09 18:13:22 +02:00
Ruben Vereecken
b065a524c1 Got down the basic layout for achievement overview 
Achievement style is now compatible between overview and popup
 2014-07-09 15:06:47 +02:00
Nick Winter
928e4362ba Made some style tweaks to the employers page to move the filters into a sidebar when authorized. 2014-07-08 20:47:22 -07:00
Michael Schmatz
21d056ff01 Instant application of filters 2014-07-08 11:19:14 -07:00
Michael Schmatz
aa40257034 Table styling/ copy edit 2014-07-07 23:23:36 -07:00
Michael Schmatz
e71ca28f02 Implement candidate filter counts next to filters 2014-07-07 21:43:30 -07:00
Michael Schmatz
08b9a8fdaa Various changes to education filter 2014-07-07 21:04:12 -07:00
Michael Schmatz
30745a25ca Consolidated iOS and Android into Mobile 2014-07-07 20:24:29 -07:00
Nick Winter
9381a4dec6 Merged in some Russian translations from a1ip and fixd a merge conflict in server.coffee style cleanups. 2014-07-07 20:16:00 -07:00
Michael Schmatz
9313541f9f Fixed targeting on employers CSS 2014-07-07 20:02:01 -07:00
Michael Schmatz
30671d82f6 Removed PM and Management from filters 2014-07-07 19:52:31 -07:00
Michael Schmatz
05560662dd Various fixes to employer page/profile view 2014-07-07 19:34:36 -07:00
Scott Erickson
5d00aedac7 Widened the click area on the wizard settings view for color config. 2014-07-07 18:13:19 -07:00
Scott Erickson
2a309c149c Enabled submitting patches for thangs and articles. 2014-07-07 15:19:22 -07:00
Michael Schmatz
b76239b4e9 Replaced candidate avatars on employer page 2014-07-07 10:29:35 -07:00
Scott Erickson
12543cf4dd Added the foundation of a component docs view. 2014-07-07 10:11:02 -07:00
Michael Schmatz
3151db6fc5 Hide briefcase when no work history 2014-07-07 09:49:13 -07:00
Ruben Vereecken
ea3d1fee74 Starting on achievement overview style 2014-07-07 15:03:28 +02:00
Ruben Vereecken
10735867a4 Got some basic hierarchy set up for user view and template inheritance 2014-07-06 21:10:28 +02:00
Ruben Vereecken
e33bb44ffc Start of new user routing and views are there 2014-07-06 20:45:27 +02:00
Scott Erickson
94a6e3961b Added a button in the level editor to choose which team to play when editing a ladder level. 2014-07-05 13:54:41 -07:00
Ruben Vereecken
601c4e2731 Merged with master 2014-07-05 16:47:16 +02:00
Scott Erickson
81121faebf Merge pull request #1242 from differentmatt/master 
Fix Placement Agreement typo
 2014-07-04 17:39:38 -07:00
Ruben Vereecken
39fb2cb1b4 Added achievement preview, exp test, stuff 2014-07-04 19:27:37 +02:00
Ruben Vereecken
45798aab02 added images for achievements! Demo is now operational 2014-07-04 19:27:37 +02:00
Ruben Vereecken
a933f9737d Creating achievement demo 
intermediate
 2014-07-04 19:27:37 +02:00
Michael Schmatz
615303395c Various fixes for recruiting page 2014-07-03 16:30:27 -07:00
Michael Schmatz
6c31f08853 Unchecked all by default 2014-07-03 15:48:50 -07:00
George Saines
4d12aff35e removing the counselor from the contribute page and all other links 2014-07-03 15:42:24 -07:00
Michael Schmatz
52ddb8db62 Add login link and rounded corners for pics 2014-07-03 15:10:09 -07:00
Michael Schmatz
3f1547488c Added login button and fixed bg color 2014-07-03 14:40:39 -07:00
Michael Schmatz
ae63461ef3 Filter functional 2014-07-03 11:39:44 -07:00
Michael Schmatz
b58f2c49eb Fix description 2014-07-03 10:22:50 -07:00
Michael Schmatz
ed30d3292a Filter button 2014-07-03 10:14:32 -07:00
Michael Schmatz
397140d9b0 Basic filtering 
Only visas work
 2014-07-02 16:47:02 -07:00
Michael Schmatz
fe328a766b Basic filtering functionality 
Still has a few bugs
 2014-07-02 15:48:26 -07:00
Michael Schmatz
8e6807ab60 Redesigned layout of employers page 2014-07-02 11:44:33 -07:00
Michael Schmatz
5da1db8f6e Made new recruitment base layout 2014-07-02 11:43:26 -07:00
Matt Lott
ffdd73a503 Fix Placement Agreement typo 2014-06-30 16:01:00 -07:00
Nick Winter
66da53f8f9 Launching the language selector on the front page. 2014-06-27 10:21:38 -07:00
Michael Schmatz
28bb28cf85 Fixed employer view for manually created candidates 2014-06-26 17:07:17 -07:00
Nick Winter
d360ecac94 Merged in the language-war branch. 2014-06-25 23:00:03 -07:00
Nick Winter
aee95ac5c0 Improved per-language spell palette and tab documentation. 2014-06-25 22:56:39 -07:00
Nick Winter
8c6ee66684 Better handling of alternate spell palette documentation syntax for other code languages. 2014-06-25 20:19:11 -07:00
Darredevil
a127cb7a5b Added a joke tip 2014-06-26 02:11:15 +03:00
Philippe Rigovanov
f2898e3bc0 Update diplomat.jade 
added myself to diplomats
 2014-06-26 00:56:41 +04:00
Nick Winter
04976a7b14 Working on the Tome displaying the proper syntax for the selected programming language. Fixed #1225. 2014-06-24 21:08:01 -07:00
George Saines
68d7b3997a modifying the employer page to be more explanatory 2014-06-24 16:43:27 -07:00
Scott Erickson
9b873cfab4 Patch modal handles invalid patches. 2014-06-24 17:25:01 -04:00
Scott Erickson
ee0b14eb61 Changed the versions history modal to show name and date. 2014-06-24 16:41:55 -04:00
Nick Winter
8719b80663 Showing expired profiles to admins. 2014-06-24 10:15:38 -07:00
Nick Winter
3862bd2376 Clearing backups of old models when saving new versions of versioned models. 2014-06-24 09:43:20 -07:00
Nick Winter
815ef88e78 Fixed bugs with camera bobbing with bobbing units and gold views showing up when empty. 2014-06-23 10:36:42 -07:00
Nick Winter
1e9b403ce5 More zazz for home page code language selection. 2014-06-19 14:55:16 -07:00
Nick Winter
666c020389 Switching code language based on selection now. 2014-06-19 13:42:25 -07:00
Nick Winter
a58f3e0fb6 More styling work on code language selector. 2014-06-19 12:31:56 -07:00
Michael Schmatz
2559a73244 Merge pull request #1186 from dkundel/master 
Initial Autocomplete Version
 2014-06-19 10:10:26 -07:00
Nick Winter
2e850dba78 Working on home language selection. 2014-06-19 08:06:34 -07:00
Michael Schmatz
548eaefae1 Add debug variable inspection progress bar 2014-06-18 13:43:04 -07:00
Dominik Kundel
d3e0299465 merge conflict solved 2014-06-18 17:59:26 +02:00
Dominik Kundel
f6355b034b integrated autocomplete 2014-06-18 17:57:42 +02:00
Nick Winter
4bd02ba6dc ModelModal now grants real ultimate power. 2014-06-17 15:17:25 -07:00
Nick Winter
0b8a0c8f6f Added UserRemarks. 2014-06-17 13:03:13 -07:00
Scott Erickson
1786eab09d Initial work on a demo view. But brunch won't build demo-app.js for some reason. 2014-06-16 11:40:08 -07:00
Michael Schmatz
84601d2927 Added more info email field to employer signup 2014-06-13 15:38:47 -07:00
Nick Winter
21e7487132 Showing more skills in employer table for better searching. Hid employer selling copy after sold. 2014-06-13 14:52:50 -07:00
Nick Winter
2bda60796a Copy / i18n tweaks for tournament ending and employers blurb. 2014-06-13 08:08:13 -07:00
Nick Winter
1b2c4e078c Fixed candidates viewing their own code and resetting it. 2014-06-12 17:52:08 -07:00
Nick Winter
28264d5ace Added tournament results and a way to email them out. 2014-06-12 17:52:08 -07:00
George Saines
03aa0783b1 a few copy edits 2014-06-12 16:13:48 -07:00
George Saines
3415b62663 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-06-12 16:01:39 -07:00
George Saines
fb7b3f8580 adding a top info arena on top of the employers page 2014-06-12 16:01:34 -07:00
Michael Schmatz
32a041a5a7 Made max size of canvas much bigger for spectate view 2014-06-12 15:48:11 -07:00
Ruben Vereecken
aecf937722 Cleaned up achievement testing environment 
Made sure server sided tests work completely
 2014-06-12 19:41:07 +02:00
Ruben Vereecken
2a5c2020ca Added recalculation button to the achievement editor 2014-06-12 19:41:07 +02:00
Ruben Vereecken
7096a07ce8 Improved logging (winston) and admin-only'd the achievement editor 2014-06-12 19:40:59 +02:00
Nick Winter
77920b5416 Improvements to profile views. Added links to players' code. 2014-06-11 19:38:47 -07:00
Nick Winter
cb378c13e2 Fixed employer list template typo. 2014-06-11 09:15:41 -07:00
Nick Winter
69fc378930 Final tournament update blurb. 2014-06-10 16:51:36 -07:00
Nick Winter
f3d18efa90 Added employer_list and activity tracking. 2014-06-10 16:30:13 -07:00
Nick Winter
86223167af Re-added significant trailing whitespace. 2014-06-10 07:46:43 -07:00
Nick Winter
22ca9507d0 Upgrades to employer's candidate indexing. 2014-06-09 22:17:53 -07:00
Michael Schmatz
693da57f13 Merge branch 'feature/linkedin-profile-import' 
Conflicts:
	app/templates/account/profile.jade
	app/views/account/profile_view.coffee
 2014-06-08 18:37:33 -07:00
Michael Schmatz
f29a41f108 Add linkedIn link, field of study support to LinkedIn import 2014-06-08 18:15:18 -07:00
Nick Winter
bb5d23e6ba Wrapped LinkedIn button in a .btn. 2014-06-08 18:51:45 -06:00
Michael Schmatz
7ec3910e36 Make LinkedIn import more robust 2014-06-08 17:38:02 -07:00
Nick Winter
cefeb1df14 Fixed backwards Approved button and candidate time sort. 2014-06-07 19:58:33 -06:00
Nick Winter
63a3aa9074 Fixes for browsing profiles by username. 2014-06-07 17:33:14 -06:00
Michael Schmatz
4072c1b969 Basic functionality done, needs validation error handling 
As well as formatting
 2014-06-07 11:45:49 -07:00
Nick Winter
67b10474e8 Suggested improvements to profile pages. 2014-06-07 00:33:18 -06:00
Scott Erickson
49c9c6bfc9 Built the client test view (rebased from feature/testclient). 2014-06-05 16:56:29 -07:00
Nick Winter
f493f407c2 Fixed some bugs on job profile initialization. 2014-06-04 15:38:57 -06:00
Ruben Vereecken
ed44ab5f7d Improved logging (winston) and admin-only'd the achievement editor 2014-06-02 21:07:23 +02:00
Ruben Vereecken
bb57756cd9 Processed Scott's feedback. Db endpoint slightly safer, some refactorings. 2014-06-02 20:33:01 +02:00
Ruben Vereecken
8607162cd7 Finished designing achievement notify, for now. 2014-06-02 20:33:01 +02:00
Ruben Vereecken
d8bb802468 Designing the Notify to show level progress 2014-06-02 20:33:01 +02:00
Ruben Vereecken
d766a24e11 Achievements now popup when polled for by the client 2014-06-02 20:33:01 +02:00
Ruben Vereecken
1b2a251c58 Achievement editor in place and looking mighty fine 2014-06-02 20:31:09 +02:00
Ruben Vereecken
c2d2f2a2b8 Refactorings performed necessary to have searchable for more uses 2014-06-02 20:31:09 +02:00
Nick Winter
10754e6825 Added i18n, error handling, autocomplete, highlighting the next section, animation for completing sections, and complete example skeleton. 2014-06-01 16:45:19 -07:00
Nick Winter
d19b6760da More flourishes for inline profile editor. 2014-06-01 11:45:01 -07:00
Nick Winter
400fddc294 Jade, you're supposed to be so minimalist. But today... Today, I did this. I am sorry. 2014-05-31 22:09:41 -07:00
Nick Winter
852053022a Started the horrifying migration to an inline jobs profile editor. 2014-05-30 22:12:44 -07:00
Scott Erickson
29011fab2a Reworked validation error handling a little, putting better debugging logs in and making level save modal show when there are some. 2014-05-30 17:26:49 -07:00
Nick Winter
6b554e03ef Merge pull request #1084 from domenukk/feature/step-single-frame 
Added shortcut for frame single-stepping
 2014-05-25 09:37:13 -07:00
Dominik Maier
f62cd7f38b + added shortcut for frame single-stepping 
+ fixed single stepping for frames
 2014-05-24 17:31:59 +02:00
Jayant Jain
241adafad8 Adds nanoscroll for other tabs in editor 2014-05-24 12:02:26 +05:30
Jayant Jain
f17c5cfb51 Adds nanoscroll to thang tab in level editor 2014-05-24 12:02:26 +05:30
Scott Erickson
bfa90f671d Fixes #940, merging the signup and login modal into a single modal. Created a couple A/B tests for amount of text in the signup modal. 2014-05-22 11:26:08 -07:00
Scott Erickson
d613c230ef Fixed some text in the victory modal that wasn't showing up because of indentation. 2014-05-22 11:26:08 -07:00
Michael Schmatz
8604a0ed3c Update rules about location restrictions 
Just to clarify, people from regions that we can't send prizes to can play, just not receive prizes.
 2014-05-22 10:34:46 -07:00
Michael Schmatz
b31e6312ac Updated rules to be subject to change 2014-05-20 10:10:40 -07:00
Nick Winter
b6406b9b0e Put some tournament details in there. Muted some extra casting sounds during level load. 2014-05-19 21:56:20 -07:00
Nick Winter
b2cc3d0692 Fixed bug with preloading the world replacing casting the same world if timing was wrong. 2014-05-19 20:12:16 -07:00
Nick Winter
341097c5ca A couple improvements for the LadderSubmissionView. 2014-05-19 19:51:24 -07:00
Michael Schmatz
d8df61f94b Merge branch 'master' of https://github.com/codecombat/codecombat 
Conflicts:
	app/templates/play/ladder/ladder.jade
 2014-05-19 19:43:47 -07:00
Michael Schmatz
ca2e48b491 Edited judging criteria 2014-05-19 19:37:25 -07:00
Nick Winter
116965fcdc Rules wording tweaks; highlighting new matches and end of ranking with sounds. 2014-05-19 19:13:36 -07:00
George Saines
8277472fda Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-19 17:59:48 -07:00
George Saines
4f763d0203 added the rules section 2014-05-19 17:59:43 -07:00
Nick Winter
af31bcf008 Fleshed out tournament prizes tab. 2014-05-19 17:40:06 -07:00
Scott Erickson
62ad8dd26a Added a status message to the goals view. 2014-05-19 16:36:45 -07:00
dpen2000
10d0ef0606 Fix admin checkbox label for attribute so clicking on it toggles checkbox correctly 2014-05-19 23:28:53 +01:00
George Saines
7c0d73e779 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-05-19 15:19:59 -07:00
George Saines
07177e1a89 putting together the prizes page 2014-05-19 15:19:56 -07:00
Nick Winter
8a5a45950f Simulator now pleads for you to help simulate when your match is being ranked. 2014-05-19 14:59:47 -07:00
Nick Winter
68a4483e91 Moved views/play/ladder_view to views/play/ladder/ladder_view and made a new views/play/ladder_home_view. 2014-05-19 11:58:53 -07:00
Scott Erickson
179702b0eb Set up the goals view to be more hidden by default, and shows up on mouse hover. 2014-05-19 11:31:18 -07:00
Nick Winter
b89615cea4 Added helpful keyboard shortcuts modal. 2014-05-19 10:08:34 -07:00
Nick Winter
9df34875ee Added tournament rules/prizes placeholders. 2014-05-17 20:43:05 -07:00
Nick Winter
3c9428ffd3 Refactored game ranking buttons into a LadderSubmissionView. 2014-05-17 11:55:51 -07:00
Michael Schmatz
934c853789 Live simulation count and fixed double simulator leaderboard session 2014-05-16 13:16:35 -07:00
Nick Winter
dbcafbb29b Working on level-specific coding languages, with non-writable code in JavaScript. 2014-05-14 21:54:36 -07:00
Nick Winter
c420209a6b Improved GoldView tooltip. 2014-05-14 16:06:00 -07:00
George Saines
75ab5d6435 making our recruitment % consistent 2014-05-14 14:55:04 -07:00
Nick Winter
53870a89a5 Python allowed, and better support for transpile errors. 2014-05-13 11:04:04 -07:00
Nick Winter
0b5854765a Adding Clojure and Lua as choosable languages. 2014-05-11 22:51:44 -07:00
Scott Erickson
f1de2ca8d9 Brought the canvas size down again because it halves the FPS in Firefox at least. 2014-05-09 16:35:10 -07:00
Scott Erickson
e9fc3df7c1 Set up the versions modal to display changes between versions when you select two of them. 2014-05-08 10:54:39 -07:00
Scott Erickson
ed222338e7 Fixed #892 by having the components tab reload whenever it's opened. 2014-05-07 16:24:13 -07:00
Michael Schmatz
4221fd55cb Fixed #979 2014-05-07 13:56:10 -07:00
Nick Winter
0e0ca785d9 Moved ready-to-rank logic to LevelSession where it can be shared across victory and multiplayer modals and My Matches tab. 2014-05-05 16:59:12 -07:00
Nick Winter
a04f74de8b Implemented George's gold design. 2014-05-02 15:12:30 -07:00
Nick Winter
9d45b22057 Added some i18n tags. 2014-05-02 11:00:30 -07:00
Michael Schmatz
347292c985 Implemented save notes button 2014-05-01 17:36:49 -07:00
Michael Schmatz
9fb5826593 Scroll to candidate position while going back 2014-05-01 16:56:41 -07:00
Nick Winter
0f33bae1f1 Hid level done button better. Avoiding building wizard sprite when not needed. 2014-05-01 14:36:26 -07:00
Michael Schmatz
546bd26328 Fixed login flow and user profile issue 2014-04-29 15:12:50 -07:00
Scott Erickson
3a28f190a1 Merge branch 'master' into feature/loading-views 2014-04-28 11:55:17 -07:00
Nick Winter
4a2f2700bc Don't show tutorial level link if tutorial level doesn't exist for a ladder level. 2014-04-28 10:54:03 -07:00
Scott Erickson
17a0bf54c6 Merge branch 'master' into feature/loading-views 2014-04-28 10:10:57 -07:00
Nick Winter
d245dfd34c Merge pull request #915 from dpen2000/HideCreateComponentsSystems 
Hide Create New System/Component links in menus from non-admins
 2014-04-27 20:25:06 -07:00
Nick Winter
c1637fe37a Fixed merge conflicts in es-419.coffee. 2014-04-27 20:19:05 -07:00
Nick Winter
e65202434b Merge pull request #890 from treby/update_ja_resource 
Update ja resource.
 2014-04-27 20:12:14 -07:00
Nick Winter
dac4f05fd9 Improved legibility of gold font. Moved Done button to not conflict with gold display. 2014-04-27 14:19:39 -07:00
Scott Erickson
fed5d681f2 Merge branch 'master' into feature/loading-views 2014-04-26 12:54:37 -07:00
Nick Winter
834c27bbd7 Show spell palette for Thangs with apiProperties that aren't programmable. 2014-04-25 16:57:42 -07:00
Scott Erickson
6cd7c723d8 Fixed up showing errors, made sure they work with the play view. 2014-04-25 15:31:38 -07:00
Nick Winter
183fe9c496 Code review of 97d3b6. 2014-04-25 10:46:43 -07:00
Michael Schmatz
97d3b6107d Merge feature/linkedin into master 2014-04-25 08:47:31 -07:00
Michael Schmatz
0dbcc861bf Various tweaks to employer signup 2014-04-25 07:48:59 -07:00
Michael Schmatz
4f6f845c2d Employer signup works 2014-04-24 17:36:07 -07:00
dpen2000
69b3fe4b8c Hide Create New System/Create New Component links in menus from non-admins 2014-04-24 19:24:08 -04:00
Michael Schmatz
6644c6a9ee Push for george 2014-04-24 15:27:37 -07:00
Nick Winter
8a42521cd0 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 14:31:54 -07:00
Nick Winter
2a2ddd068e Separate isSelectable from inThangList. Mouse wheel all the way in/out. bountyGold shows up as gold. Moved say Labels to mouth offset from aboveHead offset and obey sprite rotation. Don't link projects to example.com. 2014-04-24 14:23:15 -07:00
Scott Erickson
2d43b36022 Merge branch 'FixGenericText' of https://github.com/dpen2000/codecombat into dpen2000-FixGenericText 2014-04-24 13:29:24 -07:00
Scott Erickson
e2c2657f34 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-24 13:23:40 -07:00
Scott Erickson
472f8899dd Merge branch 'master' of https://github.com/tmrdja/codecombat into tmrdja-master 
Conflicts:
	app/views/editor/level/edit.coffee
 2014-04-24 13:17:43 -07:00
Nick Winter
b9173a5ea5 Fixed #913, I think. (This was just built into marked.) 2014-04-24 12:24:22 -07:00
Nick Winter
73f39095e6 Upgraded table sorter. 2014-04-24 11:09:01 -07:00
tmrdja
14ebc957de Changed responsive view for LevelEditor 2014-04-24 11:51:16 +02:00
Nick Winter
68f3eeb770 Two tiny profile improvements. 2014-04-23 11:26:20 -07:00
Michael Schmatz
628a784ac4 Progress towards LinkedIn integration 2014-04-23 11:25:36 -07:00
Nick Winter
d4cf31c8fe Improved admin view of pending candidates. 2014-04-23 10:21:58 -07:00
Scott Erickson
c85971e5e6 Added i18n population action to the level editor. 2014-04-22 17:56:41 -07:00
dpen2000
dd00e2abe6 Replace generic text Sign Up to Create a New Content 2014-04-23 00:37:10 +01:00
treby
6937d656c7 Added translate contributor. 2014-04-22 08:55:00 +09:00
Scott Erickson
f57be1ae52 Migrated to the new email system, along with a setting for recruit notifications. 2014-04-21 16:15:23 -07:00
tmrdja
826a5f56db Added responsive view for LevelEditor 2014-04-21 21:15:22 +02:00
Michael Schmatz
486d1b75ff Changed moar to More 2014-04-21 10:40:22 -07:00
dpen2000
c241b06f76 Modify links on community page 2014-04-19 20:03:22 +01:00
George Saines
fced3e821a Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-18 13:02:11 -07:00
George Saines
71ee31ef49 styling the community page 2014-04-18 13:02:07 -07:00
Nick Winter
f38d17c64f Protected candidates from view by employers they work(ed) at. 2014-04-18 12:48:13 -07:00
Nick Winter
848ebf2ffe Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-18 09:53:34 -07:00
Nick Winter
844c1391ca Reworked top nav. Many improvements to job profile form. 2014-04-18 09:53:28 -07:00
Scott Erickson
cdaf2ebfaf Set up the tabs and views in the level editor to reload so that when patches are applied, their changes are visible. 2014-04-17 14:23:33 -07:00
Scott Erickson
781a8ec913 Fixed the play and save buttons. 2014-04-17 13:37:08 -07:00
Scott Erickson
07afba01df Merge branch 'master' into feature/jsondiffpatch 
Conflicts:
	app/views/editor/level/thangs_tab_view.coffee
 2014-04-17 13:25:42 -07:00
Scott Erickson
b5406b0149 Set up the rest of the component/system buttons and nav bars. 2014-04-17 13:24:17 -07:00
Scott Erickson
9eff958dcb Fixed the level and component watch buttons. 2014-04-17 11:35:09 -07:00
Nick Winter
46487f55a4 Fixed up some styles for job profile page, and prevented long links from destroying things with poor wrapping. 2014-04-17 11:34:55 -07:00
Scott Erickson
8f4535853b Fixed the component history button. 2014-04-17 11:29:12 -07:00
Scott Erickson
6057bd94b9 Refactored how the editor sets up its special nav through base.jade. 2014-04-17 11:27:20 -07:00
Scott Erickson
4c1143f026 Tweaked the versions history modal. 2014-04-17 11:22:33 -07:00
Scott Erickson
8859405e18 Reworked the nav bars in the level editor. 2014-04-17 11:02:00 -07:00
Scott Erickson
02a7381fa9 Fixed the watch buttons for levels and components. 2014-04-16 11:02:40 -07:00
Scott Erickson
731726dcd3 Merge branch 'master' into feature/jsondiffpatch 2014-04-16 10:42:43 -07:00
Scott Erickson
f88e0ac0ab Set up patches for components. 2014-04-16 10:42:32 -07:00
dpen2000
62e2de6cee Split simulate tab into own view / template Leaving out "RESET AND SIMULATE GAMES" button for now 2014-04-16 17:07:25 +01:00
Scott Erickson
c395a3414e Merge branch 'master' into feature/jsondiffpatch 2014-04-15 15:18:57 -07:00
dpen2000
a74f89c30c Implement rank column in simulators leaderboard 2014-04-15 23:13:10 +01:00
Scott Erickson
58b1019934 Switched listen to watch (would have been confusing with eye-con, and listenTo function in Backbone). Added watch button and patch badge to level editor. 2014-04-15 15:09:36 -07:00
Nick Winter
f762d95ab8 ModelModal and simple leaderboard pagination. 2014-04-15 15:01:54 -07:00
Nick Winter
9194f842e6 Added some job description fields. 2014-04-15 09:28:19 -07:00
Nick Winter
03df078d5a Couple job profile fixes. 2014-04-15 08:39:18 -07:00
Nick Winter
04014ef2d7 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-04-14 16:34:18 -07:00
Glen De Cauwsemaecker
a9806a6fa3 Added m website url to the about page 2014-04-15 03:12:54 +02:00
Nick Winter
954afad3f0 Fixed bug with job profile approval locale string tag. 2014-04-14 15:32:57 -07:00
Nick Winter
e908ae2fb4 Fixed #772. 2014-04-14 14:49:38 -07:00
Nick Winter
8aa36178af Fixed #769. Added some analytics timing tracking. Added replacement for $.browser. 2014-04-13 20:31:23 -07:00