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
