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
Nick Winter
af0b8aa5e2
A few fixes and cleanup for #831 .
2014-04-13 15:28:16 -07:00
dpen2000
ec3c292b72
Implement simulators leaderboard
2014-04-13 02:35:58 +01:00
Nick Winter
08616def10
Refactored contribute views to share some templates and link to users' profile photos and GitHub accounts when available.
2014-04-12 14:53:09 -07:00
Scott Erickson
775821feec
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-12 08:52:50 -07:00
Scott Erickson
6eab5003f8
Merge branch 'feature/jsondiffpatch'
2014-04-12 08:52:35 -07:00
Scott Erickson
10b1660419
Fixed the level editor so you can save again.
2014-04-12 08:48:49 -07:00
Nick Winter
059b5e9b66
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-11 23:08:26 -07:00
Nick Winter
a4284e6209
Fixed #776 with some CSS/font fixes and \@therealbond's admin footerization.
2014-04-11 23:07:48 -07:00
Scott Erickson
35fe47bbac
Merge branch 'feature/jsondiffpatch'
2014-04-11 22:52:58 -07:00
Scott Erickson
53579b2632
Merge branch 'master' into feature/jsondiffpatch
...
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
2014-04-11 22:52:05 -07:00
Scott Erickson
308adec7c7
Merge branch 'master' into feature/jsondiffpatch
...
Conflicts:
app/templates/editor/level/save.jade
app/templates/editor/thang/edit.jade
2014-04-11 22:52:00 -07:00
Scott Erickson
0eb74ab287
Added buttons for performing actions on patches.
2014-04-11 22:33:09 -07:00
Scott Erickson
34bf484bf2
Added data merge conflict handling.
2014-04-11 21:11:52 -07:00
Nick Winter
91c2f0fa33
Fixed #715 , and some misc cleanup.
2014-04-11 17:36:15 -07:00
Scott Erickson
bbb9fb7a64
Added a patches view.
2014-04-11 14:19:17 -07:00
Nick Winter
82b47f6c0f
Added i18n for #809 .
2014-04-11 13:37:39 -07:00
Nick Winter
b330e783bf
Merge branch 'signupSocialButtons' of git://github.com/adi2412/codecombat into adi2412-signupSocialButtons
2014-04-11 13:28:11 -07:00
Nick Winter
ae65f07e7e
Added some i18n and improved employer page.
2014-04-11 12:49:44 -07:00
Nick Winter
ca13324e99
Resolved merge conflicts.
2014-04-11 11:32:51 -07:00
Nick Winter
3751bf903e
Merge pull request #806 from 1c7/master
...
New features: chinese language version use Youku
2014-04-11 10:33:10 -07:00
Scott Erickson
97a7bc7614
Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch
...
Conflicts:
app/initialize.coffee
bower.json
2014-04-11 10:32:19 -07:00
Nick Winter
8d5e129c2c
Merged the jobs in. Look out for Treema bugs from the last four months.
2014-04-11 10:20:12 -07:00
Nick Winter
a68f3efb99
Added specific job profile photo support. Improved right column design a bit.
2014-04-10 17:54:28 -07:00
Nick Winter
7a35a6248f
Adding contact form for employers to contact candidates.
2014-04-10 14:59:32 -07:00
Scott Erickson
a3951b0fa7
Extended the save version modal to allow submitting patches.
2014-04-10 13:09:44 -07:00
Nick Winter
e9416ee128
Added some autocompleters for job profile Treema. Projects are now entirely links.
2014-04-10 11:58:51 -07:00
Scott Erickson
3c832d3707
Added delta views to the other save modals. Fixed modified deltas in delta views. A few style tweaks.
2014-04-10 11:13:33 -07:00
Scott Erickson
5629284c76
Added text diff library to delta view.
2014-04-10 10:24:14 -07:00
Scott Erickson
66d455285e
Integrated the delta view into the save view for levels.
2014-04-09 19:07:44 -07:00
Nick Winter
dd46f9d039
Ripped out Gravatar profiles in favor of our own photo uploads, with Gravatar and Wizard portrait fallbacks.
2014-04-09 16:46:44 -07:00
Scott Erickson
f2d21b960f
Added a delta subview for displaying deltas of schema'd data.
2014-04-09 16:09:35 -07:00
Nick Winter
f17775cc10
Implemented George's jobs page design.
2014-04-09 13:14:52 -07:00
Aditya Raisinghani
b3804e7445
Minor corrections in format
2014-04-10 01:07:48 +05:30
Aditya Raisinghani
495d1be620
Added social buttons to Sign up modal
2014-04-10 01:01:30 +05:30
1c7
56c18441e4
use youku for Chinese Version
2014-04-09 13:50:13 +08:00
Alexei Nikitin
f8d6857633
Fix crlf
2014-04-08 10:50:58 +04:00
Nick Winter
b96bca8c18
Finished most of basic features for job profiles.
2014-04-07 17:58:02 -07:00
Alexei Nikitin
e87c0c4b91
Work on thang tab
2014-04-08 02:49:27 +04:00
Nick Winter
9af6694054
More work on the job profiles.
2014-04-07 15:21:05 -07:00
Alexei Nikitin
5f062ad25c
Work on revert, save modal
2014-04-08 01:38:46 +04:00
Aditya Raisinghani
7cc9d22254
Moved nanoscroller to bower components and related fixes.
2014-04-08 03:04:36 +05:30
Alexei Nikitin
d64690e8d9
Work on fork modal
2014-04-08 00:29:40 +04:00
Alexei Nikitin
69406df0ed
Work on create_new modal
2014-04-07 23:27:42 +04:00
Alexei Nikitin
630c44135a
Work on wizard settings
2014-04-07 21:44:47 +04:00
Nick Winter
1b79de0d86
Loading active candidate profiles from the database into a table for employers.
2014-04-06 17:01:56 -07:00
Nick Winter
13f34341b2
Merge branch 'doubleScrollbars' of git://github.com/adi2412/codecombat
2014-04-06 14:55:14 -07:00
1c7
13cfba91a8
add myself into diplomat.jade
2014-04-06 11:56:25 +08:00
Nick Winter
5c8c7fff1d
Starting work on simple recruitment listings. Moved Treema and the JS parts of Bootstrap to bower.
2014-04-05 17:05:03 -07:00
Scott Erickson
2093049f5c
Fixed a bug with the profile view caused by the new page loading system.
2014-04-04 13:59:40 -07:00
Scott Erickson
978c84bc89
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-03 18:43:36 -07:00
Scott Erickson
3b3b825be0
Set up a new loading/progress system for views.
2014-04-03 18:43:29 -07:00
Michael Schmatz
9bb109dd7d
First iteration of mobile styling!
2014-04-03 15:10:24 -07:00
Michael Schmatz
75b278b333
Fixed table overflow, added wrapper for histogram
2014-04-03 09:57:35 -07:00
Michael Schmatz
3aa31c7246
Graphs with D3!
2014-04-02 18:41:11 -07:00
Nick Winter
52de546727
Merged.
2014-04-02 15:09:40 -07:00
Aditya Raisinghani
44979c074d
Integrated nanoscroller.
2014-04-03 03:10:06 +05:30
Nick Winter
785cb342a2
Merge branch 'master' of git://github.com/tmrdja/codecombat into tmrdja-master
2014-04-01 09:12:48 -07:00
Dominik Kundel
45f1d8d408
added two programming quotes
2014-04-01 17:16:35 +02:00
Nick Winter
0bd8321345
Updated Mondo Bizarro i18n comma.
2014-03-31 16:02:56 -07:00
Nick Winter
8c013c1192
Fixed 101: added level completion status to /play.
2014-03-31 15:48:22 -07:00
Nick Winter
d8a194f895
Actually using loading screen template.
2014-03-31 13:21:08 -07:00
Nick Winter
0af05176f6
Re-added a minor fix that got lost.
2014-03-31 13:00:40 -07:00
Nick Winter
a9a0a55331
Merge branch 'master' of git://github.com/dkundel/codecombat into dkundel-master
2014-03-31 12:42:53 -07:00
Dominik Kundel
1c6aea9c1c
Merge remote-tracking branch 'upstream/master'
2014-03-31 20:35:32 +02:00
Alexei Nikitin
aeddb64f90
Update base.jade
2014-03-31 11:09:44 -07:00
Nick Winter
cb27124285
Fixed #135 .
2014-03-30 17:24:07 -07:00
tmrdja
470a79e6b0
Added contextmenu
2014-03-30 19:33:21 +02:00
Nick Winter
54f4e8d1e9
Merge branch 'dev/error_message_for_editor' of git://github.com/gintau/codecombat into gintau-dev/error_message_for_editor
2014-03-29 17:38:14 -07:00
Dominik Maier
fb607d06fa
Implemented popover for playback scrubber that will show the time the mouse is hovering over, the current time as well as the total ime of the level. Fixing #670
2014-03-30 00:38:45 +01:00
Ting-Kuan
130d322d60
Move error_view's dom to template file.
2014-03-28 23:51:15 -04:00
Nick Winter
5e30ab091b
Updated i18n tags.
2014-03-28 13:19:17 -07:00
Nick Winter
13d5536eb3
Merged.
2014-03-28 13:08:30 -07:00
Jasper D'haene
fa6ef5aa49
added authors to quotations
2014-03-28 19:58:33 +01:00
Nick Winter
ff7e2d5d47
Fixed #728 .
2014-03-28 11:02:23 -07:00
Jasper D'haene
cd3019296c
added tips/quotes to loading bar
2014-03-28 19:01:31 +01:00
Dominik Kundel
35a16b47ff
Merge remote-tracking branch 'upstream/master'
2014-03-28 14:37:14 +01:00
Darredevil
a91e067549
Added funny tip
2014-03-28 00:13:40 +02:00
Ting-Kuan
6012a3ce9e
Show error message when editor fails to initiate.
2014-03-27 14:35:20 -04:00
Scott Erickson
781b33092c
Added a google plus connect button.
2014-03-26 14:19:05 -07:00
Scott Erickson
132b22f14a
Got the gplus friends loading now.
2014-03-26 13:50:01 -07:00
Glen De Cauwsemaecker
5825b2676b
Added myself to the signature.
2014-03-26 04:46:49 +01:00
Dominik Kundel
fe8a4901de
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
app/locale/de.coffee
bower.json
2014-03-25 17:07:36 +01:00
Glen De Cauwsemaecker
305e2f6d68
Merge pull request #685 from JasperDhaene/master
...
Added myself to the diplomate list, fixed typos and made corrections to Dutch locale
2014-03-25 13:27:13 +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
Nick Winter
e6e216fcd3
Mergred Diplomats.
2014-03-24 14:20:40 -07: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
Mikhail Koltsov
baf8adcc74
added nothing
2014-03-22 20:50:50 +04: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
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
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
dpen2000
6363c40fe2
Update cla.jade
...
p -> a. Using html syntax to avoid linking full stop.
2014-03-21 21:59:31 +00: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
Nick Winter
bba85745f7
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-20 19:18:49 -07:00
Nick Winter
9e4908ade2
A couple ladder tweaks.
2014-03-20 19:18:46 -07:00
J Phani Mahesh
edc90c4598
Fix login popup being displayed under trailer. ( #596 )
2014-03-21 06:44:21 +05:30
Nick Winter
ca1e3742c0
Added simulation counts.
2014-03-20 15:40:02 -07:00
Scott Erickson
22555790b5
Set up a trimmed down leaderboard showing just top players and your rank.
2014-03-20 14:40:17 -07:00
Scott Erickson
dbbf9ce8b3
Merge branch 'master' of https://github.com/jayant1992/codecombat into jayant1992-master
...
Conflicts:
app/styles/editor/level/thangs_tab.sass
app/templates/editor/level/thangs_tab.jade
app/views/editor/level/thangs_tab_view.coffee
2014-03-20 11:22:23 -07:00
Mikhail Koltsov
a6523719e4
Merge branch 'master' of https://github.com/codecombat/codecombat into editor_tweaks
...
Conflicts:
app/locale/ru.coffee
2014-03-20 09:07:11 +04:00
Nick Winter
b7e8f2ecb5
Merge pull request #605 from kvasnyk/master
...
Fix for #272 bug.
2014-03-19 18:31:20 -07:00
Nick Winter
ff1e64e1f6
Less useless ladder refresh requests.
2014-03-19 18:26:38 -07:00
Nick Winter
097c6bc2cd
Changed line endings on en.coffee and nl.coffee away from DOS. Trying out fix for Firefox embed.
2014-03-19 17:25:56 -07:00
Glen De Cauwsemaecker
71a13a5670
Adding missing translations for the Dutch local file
2014-03-20 00:33:50 +01:00
Glen De Cauwsemaecker
e2a7c15776
Merge conflicts resolved from Ruben's branch
2014-03-20 00:05:41 +01:00
Glen De Cauwsemaecker
eab52f45e5
Applied proofread of Julian.
2014-03-19 02:21:45 +01:00
Glen De Cauwsemaecker
f7777ef501
Merge branch 'patch-2' of github.com:feugy/codecombat
2014-03-19 02:16:54 +01:00
Glen De Cauwsemaecker
5dc89529ca
Described myself.
2014-03-19 02:10:58 +01:00
Mikhail Koltsov
c9a08a0b25
thang editor: added i18n binding to 'Save' button
2014-03-19 01:43:27 +04:00
Jayant Jain
80f53d2c6b
Adds search bar for adding thangs in level editor
2014-03-19 00:41:03 +05:30
Ruben Vereecken
04465eb72c
Wrapped up locale files
2014-03-18 10:24:58 +01:00
Ruben Vereecken
e4fee7296c
Merged in old locale
2014-03-18 10:19:33 +01:00
Ruben Vereecken
b476e6b333
Ladder i18n refactoring
2014-03-18 10:18:38 +01:00
kvasnyk
5216432bf9
Fix for #272 bug.
2014-03-18 05:47:53 +01:00
Damien
65f148974c
Add to french diplomats list
2014-03-17 23:39:36 +01:00
Dominik Kundel
c55b608886
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
app/templates/play/level/modal/editor_config.jade
2014-03-17 19:39:38 +01:00
Nick Winter
794b1472f6
Merge pull request #587 from cassiocardoso/patch-1
...
Update diplomat.jade
2014-03-17 08:50:45 -07:00
yangxuan8282
4b2bcc283f
Update diplomat.jade
...
just make some change on Ch-HANS translate,and have pull request,so may I add myself to contributors?
2014-03-17 23:32:20 +08:00
Cassio Cardoso
2917255193
Update diplomat.jade
...
Add my username in brazilian portuguese diplomats list.
2014-03-17 11:51:55 -03:00
Aditya Raisinghani
b5bef94eb3
Fixed issue with video on multiplayer page modal
2014-03-17 19:52:03 +05:30
Randi Katrine Hillerøe
5cecbeea40
Update diplomat.jade
...
Added my name to the contributors list.
2014-03-17 13:59:48 +01:00
Nick Winter
6c2a78c060
Show videos in HD if possible. Use ready state on level loader.
2014-03-17 05:52:19 -07:00
Nick Winter
36a90de7f9
Last bits of #546 .
2014-03-17 04:44:00 -07:00
Nick Winter
1397b63e50
Merged.
2014-03-17 04:37:54 -07:00
pouyio
f5e3e717f1
Update diplomat.jade
...
added a spanish translator
2014-03-17 12:33:35 +01:00
Nick Winter
287bf0398e
Embedded new video in multiplayer launch modal.
2014-03-17 03:18:13 -07:00
Scott Erickson
7555dce172
Tweaked the loading page progress bar.
2014-03-17 00:05:45 -07:00
Scott Erickson
729a016b1f
More tweaks to the video.
2014-03-16 22:57:16 -07:00
Scott Erickson
1fa18fe2e0
Added a border to the home view video.
2014-03-16 22:46:57 -07:00
Scott Erickson
5ddd2b9109
Added a few more tips.
2014-03-16 22:11:21 -07:00
Scott Erickson
dc4252a94d
Moved the tips into the level loader screen and gave them i18n.
2014-03-16 22:01:21 -07:00
Nick Winter
f02f4e77d0
Improved next game routing and speed. Hid that catastrophically dangerous reset all games button.
2014-03-16 21:33:46 -07:00
Nick Winter
f3a76da47c
Added i18n for multiplayer launch modal.
2014-03-16 20:50:49 -07:00
Nick Winter
ffb9ec2908
Merged.
2014-03-16 20:36:18 -07:00
Nick Winter
9a64fb5dac
Work on /multiplayer modal.
2014-03-16 20:32:24 -07:00
Scott Erickson
296a7584a6
Ladder page now shows the ladder for anonymous users, and prods them to sign up if they click a link or button that would have them play.
2014-03-16 20:28:02 -07:00
honam bang
41d26f5709
Refactoring ModalView Templates
2014-03-17 11:00:25 +09:00
Scott Erickson
957fdd22e6
Tweaked the rank button to be much larger in the my matches tab.
2014-03-16 18:48:56 -07:00
Scott Erickson
5cb42fa92c
Tweaked the video on the home page.
2014-03-16 18:10:39 -07:00
Scott Erickson
150077ab22
Removed the new button from the home view.
2014-03-16 17:48:16 -07:00
Scott Erickson
e430a6c2de
Added multiplayer launch view.
2014-03-16 17:33:57 -07:00
Nick Winter
b550708113
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 17:07:24 -07:00
Nick Winter
6db33fd967
Brawlwood protectAPI on!
2014-03-16 17:07:10 -07:00
Scott Erickson
209a1a3563
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-16 17:00:12 -07:00
Scott Erickson
eee8fbba2c
New level page with new artwork.
2014-03-16 16:59:48 -07:00
Nick Winter
1f1802dc38
A couple tweaks for #577 .
2014-03-16 16:04:17 -07:00
Nick Winter
753952e519
Merge pull request #577 from IngridMorstrad/templates
...
Templates
2014-03-16 16:00:24 -07:00
IngridMorstrad
dadf0dab86
refactored docs and reload
2014-03-17 02:57:15 +05:30
Nick Winter
aa4f1baf73
Moved to 1848 x 1178 pixel canvases, since it's 2x the old size. Added a conversion factor to script camera zooms to account for scripts using the old numbers. Fixed bug where IndieSprites wouldn't update actions.
2014-03-16 13:23:01 -07:00
IngridMorstrad
57f24932fb
Removed redundant code for close button
2014-03-17 01:10:55 +05:30
IngridMorstrad
52115876bb
Refactored docs.jade to use the base template
2014-03-17 01:03:27 +05:30
honam bang
29a88ee128
Merge remote-tracking branch 'codecombat/master'
2014-03-17 02:20:44 +09:00
Nick Winter
125ffa9f43
Merged
2014-03-16 10:06:47 -07:00
honam bang
34be8917cb
Fixes #546
2014-03-17 01:41:19 +09:00
IngridMorstrad
8d9a8aaf73
Change victory.jade to use the base template
2014-03-16 21:16:00 +05:30
George Saines
417ff1e48d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-03-15 15:12:09 -07:00
Dominik Kundel
46133ab85d
added select statement for programming language
2014-03-15 22:00:29 +01:00
Nick Winter
b2efb1bba5
More work on the loading view.
2014-03-14 19:44:19 -07:00
Nick Winter
efd0d82dea
Working on new loading view design.
2014-03-14 17:06:08 -07:00
George Saines
c00c7ed56b
adding the new website background images
2014-03-14 15:24:36 -07:00
Nick Winter
5c76ca71e3
Added configuring of behaviors to the editor config.
2014-03-14 10:14:48 -07:00
Nick Winter
c28d2bb576
Merge pull request #545 from dkundel/master
...
Implemented editor config to allow Vim & Emacs key bindings as proposed in #99
2014-03-14 07:35:11 -07:00
Dominik Kundel
190469d794
removed unnecessary comment
2014-03-14 03:28:20 +01:00
Dominik Kundel
0392f630cc
including i18n support for new editor config and minor styling changes
2014-03-14 03:26:53 +01:00
Nick Winter
6e9945040f
Truncated long score graphs; made my-matches score graphs independent of time; showed crude score y-axis for now.
2014-03-13 19:20:22 -07:00
Nick Winter
795bd8f63b
Moved Glen from Archmages to About.
2014-03-13 18:27:08 -07:00
Dominik Kundel
6f2a04c5c0
added new editor config modal
2014-03-14 00:54:06 +01:00
Dominik Kundel
f618338d32
added button to access new modal for editor config
2014-03-14 00:53:29 +01:00
Nick Winter
2b41efe466
Resolved some merge conflicts.
2014-03-13 10:32:18 -07:00
TigroTigro
206af3184d
Update diplomat.jade
2014-03-13 18:01:52 +01:00
Nick Winter
c8103154a9
Using the new i18n utility function everywhere. Fixed big bug with spell palette i18n.
2014-03-13 09:02:19 -07:00
Nick Winter
4ad0fba860
Merge pull request #537 from jayant1992/master
...
UI and UX improvements to editor
2014-03-13 07:07:13 -07:00
Nick Winter
0be08574fc
Merge pull request #536 from bkimminich/master
...
Added/fixed some German translations
2014-03-13 07:05:17 -07:00
Nick Winter
10e4bc737a
Merge pull request #534 from Shrihari/fix-grid-toggle
...
Fix Grid Toggle consistency
2014-03-13 06:50:56 -07:00
Björn Kimminich
87ddd10dd4
Update diplomat.jade
2014-03-13 14:19:59 +01:00
Shrihari
fb7f64ddb0
Grid toggle consistent with the button and the shortcut
2014-03-13 15:21:00 +05:30
Jayant Jain
c24469e86b
Minor UI updates to level editor's thang tab
2014-03-13 12:19:51 +05:30
Nick Winter
28d56f526e
Okay, protectAPI should really work for Dungeon Arena now with the latest Aether change. Added a couple i18n spaces.
2014-03-12 20:59:19 -07:00
Michael Schmatz
aea9e9d1a6
Spectate view is nearing completion
2014-03-12 17:51:13 -07:00
Nick Winter
7e16821743
Updates for /play levels list.
2014-03-12 16:41:09 -07:00
Nick Winter
ac8f12ef20
I don't think we need this template any more.
2014-03-12 16:03:32 -07:00
Ruben Vereecken
b845961218
Clean up
2014-03-12 21:25:14 +01:00
Ruben Vereecken
f4637251be
Added i18n to play modal
2014-03-12 21:23:25 +01:00
Ruben Vereecken
ca271fedd6
Added i18n to my matches tab
2014-03-12 21:13:01 +01:00
Ruben Vereecken
9f5c0f03be
Added i18n to ladder_tab
2014-03-12 20:51:38 +01:00
Ruben Vereecken
c2e81db200
Added i18n to ladder.jade
2014-03-12 20:46:25 +01:00
Nick Winter
da762fbc4f
Merge branch 'rubenvereecken-versions_modal'
2014-03-12 08:30:02 -07:00
Nick Winter
0125c46dc2
Resolved merge conflict.
2014-03-12 08:29:42 -07:00
Ruben Vereecken
27fd580324
Got rid of CRLF line endings
2014-03-12 16:03:36 +01:00
Ruben Vereecken
8acf35b290
Added i18n for components
2014-03-12 15:42:57 +01:00
Ruben Vereecken
ddae5d0763
Added Version History to Level Components
2014-03-12 15:32:55 +01:00
Michael Schmatz
a6fb2a3994
Various changes to spectate view
2014-03-12 07:32:30 -07:00
Ruben Vereecken
2a86daaa2a
Added Version History to Thang Types
2014-03-12 15:22:15 +01:00
Nick Winter
8c57b31c54
Fixed a couple bugs with the matches tab.
2014-03-11 18:06:48 -07:00
Nick Winter
392534878a
Keeping old matches, up to 200, and showing them as stale. Added LevelSession.isRanking for better display of when you're still in the initial ranking phase.
2014-03-11 16:31:39 -07:00
Nick Winter
bba3c78107
Ties are not victories in the emails.
2014-03-11 13:20:52 -07:00
Michael Schmatz
4062bba245
Created initial spectate level view
2014-03-11 13:12:45 -07:00
Ruben Vereecken
8709cdc472
Finished Article History
2014-03-11 19:33:27 +01:00
Nick Winter
d012e0d7a9
Merge pull request #508 from Rahazan/patch-2
...
Update Dutch Translations
2014-03-11 09:46:18 -07:00
Nick Winter
eac219a2be
Inserted score history graph into ladder update emails.
2014-03-10 22:03:33 -07:00
Nick Winter
32baf2ae79
Improved my-matches rank history and name fetching, ladder update emails, ladder update unsubscribes.
2014-03-10 21:30:46 -07:00
Nick Winter
6ce65488aa
Added simple rank history graph. Improving ladder update mail.
2014-03-10 20:22:25 -07:00
Ruben Vereecken
af73e5a594
Added a versions modal for every type
2014-03-10 23:29:34 +01:00
Ruben Vereecken
8e989ec08f
Got the level history view set up as before, but better
2014-03-10 23:17:19 +01:00
Nick Winter
77f7276759
Merge branch 'versions_modal' of git://github.com/rubenvereecken/codecombat into rubenvereecken-versions_modal
2014-03-10 11:29:47 -07:00
Ruben Vereecken
29901787f7
Added i18n for Version History
2014-03-10 19:11:37 +01:00
Ruben Vereecken
06ae06fa34
Used mix-ins to combine Modal and VersionView
2014-03-10 19:08:53 +01:00
Nick Winter
234b3f105d
Reworked ladder game victory modal main call to action to actually submit game for ranking.
2014-03-10 10:36:28 -07:00
Ruben Vereecken
f6ece2d63e
Created a modal version of Version History
2014-03-10 12:16:08 +01:00
Nick Winter
3d71fcbc70
Wins, losses, and realizing that I'm not doing server code right.
2014-03-09 18:46:11 -07:00
Rahazan
66b7ba40e8
Added missing Dutch diplomats
2014-03-09 23:54:06 +01:00
Nick Winter
59314bcb3c
Merge pull request #500 from M-r-A/i18n
...
Update i18n
2014-03-09 08:19:02 -07:00
Alexei Nikitin
81084a24c6
Add admin i18n
2014-03-09 04:36:48 +04:00
Alexei Nikitin
f6d6805534
Add password i18n
2014-03-09 04:31:15 +04:00
Alexei Nikitin
bfebd0b47a
Add revert i18n
2014-03-09 04:13:30 +04:00
Nick Winter
39c4657204
Fixed HUD showing actions backwardly. Added rank numbering to leaderboard.
2014-03-08 15:43:56 -08:00
Nick Winter
cd79403736
Merge pull request #494 from M-r-A/patch-3
...
Fix l18n tags
2014-03-08 11:27:00 -08:00
Nick Winter
68099bbd7c
Victory modal for ladder games takes you back to the ladder matches.
2014-03-07 21:20:09 -08:00
Nick Winter
085fb82cc9
Fixed a multiplayer link and debug mark alpha.
2014-03-07 21:02:10 -08:00
Scott Erickson
be03485538
Set up the ladder play modal to be more forthright getting new players to play the tutorial.
2014-03-07 12:58:17 -08:00
Alexei Nikitin
535881b637
Update ambassador.jade
2014-03-07 12:20:17 -08:00
Alexei Nikitin
b002ae376b
Update counselor.jade
2014-03-07 12:19:14 -08:00
Alexei Nikitin
317ae5cc32
Update scribe.jade
2014-03-07 12:17:32 -08:00
Scott Erickson
cf2a0a999e
Set up the ladder play modal to point to the tutorial level dynamically.
2014-03-07 11:57:31 -08:00
Scott Erickson
a6c4fe8d02
Merge branch 'master' of https://github.com/rubenvereecken/codecombat into rubenvereecken-master
2014-03-05 20:04:14 -08:00
Nick Winter
4556536df4
Hooked up new HUD icons.
2014-03-04 11:15:31 -08:00
Ruben Vereecken
d43ff5d217
Added an anonymous check on the Fork button
2014-03-04 11:24:38 +01:00
Scott Erickson
1b257252f9
Merge branch 'production'
2014-03-03 16:52:01 -08:00
Nick Winter
7b25eeec47
HUD properties now flow into columns more evenly, have max styling.
2014-03-03 16:45:03 -08:00
Scott Erickson
619b628661
Reworked the victory modal styling a bit.
2014-03-03 16:39:56 -08:00
Nick Winter
c944e78271
Ladder views now show level descvription content if present.
2014-03-03 14:59:39 -08:00
Ruben Vereecken
b7fbf67e89
Enabled Fork button again. Previous commits solve issue #455
2014-03-03 22:52:37 +01:00
Ruben Vereecken
0aa8e7bb7d
Added owner-based save enabling on Thang Types. NOTE server-sided doesn't work yet
2014-03-03 22:21:56 +01:00
Nick Winter
461d66c795
Typo in my matches team ranking.
2014-03-03 13:02:34 -08:00
Nick Winter
0c4a2a2f2b
Multiplied visible scores by 100 for more awesome.
2014-03-03 12:27:32 -08:00
Ruben Vereecken
05b4f536c1
Fixed a link to point correctly
2014-03-03 21:22:04 +01:00
Ruben Vereecken
ee920afea9
Disabled buttons for non-owners in Article Editor
2014-03-03 21:13:02 +01:00
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
fb75ad36e7
Added team icons to the ladder play view.
2014-03-03 12:04:31 -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
feaeb1dc98
Made the wizard icons colored based on user settings.
2014-03-03 10:21:51 -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
Karthig
b04d63d5bf
- create sass file to center 404 image on page
2014-03-03 11:42:07 -05:00
Karthig
357ef45cb0
- insert random error image into 404 page
2014-03-03 10:58:33 -05: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
a665aca039
Merge pull request #443 from M-r-A/master
...
Finalized Russian translations
2014-03-03 07:21:49 -08:00
Ruben Vereecken
b8b22bb739
Localized 'Create New ..' and 'Search .. Here'
2014-03-03 12:45:04 +01:00
George Saines
4b6ebd6532
styled the victory modal a bit
2014-03-02 18:21:42 -08:00
Nick Winter
a8ef87c9ea
Fixed a few bugs; re-enabled protectAPI for Brawlwood.
2014-03-02 16:06:22 -08: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
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
6c48660922
No save button when there's nothing to save. Messing with AudioPlayer playSound API a bit.
2014-03-01 16:57:29 -08:00
Nick Winter
c2f82690b4
Put Archmage and Artisan avatars in GitHub README.
2014-03-01 11:21:24 -08:00
Tay Yang Shun
f43dd2f3ff
Added breadcrumbs for Editor Search Results, Thang Editor and Article Editor pages.
2014-03-01 14:47:31 +08:00
Nick Winter
7855ca02d8
Hit a really bad victory modal image.
2014-02-28 21:29:14 -08:00
Alexei Nikitin
d68ff5a899
Fix diplomat.jade building
2014-03-01 04:54:54 +04:00
Alexei Nikitin
789b49e15f
Update diplomat.jade
2014-03-01 03:37:11 +04:00
Scott Erickson
10795df7d9
Renamed hardcoded project-dotas to brawlwoods.
2014-02-28 13:59:02 -08:00
Nick Winter
ad30130814
Merge pull request #437 from M-r-A/master
...
Fix indents
2014-02-27 17:10:48 -08:00
M-r-A
873cd55cf3
Update ambassador.jade
2014-02-27 17:00:04 -08:00
M-r-A
a1bb322e7c
Update archmage.jade
2014-02-27 16:56:02 -08:00
M-r-A
0d7eb52fb8
Update ambassador.jade
2014-02-27 16:55:24 -08:00
M-r-A
095b14e41a
Update adventurer.jade
2014-02-27 16:54:59 -08:00
M-r-A
772c0b1ab7
Update artisan.jade
2014-02-27 16:54:22 -08:00
Nick Winter
de4c9cb60d
Merge pull request #436 from M-r-A/master
...
Fix link in legal.jade
2014-02-27 16:40:56 -08:00
M-r-A
d3d5810acc
Fix link in legal.jade
2014-02-27 16:34:58 -08:00
Scott Erickson
7c734d6bc9
Added an async name checker for the wizard settings modal.
2014-02-27 14:42:11 -08:00
Scott Erickson
b31527abef
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-27 14:08:04 -08:00
Scott Erickson
02cb9155c0
Improved a bunch of things with the wizard settings view.
2014-02-27 12:25:59 -08:00
Gokul
63f70f7a39
Made changes in the language, It was earlier showing English(Au) for both Lithuanian and Norwegian Nynorsk. Couldno't change Bahasa Melayu. It keeps showing {English} in the description instead of Bahasa Melayu
...
Changed English(Au) in two wrong places to Luthanian and Norwegian
Changed English(Au) in two wrong places to Luthanian and Norwegian and made corrections in Bahasa
Cleaned up some more lang. descriptions and issue #272 shouldn't happen now i guess
Update not_found.jade
A couple tweaks to gokul1794's commits.
2014-02-27 12:07:57 -08:00
Nick Winter
c26995a3a9
Home button on ladder level goes to ladder.
2014-02-26 18:58:25 -08:00
Nick Winter
5c1c17c8dd
Green Guide button for attention.
2014-02-26 17:52:08 -08:00
Michael Schmatz
b648098c95
Implemented espionage mode
2014-02-26 14:14:43 -08:00
Nick Winter
b86c32c3e2
Merge pull request #422 from yangshun/level-not-found
...
Redirect to play page for non-existent levels. Fixes issue #396
2014-02-25 14:17:44 -08:00
Tay Yang Shun
373a618cff
Moved internationalisation of level load error message into template file
2014-02-26 06:14:29 +08:00
Tay Yang Shun
11c5f7419a
Used internationalised strings for level not found message
2014-02-26 05:54:33 +08:00
Tay Yang Shun
8a24407d3e
Redirect to play page for non-existent levels. Fixes issue #396
2014-02-26 04:59:35 +08:00
Nick Winter
0380a30522
Fixes for not storing default code in other sessions. sass-brunch 1.8. Removed tutorial link for now. Round wizards.
2014-02-25 10:48:23 -08:00
Scott Erickson
79ce16dbba
Hiding most of the ladder page if not logged in.
2014-02-24 14:57:51 -08:00
Scott Erickson
e48bdfa1a7
Added your score to the ladder/team view.
2014-02-24 13:03:04 -08:00
Nick Winter
10e10aa961
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 09:58:15 -08:00
Nick Winter
91412ccd69
Playback and level editor shortcut tweaks.
2014-02-24 09:58:12 -08:00
Scott Erickson
d146febb32
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-24 09:47:20 -08:00
Scott Erickson
3f0f391556
Finished up work on the wizard settings modal.
2014-02-24 09:46:40 -08:00
Scott Erickson
2d6dd36a68
Saturation and lightness was flipped on the spritebuilder. Fixed.
2014-02-24 09:06:22 -08:00
Nick Winter
5b88b58a75
Fixed application of a few i18n tags in wizard/picture settings.
2014-02-23 12:31:41 -08:00
Nick Winter
11f742ff0f
Included Hour of Code explanation in play footer.
2014-02-23 11:48:34 -08:00
Nick Winter
0d9213ad44
Faded Contact link until hover.
2014-02-22 17:45:24 -08:00
Nick Winter
8565e3f315
Adding the button, not just the shortcut, for beautification.
2014-02-22 17:18:58 -08:00
Nick Winter
72cfcf96ed
Added basic opponent wizard. Disabled synchronous multiplayer for ladder levels.
2014-02-22 12:01:05 -08:00
Scott Erickson
7261f9960c
Tweaked the name column size in the ladder view.
2014-02-20 16:52:46 -08:00
Nick Winter
91a641d3ab
Updated Diplomat instructions and related locale files.
2014-02-20 14:52:42 -08:00
Scott Erickson
9c30b9f0d0
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 14:49:17 -08:00
Scott Erickson
48cf9a1443
Added a link to the tutorial level.
2014-02-20 14:31:33 -08:00
Nick Winter
3c651abe20
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 14:05:37 -08:00
Nick Winter
97b6094fe8
Tweaks for ladder views.
2014-02-20 13:58:35 -08:00
Nick Winter
284576521f
Added fullscreen toggle to play with.
2014-02-20 13:19:49 -08:00
George Saines
7d4431d2f2
adding youtube link for instructional vid
2014-02-20 12:41:04 -08:00
Scott Erickson
63ef2860d6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 11:57:48 -08:00
Nick Winter
cc8a8cabd5
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-20 11:57:15 -08:00
Nick Winter
7266142c02
Upgrading docs return value schema. Added button template for tutorial and screencast on ladder.
2014-02-20 11:57:04 -08:00
Scott Erickson
5cefb8fc30
Merge branch 'production'
2014-02-20 11:47:02 -08:00
Michael Schmatz
6d6cac7309
Various interface tweaks
2014-02-20 10:56:32 -08:00
Michael Schmatz
cb0c22f0c9
Replaced rank button with button going to ladder page
2014-02-20 10:14:25 -08:00
Michael Schmatz
7c5192820f
Put more security on the session submissions and improved simulation status rendering
2014-02-20 09:44:44 -08:00
Michael Schmatz
99de854536
Put in link to detail view
2014-02-20 08:39:27 -08:00
Michael Schmatz
e593fd23b4
Improved interface for simulating games
2014-02-20 08:06:14 -08:00
Scott Erickson
878d1e4098
Fixed the placement of the music note in the playback view.
2014-02-19 12:27:49 -08:00
Scott Erickson
f383e5b9fa
Fixes for the ladder team view.
2014-02-18 12:27:10 -08:00
Scott Erickson
5a436ce10b
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-18 11:41:29 -08:00
Scott Erickson
cacf6539c1
Working on the ladder and team views.
2014-02-18 11:38:49 -08:00
Nick Winter
d45f67a8c3
Fixed some popover and modal layout and bugs.
2014-02-18 10:03:57 -08:00
Scott Erickson
452a43cae9
Working on the ladder and team views.
2014-02-17 17:42:41 -08:00
Nick Winter
3c08f8a5eb
Added wizard settings i18n tags.
2014-02-17 13:08:37 -08:00
Nick Winter
a4f4016c73
Updating i18n tags for new contribute summaries.
2014-02-17 12:23:06 -08:00
Andrew Wong
b1aa65833a
Consolidated text on contribute and removed padding to make the
...
page not as spread out.
Text on the contribute page was a redundant copy of each class'
contribution page. The summary text was shortened and some vertical
padding was removed.
2014-02-17 10:24:29 -08:00
Nick Winter
e3824d7698
Many improvements to the spell palette.
2014-02-16 15:30:00 -08:00
Scott Erickson
72712a349c
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-15 12:07:28 -08:00
Scott Erickson
ac08490e86
Reworked the multiplayer modal a bit.
2014-02-15 12:06:47 -08:00
Michael Schmatz
c418e282ae
Put in pairwise simulation button
2014-02-14 16:53:37 -08:00
Nick Winter
50f683534f
Support for seeing this.now() in spell palette.
2014-02-14 16:52:50 -08:00
Michael Schmatz
fc76846aa6
Stopped parsing ladder as int
2014-02-13 17:34:31 -08:00
Scott Erickson
476cc87628
Set up the ladder to be able to compete against other sessions.
2014-02-13 16:42:35 -08:00
Scott Erickson
9bea226677
Fixed the ladder table.
2014-02-13 15:57:07 -08:00
Scott Erickson
1d3e013cc6
Merge remote-tracking branch 'origin/master'
...
Conflicts:
app/views/play/ladder_view.coffee
2014-02-13 15:11:11 -08:00
Scott Erickson
32337df156
Trimmed down the ladder view for now.
2014-02-13 15:09:40 -08:00
Nick Winter
aa282c3a35
Updates for formatting palette docs.
2014-02-13 11:18:20 -08:00
Scott Erickson
2b742da9e4
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-13 10:38:43 -08:00
Michael Schmatz
14530b779a
Refactored scoring submissions, added beginnings of spectator view
2014-02-13 10:37:44 -08:00
Scott Erickson
2e280fad6b
Set up the multiplayer modal with a submit button for the ladder queue.
2014-02-13 10:16:27 -08:00
Nick Winter
9ac0939bb8
Fixed modal switchout and palette property interpolation. Refactored all use of .hide to .secret so we can use jQuery to show/hide things again.
2014-02-13 09:26:21 -08:00
Nick Winter
8a80b9770d
More work on docs. Got rid of Docs.coffee.
2014-02-12 18:54:45 -08:00
Nick Winter
d2345432ff
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-02-12 16:42:31 -08:00
Nick Winter
dc8c4394e1
Spell palette entries now using property docs from components.
2014-02-12 16:42:09 -08:00
Scott Erickson
f3489a6c2f
Added a 'stop' button for viewing end animations on thang types.
2014-02-12 16:18:25 -08:00
Michael Schmatz
ad8a8e00e8
Merge pull request #354 from justin-/fix/diplomat-template
...
Add indentation to fix template engine output
2014-02-12 09:09:24 -08:00
Michael Schmatz
a6b15663a4
Merge branch 'master' into feature/task-queue
...
Conflicts:
app/views/play/level/tome/spell.coffee
2014-02-11 13:10:59 -08:00
Nick Winter
d2a7bfd11c
Added GoldView.
2014-02-11 12:02:27 -08:00
Michael Schmatz
c0d43ea32b
Merge branch 'master' into feature/task-queue
2014-02-10 17:10:26 -08:00
Michael Schmatz
7faabc37e3
Simulation button
2014-02-10 17:09:51 -08:00
justin
719dbea3bf
Add indentation to fix template engine output
2014-02-09 12:31:15 -05:00
Kushal
40eead0341
use https when linking to wikipedia
...
Wikipedia supports (but does not yet require) https. This will change in the future but it will not hurt to switch to https ourselves :)
https://blog.wikimedia.org/2013/08/01/future-https-wikimedia-projects/
2014-02-08 16:31:52 -06:00
Nick Winter
22433b14ae
Tweaked about avatar formatting.
2014-02-08 10:30:28 -08:00
Nick Winter
2e7a1fd0ef
Working on the contribute pages -- #314 .
2014-02-08 10:21:12 -08:00
Nick Winter
2a740f777e
Starting to add contributor avatars.
2014-02-07 18:38:17 -08:00
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