Matt Lott
c16b0f97bf
Update sync PVP to use transpiledCode
2014-11-22 20:48:07 -08:00
Scott Erickson
03705825d9
Made the GET /db/* endpoints generally accessible without needing to have a user object associated with the request.
2014-11-22 18:41:06 -08:00
Scott Erickson
e5b87e5158
Tweaked, re-enabled achievement specs.
2014-11-21 10:59:48 -08:00
Scott Erickson
c77d38d59f
Made sure Apple receipts can't be re-used with different accounts.
2014-11-21 10:34:37 -08:00
Nick Winter
4de71507a8
Fixed winston require in EarnedAchievement handler.
2014-11-21 10:04:50 -08:00
Scott Erickson
b86e3c30dc
Set up level achievements to be created manually by the client, hopefully making them a bit more stable.
2014-11-20 22:09:54 -08:00
Nick Winter
2393165d9a
Turned off some completed A/B tests. Fixed an achievement recalculation typo Scott found.
2014-11-20 21:57:47 -08:00
Michael Schmatz
f84e92595b
Changed UDID to identifierForVendor
2014-11-20 20:03:24 -05:00
Scott Erickson
a18537b065
Added the ability to assign a user an iOS UDID, and login with it.
2014-11-20 15:54:15 -08:00
Scott Erickson
fae09aad00
Turned on double optin for MailChimp.
2014-11-20 14:31:50 -08:00
Nick Winter
df51e28a1d
Fixed camera zoom killing coordinate hover unnecessarily.
2014-11-20 11:37:10 -08:00
Scott Erickson
13de055c0b
Set up a basic achievements list modal for the world map.
2014-11-19 14:56:40 -08:00
Nick Winter
bf71893ddf
Significantly reduced memory usage and simulation time by further limiting the amount of Thangs which even start tracking ThangState in the first place.
2014-11-17 21:30:44 -08:00
Scott Erickson
95dca575d1
Set up stripe on the server and site to allow purchases through the website.
2014-11-17 15:15:08 -08:00
Matt Lott
f56d01419f
Update sync pvp teams and real-time playback
...
-Non-creator will switch teams upon joining a sync pvp game, if creator
is on same team
-Team swapping should only affect level session
-Real-time multiplayer submit now reloads PlayLevelView to ease loading
both player’s latest level sessions, and then automatically starts
real-time playback.
2014-11-17 15:07:10 -08:00
Nick Winter
a7069e19bd
Ignore (and warn about) achievements with empty queries. Fixed embarrassing bug with more-practice / skip-ahead branching not doing anything for non-admins.
2014-11-17 08:44:53 -08:00
Scott Erickson
025780a575
Added loadingTip property to levels, set them up on the LevelLoadingView, and got them prepped for i18n-ing.
2014-11-12 15:00:24 -08:00
Nick Winter
26beb8a034
A few improvements to ItemDetailsView formatting to deal with spells granted.
2014-11-12 11:02:05 -08:00
Scott Erickson
7012d5dfbe
Built payment endpoint for processing Apple IAPs.
2014-11-11 17:40:29 -08:00
Nick Winter
0af7b4d5b7
Preparing for being able to use multiple hero classes. Deleted old ChooseHeroView. Improvements to missile trajectories.
2014-11-11 16:37:00 -08:00
Scott Erickson
12e860a985
Fixed #1739 . Darnit mongoose.
2014-11-11 14:52:43 -08:00
Nick Winter
ce04541d3a
Working on tying item purchasability to player level, plus other small tweaks to the item store.
2014-11-10 22:07:55 -08:00
Scott Erickson
f21f54cd19
Refactored, mostly redesigned inventory view, modeled after the Heald item store design.
2014-11-10 15:31:32 -08:00
Nick Winter
b33fee406b
Server now logs the messages of its bad responses instead of just sending them to the client. Added a script that migrated bad ObjectIds in purchased items.
2014-11-10 13:27:40 -08:00
Nick Winter
851bf39c5c
Using extendedName.
2014-11-05 20:22:15 -08:00
Scott Erickson
8edde2f470
Fixed purchased items and such in the user so that they're strings instead of ObjectIds.
2014-11-05 16:41:03 -08:00
Scott Erickson
33d14918b0
Implementation of Heald's design of the PlayItemsModal. Added purchasing logic to the server to support it. Refactored header font from Bangers to Open Sans Condensed.
2014-11-03 20:48:59 -08:00
Nick Winter
cec8350232
Added Missile ThangType kind and a couple misc hero data tweaks.
2014-10-30 15:56:49 -07:00
Nick Winter
47c090f7c7
Hiding locked items with no slot selected. Silhouetting items that are too far above you. Only showing items with a gem cost in the inventory screen. Sorting items by gem cost. Animating double-clicking items to show their motion to the slot, sort of.
2014-10-30 13:07:04 -07:00
Nick Winter
ea349cfa29
Intermediate query state for heroes while still transitioning from Unit to Hero.
2014-10-29 15:54:51 -07:00
Nick Winter
98fe639010
Added heroClass and gem fields to the ThangTypes, and a new Hero kind. Fixed adding new ThangType properties in the Thang Editor.
2014-10-29 15:34:04 -07:00
Nick Winter
60bf580c5b
Bumped Handler fetch limit from 300 to 500 to deal with 300+ ThangTypes. It's great.
2014-10-29 12:18:00 -07:00
Nick Winter
c7713b4105
Showing i18n in property docs.
2014-10-28 21:15:47 -07:00
Scott Erickson
ee95e4e450
Got rid of a race condition.
2014-10-28 11:21:26 -07:00
Nick Winter
68ac412f2b
I think this return is needed to prevent sending the i18n query results twice and crashing the server.
2014-10-27 22:54:50 -07:00
Scott Erickson
cea04d27ad
Built diplomat-specific views for editing levels, components, achievements and thang types.
2014-10-27 17:16:22 -07:00
Matt Lott
8f923f9e1e
Replacing http PATCHs with PUTs
...
We’re keeping the patch behavior though.
Real patch calls return incorrect http responses in some environments,
like Browserstack and schools.
2014-10-27 16:09:52 -07:00
Matt Lott
f4426f2e43
Save user code errors without 'Line N: ' prefix
2014-10-24 14:05:54 -07:00
Scott Erickson
cd8f5800a6
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-10-21 10:21:46 -07:00
Nick Winter
700b460f91
Fixed bug in fetching submitted ladder sessions that hadn't been scored yet.
2014-10-20 17:00:46 -07:00
Nick Winter
08d9e39764
LevelLoader and Simulator fixes for simulating hero-ladder matches. Commented out some logging that hasn't been very useful. Fixed some tests.
2014-10-19 21:56:26 -07:00
Nick Winter
56a80e3615
Started getting hero-ladder level type working.
2014-10-18 14:51:49 -07:00
Scott Erickson
0dc050abca
Added i18nCoverage backend support.
2014-10-17 12:12:06 -04:00
Nick Winter
d79d40b98c
Moved spellbooks to right hand. Put full-body hero feature images in. Saved some height on ChooseHeroView and InventoryView for smaller screens. Hid level play counts unless admin.
2014-10-14 09:54:36 -07:00
Scott Erickson
6ff7cd12cc
Mostly done with the victory modal.
2014-10-13 11:53:08 -04:00
Nick Winter
16ff8c6601
Reordered i18n in rough order of section importance. Deprecated employer/candidate pages for now and turned off candidate emails.
2014-10-02 12:10:24 -07:00
Nick Winter
3871b60ea7
Actually committing last of earned_achievement_handler fixes.
2014-10-01 08:50:07 -07:00
Nick Winter
8d37309de1
Several fixes for achievement recalculation.
2014-09-30 19:32:11 -07:00
Nick Winter
5c77e103f3
Fixed issues with achievements awarding awry. Fixed iPad auto-debug toggle.
2014-09-30 16:18:32 -07:00
Scott Erickson
8adbd87401
Merge branch 'master' into feature/webgl
2014-09-28 10:38:19 -07:00
Scott Erickson
627c56dbb5
Fixed mouse scrolling. Fixed SpriteStage scaling (scale the layers instead). Added spriteType to the ThangType schema.
2014-09-26 11:07:01 -07:00
Nick Winter
98fed4a277
Extended Achievements to support earning heroes, items, levels, and gems. Fixed a few Achievement bugs.
2014-09-26 02:29:04 -07:00
Nick Winter
61aa2d8b6f
Changed default language from JavaScript to Python. Fixed a few InventoryView tests. Adjusted maze real-time playback speed factor code.
2014-09-25 13:29:20 -07:00
Nick Winter
a57cc0126e
A few more tweaks for #1584 . Hero victory now always goes to world map.
2014-09-23 17:13:41 -07:00
Nick Winter
1a46d4345d
Merge pull request #1584 from ThatOtherPerson/log-user-ips
...
Log last-used IP in User object
2014-09-23 17:10:00 -07:00
Nick Winter
1b4e75e7e8
Fix for earned achievement default null worths. Misc other fixes.
2014-09-22 20:15:51 -07:00
Nick Winter
c54bf3553f
Added basic JSONP support for /auth/whoami public properties.
2014-09-22 14:56:02 -07:00
David Beckley
2acebb54c6
Fix #1005
2014-09-21 23:02:06 -07:00
Nick Winter
42b52f5593
No more ThangListView for hero levels. Fixed pluralization of level loading goals when there's only one goal. Fixed default playback state to paused. Started playing ambient dungeon/grass sounds. Fixed bug with goals not showing up at first. Refactored how goals, gold, and flags hide themselves initially. Ignored InventoryView ThangTypes when sorting Components during level serialization.
2014-09-21 22:10:52 -07:00
Nick Winter
ae14bd1ced
Hooked up hero choice from ChooseHeroView and PlayLevelModal. Tried to fix some oddities with achievements. Fixed #1564 .
2014-09-20 15:18:21 -07:00
Nick Winter
e3b75a69ea
Working on PlayLevelModal and ChooseHeroView.
2014-09-19 22:16:05 -07:00
Nick Winter
81a5b73f93
Fixed a few misc bugs I noticed with the job profiles.
2014-09-19 22:16:05 -07:00
Nick Winter
bbb6300f1f
Merge pull request #1576 from ThatOtherPerson/fix-misnaming
...
Renamed sendUnauthorizedUser to sendForbiddenError
2014-09-19 08:19:42 -07:00
Nick Winter
d610b1633f
A bit more CoffeeScripty on the style. Fixes #1558 .
2014-09-19 08:17:30 -07:00
David Beckley
527c1ed79d
Fix issue #8
2014-09-19 03:52:34 -07:00
David Beckley
b9a511155e
Remove sendUnauthorizedError, as it merely returned the same value (HTTP 403) as sendForbiddenError
2014-09-19 02:26:18 -07:00
Nick Winter
851ad43b45
Made some more User properties private.
2014-09-10 21:56:21 -07:00
Scott Erickson
65c0d74a79
Added a new searchStrings property to level components to improve their search.
2014-09-03 17:33:10 -07:00
Scott Erickson
5fc7caec64
Disabling an error that occurs on the dev server with the partial db.
2014-09-03 17:26:43 -07:00
Nick Winter
3e0518cd70
Fixed a few bugs and added a bunch of defensive handling for permissions not existing without new defaults. Fixed longstanding mistake with signup ignoring email newsletter setting.
2014-09-01 09:11:10 -07:00
Nick Winter
040ac4ff4e
Fixed bug with black flashes during script playback.
2014-08-31 16:05:21 -07:00
Nick Winter
5f132e55ba
Fixed #1414 . Also started lazily loading certain level editor tabs.
2014-08-30 23:04:45 -07:00
Nick Winter
77e7efebeb
Fixed #1385 : no more redundant fallback localization files.
2014-08-30 19:30:33 -07:00
Nick Winter
24d3d189df
Made espionage mode simpler, and added an admin user lookup.
2014-08-30 17:09:57 -07:00
Nick Winter
4d24233b0d
Fixed #1356 .
2014-08-30 15:19:42 -07:00
Nick Winter
e5cf6c340b
Fixed #1140 . I just put it on the home page for now, but later we can put it somewhere where it makes sense.
2014-08-29 23:09:38 -07:00
Scott Erickson
0ba9db6c14
Fixed some server tests.
2014-08-29 12:58:23 -07:00
Scott Erickson
f54c3236ab
Refactored Achievement's getExpFunction to use the new defaults system, now on the server side.
2014-08-29 12:41:25 -07:00
Scott Erickson
570380c2a4
Merge branch 'master' into feature/defaults
2014-08-29 08:14:43 -07:00
Nick Winter
124f999bc8
Fixed #1105 . Also send HipChat notifications whenever anyone changes anything; let's see if it's too much.
2014-08-28 19:39:46 -07:00
Nick Winter
f74a152942
Fixed #1104 .
2014-08-28 18:55:33 -07:00
Scott Erickson
2dde77f8b0
Merge branch 'master' into feature/defaults
2014-08-28 15:26:04 -07:00
Nick Winter
54207f0f7d
Fixed #1000 .
2014-08-28 10:50:20 -07:00
Scott Erickson
8b943d1c2c
Merged conflicts.
2014-08-28 09:59:03 -07:00
Nick Winter
28431703f5
Fixed #953 .
2014-08-27 22:23:24 -07:00
Scott Erickson
f92a665b8b
Merge conflicts.
2014-08-26 09:53:04 -07:00
Nick Winter
832402af6e
Merged/tweaked GitHub login.
2014-08-26 08:37:11 -07:00
Scott Erickson
1c5db3f2b7
First round of getting the site to use the new defaults system, in particular the job profile view.
2014-08-23 11:07:52 -07:00
Nick Winter
28176c7f72
Misc workarounds.
2014-08-20 13:26:48 -07:00
Scott Erickson
f8d4e42c67
Set up thang types to now have a raster portrait icon if we want to give them custom ones not based on vector artwork.
2014-08-18 15:25:45 -07:00
Scott Erickson
366dfadba5
Fixed a bug in IDify.
2014-08-15 10:36:21 -07:00
Scott Erickson
8233df514e
Added an acceptor field to patches.
2014-08-15 10:36:21 -07:00
Scott Erickson
7db821309a
Tweaked isRecalculable.
2014-08-15 10:11:22 -07:00
Scott Erickson
ca83023591
Tweaked the earned achievement recalculator.
2014-08-15 10:11:22 -07:00
Ruben Vereecken
4f22723084
Added Query streams wherever possible to ease server load.
2014-08-15 10:11:11 -07:00
Scott Erickson
34207d28c9
Streamifying and optimizing the recalculating of stats scripts.
2014-08-15 10:10:52 -07:00
Ruben Vereecken
40818fd7bc
GitHub Login implemented
2014-08-15 16:20:45 +02:00
Matt Lott
98bed57751
Merge pull request #1441 from differentmatt/master
...
Instrument user code problems
2014-08-14 16:17:47 -07:00
Nick Winter
0f983bdcf1
Crude steps towards using your hero equipment in items levels.
2014-08-14 15:12:15 -07:00
Matt Lott
9b79e2ca27
Instrument user code problems
2014-08-14 13:32:00 -07:00
Scott Erickson
c31a509472
Working on the inventory view. Added a way to get the current equipment config from the inventory view.
2014-08-14 10:44:04 -07:00
Ruben Vereecken
5f7ef825f8
Introduced findBySlugOrId to fix a bug
2014-08-14 16:38:50 +02:00
Scott Erickson
e3088ad813
Merge branch 'achievements' of https://github.com/rubenvereecken/codecombat into rubenvereecken-achievements
2014-08-13 10:49:10 -07:00
Scott Erickson
04e8680263
Added an endpoint for loading all items.
2014-08-13 10:35:14 -07:00
Ruben Vereecken
3fd396974d
Merge branch 'master' into achievements
...
Conflicts:
app/views/DemoView.coffee
app/views/docs/ComponentDocumentationView.coffee
app/views/editor/level/LevelEditView.coffee
server/users/User.coffee
2014-08-13 10:43:42 +02:00
Nick Winter
4dcc5bd8ee
Adding some options to the game menu options tab.
2014-08-10 15:56:45 -07:00
Nick Winter
9a1dd412c9
Added Delighted feedback emails.
2014-08-09 23:11:26 -07:00
Ruben Vereecken
e6569539dc
User page now uses the supermodel for user loading
2014-08-08 19:26:24 +02:00
Ruben Vereecken
47f00f9b5e
Added achievement deleting and automatic achievement filling
2014-08-08 17:20:07 +02:00
Ruben Vereecken
9f0add22a5
Worked in a lot of changes Scott proposed
2014-08-08 11:54:53 +02:00
Scott Erickson
cc025942f8
Extended the LevelLoader to load thang types and components dynamically for hero levels.
2014-08-07 18:27:47 -07:00
Nick Winter
4d4e321265
Fixed #1062 . Added Item kind to level editor Thang filters.
2014-08-06 08:24:50 -07:00
Ruben Vereecken
d42922871e
Added related achievements tab to level editor
2014-08-05 15:15:53 +02:00
Ruben Vereecken
5d66560673
Merge remote-tracking branch 'upstream/master' into achievements_progress
...
Conflicts:
app/views/editor/level/LevelEditView.coffee
server/levels/sessions/LevelSession.coffee
2014-08-05 11:55:46 +02:00
Ruben Vereecken
3266e3b46b
intermediate
2014-08-04 22:21:43 +02:00
Nick Winter
84ccde9fd3
Merged User editableProperties move with adding savedEmployerFilterAlerts to editableProperties.
2014-08-04 12:48:41 -07:00
Ruben Vereecken
26085f9f3e
Added a bunch of achievements to the script. Restyled big parts.
2014-08-03 23:58:51 +02:00
Michael Schmatz
2c809759a3
Merge pull request #1395 from rubenvereecken/master
...
Added test cases for fetching related by user slug instead of ID
2014-07-31 08:08:53 -07:00
Ruben Vereecken
871149b2bc
Rechecked and added cool stuff for achievements
2014-07-30 22:23:43 +02:00
Ruben Vereecken
30a6cf1cca
Merged in name changes from master
2014-07-29 17:28:13 +02:00
Ruben Vereecken
f3e5b30f11
Merge remote-tracking branch 'upstream/master'
2014-07-29 16:50:31 +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
0f3b049189
Added test cases for fetching related by user slug instead of ID
2014-07-29 12:48:31 +02:00
Michael Schmatz
2e3234fc58
Merge pull request #1394 from rubenvereecken/master
...
First step towards fetching related by slug
2014-07-28 12:31:25 -07:00
Ruben Vereecken
cc7474538f
First step towards fetching related by slug
2014-07-28 21:25:11 +02:00
Ruben Vereecken
a03e3aedd1
Managed to recalculate translation/misc patches after all
2014-07-24 19:43:09 +02:00
Ruben Vereecken
b2c11fa087
Added achievement recalculation script
2014-07-24 15:05:26 +02:00
Ruben Vereecken
3191c87cf1
Added recalculation for patches. Struggled with translations. Won't recalculate those probably
2014-07-24 14:41:06 +02:00
Ruben Vereecken
cde87e4fe5
Covered general patches with tests
2014-07-23 20:00:28 +02:00
Nick Winter
26ac94367e
Fixed #1372 . Minor fixes.
2014-07-23 08:59:42 -07:00
Ruben Vereecken
2394bd8129
Added the recalculation script for a couple of statistics
2014-07-23 15:22:53 +02:00
Ruben Vereecken
ebfe1fc1c0
Proofed admin endpoint some more, no more dangling connections
2014-07-23 13:06:51 +02:00
Ruben Vereecken
19d59ac8ff
Refactored Users and Level Sessions to have private properties:
2014-07-22 20:07:00 +02:00
Michael Schmatz
22fabe13ea
Increased scoring task timeout to 10 minutes
...
Temporary increase until we can increase it only for Brawlwood
2014-07-22 06:59:47 -07:00
Michael Schmatz
f100c4ebbe
Add filter alerts to employer page
2014-07-21 16:10:02 -07:00
Michael Schmatz
984be9980e
Put minimum candidates available before employer email
2014-07-21 08:32:44 -07:00
Michael Schmatz
ab4424c7ac
Changed employer reminder to send every 14 days
2014-07-21 08:13:09 -07:00
Michael Schmatz
37b8790b58
Added task text and candidate name to task emails
2014-07-21 08:02:53 -07: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
Michael Schmatz
1d5078ad10
Changed https to http in curation email
2014-07-18 19:22:01 -07:00
Michael Schmatz
cd0d81438d
Add recruitment task reminder emails
2014-07-18 16:26:55 -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
Scott Erickson
4658c3000f
Extended getLatestVersion for Handler to also be able to accept project parameters.
2014-07-18 16:12:27 -07:00
Scott Erickson
52447f9e22
Fixed the avatar endpoint handling when the user object DNE.
2014-07-18 16:12:27 -07:00
Michael Schmatz
321bce121c
Edited task schema
2014-07-18 14:50:31 -07:00
Michael Schmatz
8c3613dfc7
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
server/routes/mail.coffee
2014-07-18 11:07:11 -07:00
Michael Schmatz
a6ab977034
Add candidate finish reminder email
2014-07-18 11:05:37 -07:00
Nick Winter
8813a7f545
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-07-17 15:50:38 -07:00
Nick Winter
6b028513fd
Fixed issues with level previews and localStorage model loading. Disabled break animations on code error for now. Stopped multiple ThangType load on multiple missiles. Stopped trying to connect to Redis on local production setup.
2014-07-17 15:50:29 -07:00
Michael Schmatz
a9d664b8ec
Restored legacy candidates view
2014-07-17 13:16:17 -07:00
Michael Schmatz
0561235da2
Have no emails send to employers who haven't logged in
2014-07-17 09:50:18 -07:00
Michael Schmatz
e4d4c973da
Minor fixes to email system
2014-07-17 09:28:34 -07:00
Michael Schmatz
ccb2ad67ac
Merge pull request #1342 from codecombat/feature/mail-system
...
Feature/mail system
2014-07-17 07:18:39 -07:00
Michael Schmatz
58a80f2512
Removed old comment
2014-07-17 07:17:25 -07:00
Michael Schmatz
337de506dd
Removed mail task from server mapping
2014-07-17 07:15:14 -07:00
Michael Schmatz
2a865a0ca0
Remove testing conditions
2014-07-16 19:49:48 -07:00
Michael Schmatz
c717e609ea
Initialize value of this.redisNotAvailable
2014-07-16 19:46:30 -07:00
Michael Schmatz
d821e459d1
Encode/decode emails as URIs
...
This helps to handle special characters like plusses.
2014-07-16 19:46:06 -07:00
Michael Schmatz
fc4568a100
Fixed misc bugs
2014-07-16 17:02:40 -07:00
Michael Schmatz
ae23679a26
Hard code mail tasks and add unsubscribe
2014-07-16 16:37:06 -07:00
Michael Schmatz
24bcfd9f26
Reviewed code, almost ready for release
2014-07-16 15:50:31 -07:00
Michael Schmatz
59a35c844f
Made mail system resilient to redis failures
2014-07-16 14:29:30 -07:00
Michael Schmatz
5c0c25ebd1
Async must not break upon sendwithus failure
2014-07-16 13:56:23 -07:00
Michael Schmatz
3c257a488d
Employer candidates available email completed
2014-07-16 13:54:05 -07:00
Michael Schmatz
67f2eeb584
Progress on employer new candidates available email
2014-07-16 13:14:09 -07:00
Michael Schmatz
e218c2297d
Some emails working
2014-07-16 12:13:21 -07:00
Michael Schmatz
3a405e22f3
Changed name of mail sent collection
2014-07-16 12:12:54 -07:00
Michael Schmatz
449f1e1afc
Updated locking/release procedure
2014-07-16 12:12:44 -07:00
Michael Schmatz
bb3c583300
Add approved date to job profile
2014-07-16 10:51:45 -07:00
Ruben Vereecken
6219697295
Worked in scott's comments and got tests working again
2014-07-16 12:48:51 +02:00
Ruben Vereecken
0288786098
Merge branch 'master' into achievements
2014-07-15 16:16:46 +02:00
Scott Erickson
8fb26ce8fb
Fixed a server error caused by the recent removal of trailing slashes on urls I think.
2014-07-14 10:11:49 -07:00
Scott Erickson
9893f39ad1
Handling merge conflict.
2014-07-14 10:04:07 -07:00
Ruben Vereecken
a60451368e
Merged in master
2014-07-14 18:58:25 +02:00
Nick Winter
1a016394fe
Starting to show opponent code languages.
2014-07-13 20:19:51 -07:00
Ruben Vereecken
8e82702348
Fixed an async case that failed a test only sometimes
2014-07-13 21:32:25 +02:00
Ruben Vereecken
9c0353a2f0
Merged in master
2014-07-13 21:18:32 +02:00
Ruben Vereecken
1a587b607f
GET /auth/name/<name> now serves possible free names
2014-07-13 17:47:07 +02:00
Tery Lim
bc3b0645ea
Remove extra require and minor cleanup
2014-07-13 23:18:55 +08:00
Scott Erickson
a3c524424c
Merge branch 'nameable_users' of https://github.com/rubenvereecken/codecombat into rubenvereecken-nameable_users
2014-07-10 11:13:28 -07:00
Michael Schmatz
2eeb7ec5aa
Make random games come from all levels
2014-07-10 10:42:59 -07:00
Ruben Vereecken
9e296b7c3d
Added a test case for unsetting slugs (and fixed related bug)
2014-07-10 18:24:02 +02:00
Ruben Vereecken
94210fc461
Anonymous users are now silently renamed upon signup in case of conflict
2014-07-10 18:00:32 +02:00
Ruben Vereecken
6e593b2ec0
User name slugs can now be unset by emptying their name
2014-07-10 10:46:41 +02:00
Ruben Vereecken
a310afc750
Corrected sending errors in auth
2014-07-10 10:07:36 +02:00
Michael Schmatz
013ace65f6
Basic email structure plus distributed locking system
2014-07-09 16:24:14 -07:00
Ruben Vereecken
a8353cb7ff
Anonymous users can have the same name
2014-07-09 21:34:35 +02:00
Scott Erickson
d74a778f67
Made creating components open to everyone!
2014-07-09 12:21:32 -07:00
Ruben Vereecken
ac95d775e6
Users can now be gotten by slug
2014-07-09 20:23:05 +02:00
Scott Erickson
a7690f0931
Fixed #1198
2014-07-09 10:10:43 -07:00
Michael Schmatz
02ccade43f
Removed extraneous code
2014-07-08 16:28:45 -07:00
Michael Schmatz
3ff66d7807
Removed empty file and unused function
2014-07-08 16:26:51 -07:00
Scott Erickson
02890d5a6d
Enabled edits to components by non-admins (creation is still off limits).
2014-07-07 14:22:59 -07:00
Michael Schmatz
b76239b4e9
Replaced candidate avatars on employer page
2014-07-07 10:29:35 -07:00
Ruben Vereecken
ea3d1fee74
Starting on achievement overview style
2014-07-07 15:03:28 +02:00
Ruben Vereecken
51bc8e5a7c
Merged master
2014-07-06 20:07:47 +02:00
Ruben Vereecken
246c39b558
User stats now go through Mongoose middleware
2014-07-05 17:02:48 +02:00
Ruben Vereecken
601c4e2731
Merged with master
2014-07-05 16:47:16 +02:00
Tery Lim
a5476f90ed
Minor cleanup for convention and readability
2014-07-05 18:48:08 +08:00
Ruben Vereecken
e904a0a8f7
Achievement recalculation is now covered with tests
2014-07-04 19:27:41 +02:00
Ruben Vereecken
a367082cc4
Corrected statistic logic, wrote test case
2014-07-04 19:27:41 +02:00
Ruben Vereecken
bb1c07570d
added isTranslationPatch method to patches
2014-07-04 19:27:41 +02:00
Ruben Vereecken
fce9f0031b
All edits are now tracked
...
intermediate
intermediate
2014-07-04 19:27:38 +02:00
Ruben Vereecken
b951205681
intermediate
2014-07-04 19:27:38 +02:00
Ruben Vereecken
838012a2cf
Wrote and tested articleEdits recalculation
2014-07-04 19:27:38 +02:00
Ruben Vereecken
6ae505e8a1
stats.articleEdits are now tracked and tested
2014-07-04 19:27:37 +02:00
Ruben Vereecken
7a07e1feb0
Whoop whoop test for recalculation of gamesCompleted
2014-07-04 19:27:37 +02:00
Ruben Vereecken
7a4c6daec8
stats.gamesCompleted is now tracked in users
2014-07-04 19:27:37 +02:00
Ruben Vereecken
39fb2cb1b4
Added achievement preview, exp test, stuff
2014-07-04 19:27:37 +02:00
Ruben Vereecken
1fe2c67ffe
Added tests for repeatable achievements, including complicated xp
...
Intermediate
2014-07-04 19:27:37 +02:00
Ruben Vereecken
faf02d8e4b
Finally managed a setup that makes the tests succeed
2014-07-04 19:27:37 +02:00
Ruben Vereecken
488d49e286
intermediate
2014-07-04 19:27:37 +02:00
Tery Lim
9090ce7714
Merge master into branch
2014-07-04 22:37:16 +08:00
Michael Schmatz
538344094b
Fixed filter behavior
2014-07-03 13:59:10 -07:00
Michael Schmatz
fe328a766b
Basic filtering functionality
...
Still has a few bugs
2014-07-02 15:48:26 -07:00
Michael Schmatz
c6cc28b976
Various fixes to enable employers page to function correctly
2014-07-02 11:45:00 -07:00
Tery Lim
618ade4946
Clean up mixed quotes
2014-07-01 12:23:22 +08:00
Nick Winter
58bf85d234
Simulator handles when there are no Greed matches to randomly simulate.
2014-06-27 08:50:04 -07:00
Nick Winter
802d43651e
Exposing Vector z property. Getting ready to use new builtin property documentation.
2014-06-27 00:36:18 -07:00
Michael Schmatz
e3a87156a2
Send BCC email to employer when contacting candidates
2014-06-24 14:35:30 -07: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
Scott Erickson
573b566580
Fixed the cloudflare config to be in the environmental variables.
2014-06-24 12:29:47 -04:00
Scott Erickson
9a571a6fe7
Fixed the file not 'changing' when overwritten. It was a caching issue.
2014-06-24 11:55:04 -04:00
Nick Winter
b0eb839cf4
Merge pull request #1193 from kumabotz/remove-coffee-extension
...
Remove coffee extension
2014-06-20 20:50:11 -07:00
Nick Winter
c9dcc290cb
Fixed some bugs where Aether wasn't getting the proper submittedCodeLanguage or functionParameters sometimes.
2014-06-20 17:19:18 -07:00
Nick Winter
c090103126
Fixed employer email address deliverability issue.
2014-06-19 13:42:51 -07:00
Tery Lim
6dd7edadd2
Remove coffee extension
2014-06-19 23:38:07 +08:00
Ruben Vereecken
a1667a0d5e
efficient fetching of level sessions
2014-06-19 17:24:07 +02:00
Nick Winter
aa4832791e
Made public version of a user's LevelSessions available via endpoint.
2014-06-19 08:07:47 -07:00
Nick Winter
ac6c7292c8
Fixed Gridmancer session linking on profile view.
2014-06-18 12:05:40 -07: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
Tery Lim
b6c8a170d1
Fix typo for receive
2014-06-17 10:50:56 +08:00
Nick Winter
66e2805a9a
Added StackLead integration. Employerified profile backgrounds.
2014-06-14 20:59:28 -07:00
Nick Winter
28264d5ace
Added tournament results and a way to email them out.
2014-06-12 17:52:08 -07:00
Scott Erickson
8ab69cf833
Merge pull request #1138 from rubenvereecken/search-endpoint
...
Search endpoint is now without the /search prefix
2014-06-12 11:33:28 -07:00
Ruben Vereecken
dcdcca751f
Fiddled with creating xp functions
2014-06-12 19:44:56 +02:00
Ruben Vereecken
fddca03417
Worked on achievement tests
2014-06-12 19:44:55 +02:00
Ruben Vereecken
925594ffe9
Took a detour to write tests for BadMethod. Queue's tests not working yet.
2014-06-12 19:42:36 +02:00
Ruben Vereecken
b66f4984c3
Finished basic functional tests for achievement
2014-06-12 19:42:30 +02: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
509be067c3
Added support for the operator in LocalMongo
2014-06-12 19:41:00 +02:00
Ruben Vereecken
bd2b289943
Recalculate script mainly finished
2014-06-12 19:40:59 +02:00
Ruben Vereecken
bea751eed9
Laid down the basics for an admin server endpoint
2014-06-12 19:40:59 +02:00
Ruben Vereecken
a61d0e5569
Added support for diminished exp for repeatables. Needs tweaking though.
2014-06-12 19:40:59 +02:00
Ruben Vereecken
2c04025a5a
Created a test environment for repeatables
2014-06-12 19:40:59 +02:00
Ruben Vereecken
fef72d8273
Finished Article tests to demonstrate search functionality
2014-06-12 19:19:34 +02:00
Ruben Vereecken
0751581113
Search endpoint is now without the /search prefix
...
Intermediate commit for search refactoring
2014-06-12 19:19:30 +02:00
Nick Winter
77920b5416
Improvements to profile views. Added links to players' code.
2014-06-11 19:38:47 -07:00
Ruben Vereecken
8e33b6b534
Fixed all server-sided tests
...
NEVER. AGAIN
2014-06-11 20:17:27 +02:00
Nick Winter
f3d18efa90
Added employer_list and activity tracking.
2014-06-10 16:30:13 -07:00
Scott Erickson
9c1213d3c4
Removed the migration plugins.
2014-06-10 15:04:48 -07:00
Scott Erickson
f0ff8c242e
Migrating language to codeLanguage on systems and components because they conflict with the search system.
2014-06-10 13:20:14 -07:00
Nick Winter
22ca9507d0
Upgrades to employer's candidate indexing.
2014-06-09 22:17:53 -07:00
Tery Lim
4036532680
Fix indentation
2014-06-09 00:35:35 +08:00
Nick Winter
63a3aa9074
Fixes for browsing profiles by username.
2014-06-07 17:33:14 -06:00
Michael Schmatz
281b6968d6
Make level session selection random
...
Rather than weighted random on submission time
2014-06-05 17:14:26 -07:00
Ruben Vereecken
ed44ab5f7d
Improved logging (winston) and admin-only'd the achievement editor
2014-06-02 21:07:23 +02:00
Ruben Vereecken
8d2c62ba84
Got repeatables working flawlessly and improved the achievement popup by a great deal
2014-06-02 20:34:05 +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
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
aa3fedeb02
Achievements can have icons. Users now have their scores denormalized
2014-06-02 20:32:00 +02:00
Ruben Vereecken
287019242f
Achievement queries are now strings server sided but remain objects for the client
2014-06-02 20:32:00 +02:00
Ruben Vereecken
c26f96f33e
Added achievement model and some missing pieces
2014-06-02 20:32:00 +02:00
Ruben Vereecken
a3ca382dcd
Used the feedback from Scott to improve endpoints
2014-06-02 20:29:12 +02:00
Ruben Vereecken
2003b37343
Refactored the get user achievements
2014-06-02 20:29:12 +02:00
Ruben Vereecken
0f1c59f2d5
Refactored getAll into regular GET. I.e. /db/achievement
2014-06-02 20:29:12 +02:00
Ruben Vereecken
5e817bb1c7
Added support for repeatable achievements and stringified IDs
2014-06-02 20:29:12 +02:00
Ruben Vereecken
fb9ada6f97
Managed to track the difference between init and save, achievements work now
2014-06-02 20:29:12 +02:00
Ruben Vereecken
51e326efaa
Created a GET endpoint for earned achievements by user
2014-06-02 20:29:12 +02:00
Ruben Vereecken
ab13340ec7
Admins can now post achievements
2014-06-02 20:29:12 +02:00
Ruben Vereecken
967e698cb2
Added a getAll handler for achievements
2014-06-02 20:29:12 +02:00
Ruben Vereecken
37b47d35de
Got work done on detecting achievements
2014-06-02 20:29:12 +02:00
Ruben Vereecken
f2f4fef1e0
Wrote tests for the local mongo querier
2014-06-02 20:29:11 +02:00
Ruben Vereecken
99927d1345
Started on the local mongo querier
2014-06-02 20:29:11 +02:00
Scott Erickson
3602f67c24
Tweaked how editPath is passed to the server so it doesn't foul up validation.
2014-05-30 14:41:41 -07:00
Nick Winter
104a405453
Trying some error handling for a missing TaskLog error I saw.
2014-05-23 09:24:57 -07:00
Michael Schmatz
8fabbadff3
Fix random game results not being sent back
2014-05-22 09:02:57 -07:00
Nick Winter
48f5347075
Fixed gigantor server scoring bug. Cleaned up a bit of logging and error handling. Finished not resetting scores on resubmitting.
2014-05-21 21:56:11 -07:00
Michael Schmatz
482965fe0f
No reset of scores when session resubmit
2014-05-21 16:58:51 -07:00
Michael Schmatz
d59c163493
Fix selection
2014-05-21 16:51:10 -07:00
Michael Schmatz
7bc4a0451c
Weighted random selection of games
2014-05-21 15:34:19 -07:00
Michael Schmatz
47c41e0a6e
Added error handling for findNearestBetterSessionID
2014-05-20 15:55:25 -07:00
Michael Schmatz
a6352c214a
Add temp error handling for updateSessions
2014-05-20 15:35:44 -07:00
Michael Schmatz
de93dfd357
Stopgap measure for incorrectly formatted session results
2014-05-20 15:12:25 -07:00
Michael Schmatz
6fde166190
Revert "Stop sending out untranspiled code"
...
This reverts commit f794ec4a46
.
2014-05-20 14:59:06 -07:00
Michael Schmatz
f794ec4a46
Stop sending out untranspiled code
2014-05-20 14:33:01 -07:00
Michael Schmatz
e732e7227c
Made both game selections random
2014-05-20 12:45:25 -07:00
Michael Schmatz
aba0120e88
Merge branch 'master' of https://github.com/codecombat/codecombat
...
Conflicts:
server/queues/scoring.coffee
2014-05-19 19:04:47 -07:00
Michael Schmatz
97cbf55695
Simulator fetch random Greed games when queue empty
2014-05-19 18:58:45 -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
Michael Schmatz
6f2fd8e293
Verification simulator changes
2014-05-19 10:11:23 -07:00
Michael Schmatz
a46714b1b6
Patching bug if newScoreObject is incomplete
2014-05-17 12:02:34 -07:00
Michael Schmatz
e631bae248
Level session playtime logging
2014-05-16 15:27:46 -07:00
Michael Schmatz
5b93414862
Add playtime, opponent name, totalScore to match
2014-05-16 14:52:49 -07:00
Michael Schmatz
0bb1422d6c
Switch spectate and level view to use transpiled code
2014-05-15 15:18:17 -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
Michael Schmatz
4e268d8dc6
Add codeLanguage to level session
2014-05-14 16:41:02 -07:00
Michael Schmatz
1e0f220352
Send out transpiled code with simulator task
2014-05-14 16:01:08 -07:00
Scott Erickson
7a381df348
Merge branch 'feature/thangload'
2014-05-14 11:48:19 -07:00
Michael Schmatz
a1360d6cb8
Include transpiled code in submission process
2014-05-14 11:42:15 -07:00
Nick Winter
1aa72541ff
Merged master into feature/thangload.
2014-05-12 09:57:31 -07:00
Scott Erickson
b0292a34d2
Server console outputs recovery password if in development.
2014-05-09 16:33:06 -07:00
Nick Winter
589410ed8e
Merged master into feature/thangload.
2014-05-09 12:56:58 -07:00
Scott Erickson
e87592059b
Fixed saving user properties. Mentioned in #958 (was the source of the conflict error) but I don't think is related.
2014-05-07 12:25:05 -07:00
Scott Erickson
cde50a241f
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-05-05 17:47:32 -07:00
Michael Schmatz
1793d9a882
Fixed testing logic
2014-05-05 17:33:47 -07:00
Scott Erickson
056f081cdb
Merge branch 'anonNameCollide' of https://github.com/adi2412/codecombat into adi2412-anonNameCollide
...
Conflicts:
app/views/modal/signup_modal.coffee
2014-05-05 16:48:35 -07:00
Michael Schmatz
bdf6d9e759
Fixed recipient address
2014-05-05 15:41:04 -07:00
Michael Schmatz
bf8feb216a
Fixed ladder mail handler
...
oh mongoose
2014-05-05 15:11:00 -07:00
Scott Erickson
aee90c72bb
Most of the way there with the raster images. Just need to figure out loading with PreloadJS and the SuperModel.
2014-05-02 17:03:30 -07:00
Scott Erickson
b9f4093b08
Set up the LevelLoader to load names instead of whole ThangTypes.
2014-04-28 14:58:58 -07:00
Scott Erickson
32ba4a8f75
Added a handler for fetching names of versioned docs by originals.
2014-04-28 14:31:11 -07:00
Scott Erickson
ed556f50be
Added reserved word checking for names.
2014-04-28 14:09:29 -07:00
Scott Erickson
17a0bf54c6
Merge branch 'master' into feature/loading-views
2014-04-28 10:10:57 -07:00
Nick Winter
e89e1154bf
Merge pull request #917 from dpen2000/patch-2
...
Fix #916
2014-04-27 20:26:32 -07:00
Scott Erickson
fed5d681f2
Merge branch 'master' into feature/loading-views
2014-04-26 12:54:37 -07:00
Scott Erickson
3dc3f62473
Merge branch 'master' into feature/loading-views
...
Conflicts:
app/views/editor/components/main.coffee
2014-04-25 14:31:58 -07:00
Nick Winter
ef30498985
Improved bad sendwithus error logging.
2014-04-25 11:12:52 -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
a37c45e8b0
Fix #916
2014-04-25 00:56:34 +01:00
Michael Schmatz
6644c6a9ee
Push for george
2014-04-24 15:27:37 -07:00
Nick Winter
bc244fc53a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-24 11:09:18 -07:00
Nick Winter
73f39095e6
Upgraded table sorter.
2014-04-24 11:09:01 -07:00
Scott Erickson
42fb19fe3a
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-24 10:46:10 -07:00
Scott Erickson
767af42c3f
Fixed #905 .
2014-04-24 10:45:52 -07:00
Michael Schmatz
b0865ce3d1
Hotfix for CLA submissions permissions
2014-04-24 08:45:42 -07:00
Nick Winter
d4cf31c8fe
Improved admin view of pending candidates.
2014-04-23 10:21:58 -07:00
Scott Erickson
b390b38054
Fixed a couple bugs and tests.
2014-04-23 09:19:07 -07:00
Scott Erickson
f7035d4220
Added an unsubscribe url for recruit notifications.
2014-04-22 19:27:39 -07: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
Scott Erickson
1e50ef36ce
Merge branch 'RefactorAndDeltaSystemNaming' of https://github.com/dpen2000/codecombat into dpen2000-RefactorAndDeltaSystemNaming
2014-04-21 12:53:11 -07:00
Scott Erickson
c754f7b943
Merge branch 'master' into feature/loading-views
2014-04-21 11:53:18 -07:00
Nick Winter
05dfa21a93
Fixed #872 . Removed permissions check on old versions of document for version history, because we're not selecting any sensitive fields anyway.
2014-04-19 17:52:17 -07:00
Ting-Kuan
692693c181
Merge branch 'master' into feature/loading-views
...
Conflicts:
app/locale/en.coffee
app/views/editor/level/edit.coffee
app/views/kinds/CocoView.coffee
app/views/play/ladder/ladder_tab.coffee
app/views/play/ladder_view.coffee
app/views/play/level/level_loading_view.coffee
2014-04-19 01:15:04 -04:00
Nick Winter
bff71800b7
Added script to send out initial recruitment intro email.
2014-04-18 17:17:41 -07:00
dpen2000
b20f8fd260
Refactor getNameById to use mongo db's $in instead of parallel and use a new generic method in Handler.coffee
2014-04-18 21:06:57 +01: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
8adca4a1da
Added a transactional email for when changes are made, to notify watchers.
2014-04-17 17:30:55 -07:00
Scott Erickson
ed0c7e1412
Creators of documents are automatically added as watchers. Added a patch creation email for watchers.
2014-04-17 17:09:01 -07:00
Scott Erickson
21e8d7b26f
Fixed patches denormalization.
2014-04-17 15:44:19 -07:00
Ting-Kuan
b7439ed1ca
Fix loading bar and retry block in ladder_view, #857 .
2014-04-17 16:54:26 -04: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
Ting-Kuan
070e354eee
Handler for test.
2014-04-17 12:56:21 -04:00
Scott Erickson
02a7381fa9
Fixed the watch buttons for levels and components.
2014-04-16 11:02:40 -07: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
e49344bd87
A few job profile fixes and cleanup.
2014-04-15 10:45:54 -07:00
Scott Erickson
b59e974a2e
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-15 09:02:03 -07:00
Scott Erickson
06a61d214e
Fixed server tests.
2014-04-15 09:01:51 -07:00
Michael Schmatz
5223661b66
Made spectate mode use top 20 players only
2014-04-14 14:28:29 -07:00
Michael Schmatz
6c4349df70
Improved simulation leaderboard performance
2014-04-14 11:39:31 -07:00
Michael Schmatz
415e34e701
Fixed isRanking and reduced logging
2014-04-14 11:01:55 -07:00
Michael Schmatz
b40e4dca37
Simulation leaderboard aggregation framework and local fixes
2014-04-14 08:46:46 -07:00
Nick Winter
ba38509a1d
Merge branch 'master' of https://github.com/codecombat/codecombat
2014-04-13 15:29:22 -07:00
Nick Winter
af0b8aa5e2
A few fixes and cleanup for #831 .
2014-04-13 15:28:16 -07:00
Michael Schmatz
e32524536e
Quick fix for crashing server
...
Undo when investigating which schema does this
2014-04-13 14:06:29 -07:00
Aditya Raisinghani
abb402c68a
Changes to fix infinite posting.
2014-04-13 21:41:53 +05:30
Aditya Raisinghani
ffd057899e
Removed anon name collisions and reset anon user name if name is taken in interim.
2014-04-13 17:55:49 +05:30
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
072729acc3
Non-admins can save (but not overwrite) file uploads.
2014-04-12 13:03:46 -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
3078036da1
Deleted updated schemas.
2014-04-12 15:33:57 +05:30
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
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
34bf484bf2
Added data merge conflict handling.
2014-04-11 21:11:52 -07:00
Nick Winter
fc9d30ccae
Smarter fix for #810 , since not all 24-character strings are like MongoDB ids.
2014-04-11 20:38:34 -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
Michael Schmatz
7ddd84248b
Simulator fixes!
...
Fixed memory bug with aggregation framework
2014-04-11 17:11:57 -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
Scott Erickson
2c67df355c
Merge branch 'backbone_mediator' of https://github.com/rubenvereecken/codecombat into feature/jsondiffpatch
...
Conflicts:
app/initialize.coffee
bower.json
2014-04-11 10:33:22 -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
Michael Schmatz
b182afd413
Fixed cron ladder auth
2014-04-10 17:50:39 -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
Michael Schmatz
a796d88967
Fixed tutorial modal for nonexistent tutorials
2014-04-10 11:42:22 -07:00
Nick Winter
26cebf7e7e
Fixing some recruitment profile bugs.
2014-04-09 18:10:30 -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
Nick Winter
f17775cc10
Implemented George's jobs page design.
2014-04-09 13:14:52 -07:00