dpen2000
|
7bc9bb5328
|
Fix javascript error occuring when e is null/undefined
|
2014-04-17 14:32:35 -04:00 |
|
dpen2000
|
a6ed7c9bff
|
Fix players above the current player coming out in wrong order in original and simulators leaderboard
|
2014-04-16 18:20:59 -04:00 |
|
Michael Schmatz
|
e764277874
|
Merge pull request #850 from dpen2000/MoreSimulatorsLeaderboardImprovements2
Implement rank column in simulators leaderboard
|
2014-04-16 13:26:42 -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
|
b9a978dd13
|
Fixed the colors tab view.
|
2014-04-16 08:44:04 -07:00 |
|
Scott Erickson
|
476d153717
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-16 08:07:54 -07:00 |
|
dpen2000
|
a74f89c30c
|
Implement rank column in simulators leaderboard
|
2014-04-15 23:13:10 +01:00 |
|
Nick Winter
|
f762d95ab8
|
ModelModal and simple leaderboard pagination.
|
2014-04-15 15:01:54 -07:00 |
|
Scott Erickson
|
e06c3dbb0b
|
Fixed the thangs tab view preventing the new patches view from handling clicks correctly.
|
2014-04-15 13:21:33 -07:00 |
|
Scott Erickson
|
1efabc3738
|
Fixed the fix.
|
2014-04-15 12:31:35 -07:00 |
|
Scott Erickson
|
69fba34f64
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-15 12:27:46 -07:00 |
|
Scott Erickson
|
b238ccaf27
|
Fixed the context-menu preventer in the level editor.
|
2014-04-15 12:27:35 -07:00 |
|
Scott Erickson
|
bb53e963b6
|
Removed a hack no longer needed.
|
2014-04-15 12:27:11 -07:00 |
|
Nick Winter
|
e49344bd87
|
A few job profile fixes and cleanup.
|
2014-04-15 10:45:54 -07:00 |
|
Nick Winter
|
9194f842e6
|
Added some job description fields.
|
2014-04-15 09:28:19 -07:00 |
|
Nick Winter
|
1239617bd4
|
Fixed browser majorVersion detection for Safari. Adjusted range radius property regexp.
|
2014-04-14 16:34:11 -07:00 |
|
Nick Winter
|
2b7e629c7f
|
Merge branch 'master' of https://github.com/codecombat/codecombat
|
2014-04-14 14:49:42 -07:00 |
|
Nick Winter
|
e908ae2fb4
|
Fixed #772.
|
2014-04-14 14:49:38 -07:00 |
|
gosnat
|
ebddcb57a9
|
Update play_view.coffee
Adding the "Find the Spy" level to the user created list.
|
2014-04-14 15:43:23 -05:00 |
|
Nick Winter
|
1794e5e040
|
Fixed #813 (sort of).
|
2014-04-14 11:18:02 -07:00 |
|
Nick Winter
|
8aa36178af
|
Fixed #769. Added some analytics timing tracking. Added replacement for $.browser.
|
2014-04-13 20:31:23 -07:00 |
|
dpen2000
|
2345a7d8e8
|
Additional fix on #831 - remove additional call to fetch as constructor of SimulatorsLeaderboardData does fetch, remove commented code
|
2014-04-13 19:58:50 -04:00 |
|
Nick Winter
|
af0b8aa5e2
|
A few fixes and cleanup for #831.
|
2014-04-13 15:28:16 -07:00 |
|
Nick Winter
|
3d945492b0
|
Merge branch 'SimulatorsLeaderboard2' of git://github.com/dpen2000/codecombat into dpen2000-SimulatorsLeaderboard2
|
2014-04-13 14:48:45 -07:00 |
|
Nick Winter
|
a9725f2dc6
|
A bit of error handling.
|
2014-04-13 14:48:36 -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 |
|
Nick Winter
|
8349578057
|
Fixed #786.
|
2014-04-12 12:35:45 -07:00 |
|
Scott Erickson
|
30f785f7cf
|
Moved the model schemas into a models folder.
|
2014-04-12 10:51:02 -07:00 |
|
Scott Erickson
|
5a794306fe
|
Merge branch 'refactorSchemas' of https://github.com/adi2412/codecombat into adi2412-refactorSchemas
|
2014-04-12 08:53:24 -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 |
|
Aditya Raisinghani
|
e04787475c
|
Rebased master to get updated schemas and added patch schema
|
2014-04-12 15:16:42 +05:30 |
|
Aditya Raisinghani
|
b932bf1e7c
|
Deleted schemas from /server and modified files to point to /app/schemas
|
2014-04-12 14:45:59 +05:30 |
|
Aditya Raisinghani
|
6fb5b59a01
|
Refactored schemas to be in /app
|
2014-04-12 14:33:55 +05:30 |
|
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 |
|
Nick Winter
|
a792286161
|
Ameliorated #468, maybe. At least, it doesn't erroneously show the name errors any more.
|
2014-04-11 22:30:28 -07:00 |
|
Scott Erickson
|
34bf484bf2
|
Added data merge conflict handling.
|
2014-04-11 21:11:52 -07:00 |
|
Nick Winter
|
99ead5d193
|
#223 is done, since goals aren't in scripts, and I just removed some goals-of-scripts stuff.
|
2014-04-11 19:51:20 -07:00 |
|
Nick Winter
|
f0aa5e1d5e
|
Fixed #681 by removing full-screen button in Safari.
|
2014-04-11 18:19:52 -07:00 |
|
Nick Winter
|
99b430c1b4
|
Fixed #714 with a hack.
|
2014-04-11 17:55:47 -07:00 |
|
Nick Winter
|
91c2f0fa33
|
Fixed #715, and some misc cleanup.
|
2014-04-11 17:36:15 -07:00 |
|
Nick Winter
|
97d4017869
|
Hacky way to get play background to fit with new loading image.
|
2014-04-11 16:15:26 -07:00 |
|
Nick Winter
|
1607790ea3
|
Updated jQuery UI from 1.10.3 to 1.10.4 for Treema autocomplete bug.
|
2014-04-11 14:59:09 -07:00 |
|
Scott Erickson
|
bbb9fb7a64
|
Added a patches view.
|
2014-04-11 14:19:17 -07:00 |
|
Nick Winter
|
10bb17c38a
|
Added getThangByID method to Thang. Handled a few error corner cases with the time popup.
|
2014-04-11 14:03:13 -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 |
|