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

842 commits

Author SHA1 Message Date
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
d9fb5e9f6c Merge branch 'master' into production 2014-11-17 09:29:13 -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
Nick Winter
6b92df2e41 Merge branch 'master' into production 2014-11-12 18: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
0f4290078c Merge branch 'master' into production 2014-11-12 11:02:10 -08:00
Nick Winter
26beb8a034 A few improvements to ItemDetailsView formatting to deal with spells granted. 2014-11-12 11:02:05 -08:00
Nick Winter
3a8a5354aa Merge branch 'master' into production 2014-11-11 18:16:52 -08:00
Scott Erickson
7012d5dfbe Built payment endpoint for processing Apple IAPs. 2014-11-11 17:40:29 -08:00
Nick Winter
b50704597a Merge branch 'master' into production 2014-11-11 16:37:22 -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
40081fc853 Merge branch 'master' into production 2014-11-10 22:08:12 -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
Nick Winter
ce4567c868 Merge branch 'master' into production 2014-11-10 18:19:02 -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
c9a7a2ea0a Merge branch 'master' into production 2014-11-10 15:18:06 -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
9c009a626f Merge branch 'master' into production 2014-11-06 07:26:22 -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
Nick Winter
cfd3e23c14 Merge branch 'master' into production 2014-11-04 08:44:25 -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
a4c12a32a4 Merge branch 'master' into production 2014-10-30 20:05:42 -07: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
7e389d4084 Merge branch 'master' into production 2014-10-29 22:29:57 -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
ee07d53671 Merge branch 'master' into production 2014-10-28 22:18:35 -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
Nick Winter
ab46a47a78 Merge branch 'master' into production 2014-10-27 16:37:28 -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
Nick Winter
f426ec270f Merge branch 'master' into production 2014-10-25 11:51:54 -07:00
Matt Lott
f4426f2e43 Save user code errors without 'Line N: ' prefix 2014-10-24 14:05:54 -07:00
Nick Winter
0a615fc24e Merge branch 'master' into production 2014-10-21 13:58:18 -07:00
Scott Erickson
cd8f5800a6 Merge branch 'master' of https://github.com/codecombat/codecombat 2014-10-21 10:21:46 -07:00
Nick Winter
fcb8a08d13 Merge branch 'master' into production 2014-10-20 17:04:05 -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
5f78f57c85 Merge branch 'master' into production 2014-10-20 08:31:50 -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
4278863c34 Merge branch 'master' into production 2014-10-18 14:56:27 -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
33dda4cdf9 Merge branch 'master' into production 2014-10-14 22:38:32 -07: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
b2e6bcf872 Merge branch 'master' into production 2014-10-02 17:04:47 -07: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
a1cd43681f Merge branch 'master' into production 2014-10-01 17:02:22 -07:00
Nick Winter
3871b60ea7 Actually committing last of earned_achievement_handler fixes. 2014-10-01 08:50:07 -07:00
Nick Winter
06ceb9b589 Merge branch 'master' into production 2014-09-30 19:32:40 -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
Michael Schmatz
858b24a73d Removed superfluous comment 2014-09-27 09:06:53 -04: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