Matt Lott
fcf5346aa3
Add completion rates to levels in campaign editor
2014-12-31 11:49:29 -08:00
Nick Winter
8f1e67bff5
Merge branch 'master' into production
2014-12-29 09:25:20 -08:00
Nick Winter
c54fd5ab4b
Moved editors from PUT to POST so that version saving behavior is preserved and admins can PUT without saving new versions.
2014-12-29 09:14:43 -08:00
Nick Winter
43b59c1b44
Merge branch 'master' into production
2014-12-28 17:25:06 -08:00
Nick Winter
1390cbacdc
Temporarily reverting 0bdec68 change to PUT for versioned documents.
2014-12-28 17:24:37 -08:00
Nick Winter
8f6114b709
Merge branch 'master' into production
2014-12-28 13:31:36 -08:00
Nick Winter
744d30737e
Merged in campaign editor and campaign view. Destroyed WorldMapView, CampaignOptions, and LevelOptions. Lots of stuff is now stored in the database instead of code. Cleaned up a few unneeded old features. Fixed some problems with checking permissions on first rather than latest versions of documents.
2014-12-28 13:25:20 -08:00
Nick Winter
b4341ad46c
Merge branch 'feature/campaign-editor'
2014-12-27 11:03:51 -08:00
Michael Schmatz
a3d1e0aaef
Merge branch 'master' into production
2014-12-24 16:46:29 -05:00
Michael Schmatz
3d1ee9767f
Fix sorting crashing bug
2014-12-24 16:45:34 -05:00
Nick Winter
a7b39c981b
Merge branch 'master' into production
2014-12-24 11:03:01 -08:00
Nick Winter
d6b5c14123
Give me thine email addresses correctly, dear contact handler.
2014-12-24 11:02:52 -08:00
Michael Schmatz
2e9e9ee85c
Put limit on things to be sorted
...
We might have to alter the queries a bit if we aren't happy with the results
2014-12-23 20:19:20 -05:00
Nick Winter
4f80d2a977
Merge branch 'master' into production
2014-12-23 08:20:45 -08:00
Nick Winter
759e193f29
Pulling email from user in contact form if they gave an invalid email reply-to.
2014-12-23 08:20:35 -08:00
Scott Erickson
0bdec68cfc
Set up a save button.
2014-12-22 16:21:57 -05:00
Scott Erickson
0dd2d9efbd
Handled merge conflict.
2014-12-22 12:33:52 -05:00
Nick Winter
69118206ab
Merge branch 'master' into production
2014-12-20 20:02:03 -08:00
Nick Winter
e8d185a860
Embedding level completion checklist inside the level editor.
2014-12-20 20:01:07 -08:00
Nick Winter
20ae570959
Merge branch 'master' into production
2014-12-20 13:43:36 -08:00
Nick Winter
08cb87c84d
Automatically take screenshots when submitting contact form from level view.
2014-12-19 18:37:42 -08:00
Nick Winter
52b2917db5
Merge branch 'master' into production
2014-12-19 17:28:18 -08:00
Nick Winter
6ac0bea5ca
Beefing up contact form data population.
2014-12-19 17:27:58 -08:00
Scott Erickson
59318b2f78
Merge branch 'master' into feature/campaign-editor
2014-12-19 12:54:11 -05:00
Nick Winter
98ab756835
Merge branch 'master' into production
2014-12-18 22:22:54 -08:00
Nick Winter
0635d1dccf
Fixed typo in contract emails.
2014-12-18 22:22:44 -08:00
Nick Winter
5492e0b62a
Merge branch 'master' into production
2014-12-18 20:39:29 -08:00
Nick Winter
59b433d863
Upgrading contact form context a bit.
2014-12-18 20:39:15 -08:00
Nick Winter
d801ed61ce
Separating contact emails into premium subscriber support and basic general support.
2014-12-18 20:35:14 -08:00
Matt Lott
e573f0344c
Merge branch 'master' into production
2014-12-18 00:21:28 -08:00
Scott Erickson
b63b4d64da
More work on the CampaignEditorView. Data gets saved to models now.
2014-12-17 22:53:04 -08:00
Nick Winter
fe0c89e433
Reverting 1167655f and 30ed0a0e to re-enable the analytics log handler.
2014-12-17 21:54:56 -08:00
Nick Winter
2ea47cf83b
Fixed #1952 (unsubscribing from specific ladder update emails).
2014-12-17 19:38:36 -08:00
Michael Schmatz
f5d9550d60
Merge branch 'master' into production
2014-12-17 21:59:43 -05:00
Michael Schmatz
a9265bce42
Disabled achievements plugin
2014-12-17 21:58:32 -05:00
Matt Lott
8ec583109a
Merge branch 'master' into production
2014-12-17 14:29:17 -08:00
Matt Lott
6ab74f9dab
Disable analytics.users.active
2014-12-17 14:17:50 -08:00
Matt Lott
71e66c4d61
No hipchat for analytics.log.event post errors
2014-12-17 10:57:19 -08:00
Matt Lott
18f44e1600
Merge branch 'master' into production
2014-12-17 10:09:26 -08:00
Matt Lott
30ed0a0ead
Disable analytics.log.event server handler
2014-12-17 09:53:43 -08:00
Matt Lott
3c96569e87
Merge branch 'master' into production
2014-12-16 21:47:25 -08:00
Matt Lott
9baef64dd0
Fix double 403 in Handler.get
2014-12-16 21:45:30 -08:00
Scott Erickson
1cc6a97e43
Added basic campaign view, working on campaign handlers.
2014-12-16 17:46:24 -08:00
Nick Winter
b785640a8a
Merge branch 'master' into production
2014-12-15 18:02:40 -08:00
Matt Lott
c76662c967
Log analytics events internally
2014-12-15 11:45:12 -08:00
Nick Winter
60076d09c1
Merge branch 'master' into production
2014-12-15 10:05:41 -08:00
Nick Winter
9ec4b741c4
Fixed CLA permissions check.
2014-12-15 10:02:05 -08:00
Nick Winter
f1bc25ba3f
Merge branch 'master' into production
2014-12-14 16:01:13 -08:00
Nick Winter
fc4354eb3e
Forgotten the locale code for my spammer target.
2014-12-14 16:01:03 -08:00
Nick Winter
7fb0784921
Merge branch 'master' into production
2014-12-14 13:37:58 -08:00
Nick Winter
753acb1299
Added 'github' permission type to allow access to CLAs view.
2014-12-14 13:37:43 -08:00
Nick Winter
ef37d74b4d
en-UK and en-AU also require patch approval for translations, can never just save.
2014-12-14 13:27:39 -08:00
Nick Winter
6f515d6694
Merge branch 'master' into production
2014-12-13 09:00:44 -08:00
Nick Winter
3b2bebf427
Ended HoC sale.
2014-12-13 09:00:33 -08:00
Scott Erickson
b0de331a10
Shored up stripe transaction payment defences to try and fix #1906 .
2014-12-12 15:27:58 -08:00
Nick Winter
8172c3273a
Merge branch 'master' into production
2014-12-11 20:17:59 -08:00
Nick Winter
194d3ee647
Worked around unstable Zoho mail dependencies by switching password recovery and contact emails to Sendwithus.
2014-12-11 20:15:24 -08:00
Nick Winter
e4e5267c0f
Merge branch 'master' into production
2014-12-11 19:07:45 -08:00
Matt Lott
0c81942c71
2nd HoC sub sale
2014-12-11 18:39:03 -08:00
Scott Erickson
0b81796333
Created the Campaign foundation: schema, model, handler.
2014-12-11 11:26:28 -08:00
Matt Lott
cc7b1af415
Merge branch 'master' into production
2014-12-10 16:16:04 -08:00
Matt Lott
d4cfaac7e5
Sub price test
2014-12-10 16:05:55 -08:00
Scott Erickson
02953d0e6c
Set up a subscription page with subscription info and the subscribe button, taking that logic out of the payments page.
2014-12-10 13:42:12 -08:00
Matt Lott
8d7c8dc52a
Merge branch 'master' into production
2014-12-09 17:33:26 -08:00
Scott Erickson
876a663690
Fixed server tests.
2014-12-09 13:41:44 -08:00
Nick Winter
07fd54bbb3
Merge branch 'master' into production
2014-12-09 06:07:17 -08:00
Nick Winter
a97baa2207
HoC sale.
2014-12-09 06:06:14 -08:00
Nick Winter
96cedec946
Merge branch 'master' into production
2014-12-08 08:20:43 -08:00
Nick Winter
61f63caa59
Trying to fix a server crash I found with bad stripe globals.
2014-12-08 08:09:31 -08:00
Nick Winter
b78ade5f28
Merge branch 'master' into production
2014-12-08 07:08:06 -08:00
Nick Winter
d5f953ae4f
Getting rid of indexes on employers and candidates.
2014-12-08 07:07:29 -08:00
Nick Winter
7eaef4fd81
Merge branch 'master' into production
2014-12-06 20:31:34 -08:00
Scott Erickson
aac1aa379e
Set up stubs for future subscription sales.
2014-12-06 12:38:06 -08:00
Nick Winter
4522f594d6
Merge branch 'master' into production
2014-12-06 12:05:58 -08:00
Scott Erickson
62cab1e76b
Admins can now give users discounts and free accounts from the MainAdminView view.
2014-12-06 10:05:52 -08:00
Nick Winter
f52c524388
Merge branch 'master' into production
2014-12-05 17:27:40 -08:00
Scott Erickson
836d2905b9
Users who have paid or otherwise have access to all content are now called 'premium', and user objects on client and server have an isPremium getter which checks all relevant properties.
2014-12-05 17:19:52 -08:00
Scott Erickson
f4e3416918
Set up an endpoint for fetching Stripe info.
2014-12-05 17:19:52 -08:00
Scott Erickson
e8bb5b824d
Tweaked the subscription handler to modify the actual target user, not necessarily the user that is making the changes.
2014-12-05 15:49:46 -08:00
Scott Erickson
e03e08692e
Merge branch 'master' into production
2014-12-05 14:13:21 -08:00
Scott Erickson
209836c172
Fixed user patching to not also unsubscribe subscribers.
2014-12-05 14:11:38 -08:00
Nick Winter
76ee449693
Merge branch 'master' into production
2014-12-04 22:22:39 -08:00
Scott Erickson
d0ee8cb7c7
Set up the server to allow admins to assign customers coupons. Fixed up how customers are created/updated by the server to allow setting new payment information rather than forever using the payment info first provided.
2014-12-04 17:41:27 -08:00
Matt Lott
338f1d87ea
Merge branch 'master' into production
2014-12-04 15:24:21 -08:00
Scott Erickson
0edf4e0ca1
Fixed a MailChimp test. Fixed payment and subscription handlers to deny anonymous users. Hid the subscribe button from anonymous users.
2014-12-04 13:07:07 -08:00
Matt Lott
e3abb9ceb3
Capture active user metrics
...
Watching for these events:
Level completed
User registered
Playtime of 30s in a level
Purchase
Payment
Subscribe
Earned an achievement
2014-12-04 12:57:57 -08:00
Nick Winter
31ffeaf269
Merge branch 'master' into production
2014-12-03 16:37:01 -08:00
Scott Erickson
7210de02e9
Set up stripe to get user emails so receipts can be emailed.
2014-12-03 16:36:03 -08:00
Scott Erickson
0893784a75
Fixed MailChimp subscription updating from the website.
2014-12-03 15:26:39 -08:00
Scott Erickson
eb98cf4952
Hooked up Level handler to deny creating new LevelSessions when the level requires a subscription and the user doesn't have one.
2014-12-03 13:32:28 -08:00
Nick Winter
50ec896fd8
Added a requiresSubscription property to the levels.
2014-12-03 11:46:03 -08:00
Nick Winter
65dde043c7
SubscribeModal is in.
2014-12-03 09:14:14 -08:00
Scott Erickson
aea1e39b58
Tweaked the subscription handler to act more like the payment handler when a card charge fails. It returns 402.
2014-12-02 20:40:33 -08:00
Scott Erickson
cd3bb690f4
Created stripe subscription logic.
2014-12-02 20:02:35 -08:00
Scott Erickson
40ed4e1056
Merge branch 'master' into production
2014-12-02 13:30:33 -08:00
Scott Erickson
5dcdabfd62
Refactored stripeCustomerID to stripe object in the user object so we can put more stuff in there.
2014-12-02 11:47:15 -08:00
Nick Winter
b49d880fd9
Merge branch 'master' into production
2014-12-01 13:53:40 -08:00
Nick Winter
ffcfec0a6a
Trying to shut the server up about some anonymous user who is simulating.
2014-12-01 13:53:17 -08:00
Nick Winter
d7700a7154
Merge branch 'master' into production
2014-11-30 14:38:13 -08:00
Michael Schmatz
3cf80c895e
Removed log infos, iPad language selection
2014-11-30 16:19:01 -05:00
Nick Winter
2eb8441911
Merge branch 'master' into production
2014-11-29 13:10:48 -08:00
Scott Erickson
3e0394d0d8
Fixed the latest version handler to handle invalid original id inputs.
2014-11-29 11:11:40 -08:00
Nick Winter
528dfaa583
Merge branch 'master' into production
2014-11-29 10:52:59 -08:00
Scott Erickson
1bd70591a0
Added new mongodb versions to be allowed.
...
Added error logging for every which reason a user may be unable to pay.
Added more info for users when they hit unknown errors.
2014-11-29 10:46:01 -08:00
Nick Winter
38c092c914
Merge branch 'master' into production
2014-11-29 10:39:11 -08:00
Nick Winter
891b78eb44
Hiding some ThangTypes from view in level editor.
2014-11-29 10:34:04 -08:00
Nick Winter
d2aabbdacc
A couple workarounds for crashing server tests. Including method in HipChat error messages. Trying to work around undefined ThangType fetch during level loading.
2014-11-29 08:43:40 -08:00
Nick Winter
383f215b36
Merge branch 'master' into production
2014-11-28 19:40:00 -08:00
Scott Erickson
31214e854e
Wabam. Refactored a bunch of stuff into 'core' folders so that it's clearer which files are being loaded first thing, and which are not. Also reworked a bunch of the anymatch things in config.coffee, cause there were better ways.
2014-11-28 17:49:41 -08:00
Nick Winter
4b45385571
Working on paper dolls.
2014-11-28 12:11:59 -08:00
Michael Schmatz
980b5f7580
Merge branch 'master' into production
...
Conflicts:
server_setup.coffee
2014-11-28 14:40:07 -05:00
Michael Schmatz
6cb46aafa8
Link to Papertrail logs in error messages
2014-11-28 14:37:55 -05:00
Michael Schmatz
897fe6c63e
Improved error handling
2014-11-28 11:44:03 -05:00
Michael Schmatz
2574549a78
Improved error handling
2014-11-28 11:37:31 -05:00
Michael Schmatz
3475770f13
Merge branch 'master' into production
2014-11-28 11:09:07 -05:00
Michael Schmatz
0ac0065753
Fixed payments
2014-11-28 11:07:37 -05:00
Nick Winter
915a3243f5
Added feature image hair and thumb slots to the ThangType.
2014-11-26 16:29:48 -08:00
Nick Winter
53c6da5ef8
Allowing upload of paper doll images for items.
2014-11-26 14:18:17 -08:00
Nick Winter
318b499e3e
Merge branch 'master' into production
2014-11-26 12:57:10 -08:00
Scott Erickson
c4fdcab6fe
The HeroVictoryModal now has the server check for and upsert any missing items, levels and heroes earned.
2014-11-26 12:02:42 -08:00
Nick Winter
98d8a2cfb3
Merge branch 'master' into production
2014-11-25 16:54:36 -08:00
Scott Erickson
790217f227
Tweaked how the I18N editor works to guard against garbage English submissions and make the chosen language more consistent.
2014-11-25 16:22:06 -08:00
Nick Winter
ab6251281e
Added a payment-received HipChat notification.
2014-11-25 13:20:09 -08:00
Scott Erickson
8f55b9bc1b
Refactored the AccountSettingsView to be both in the site and in the PlayAccountModal.
2014-11-25 12:43:17 -08:00
Nick Winter
621764aa0c
Merge branch 'master' into production
2014-11-25 09:28:54 -08:00
Nick Winter
98f1eec10c
Upgraded choose hero view for locked heroes. Went back to animated heroes instead of feature images. Removed some server logs.
2014-11-25 09:28:50 -08:00
Michael Schmatz
a3a3aea6aa
Merge branch 'master' into production
2014-11-25 11:21:30 -05:00
Michael Schmatz
2b8006ff83
Fixing more crashing bugs
2014-11-25 11:20:39 -05:00
Michael Schmatz
3ab8620745
Merge pull request #1798 from codecombat/master
...
Fixed a few crashing bugs
2014-11-25 10:57:31 -05:00
Michael Schmatz
30e08e2c99
Fixed a few crashing bugs
2014-11-25 10:52:20 -05:00
Michael Schmatz
2300cab908
Merge pull request #1797 from codecombat/master
...
Merge master into production
2014-11-25 10:02:51 -05:00
Michael Schmatz
d56f594d58
Better error handling
2014-11-24 20:07:29 -05:00
Nick Winter
16e264788a
Trying to workaround a crash I saw in the logs for GitHub auth.
2014-11-24 14:38:54 -08:00
Nick Winter
38c3ed8856
Merge branch 'master' into production
2014-11-23 20:13:43 -08:00
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
Nick Winter
472b05a5e0
Merge branch 'master' into production
2014-11-21 13:09:02 -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
527d9355e7
Merge branch 'master' into production
2014-11-21 10:05:01 -08:00
Nick Winter
4de71507a8
Fixed winston require in EarnedAchievement handler.
2014-11-21 10:04:50 -08:00
Nick Winter
66f946a881
Merge branch 'master' into production
2014-11-20 22:17:41 -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
a15f25e155
Merge branch 'master' into production
2014-11-20 22:02:18 -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
Nick Winter
29cbf16dd7
Merge branch 'master' into production
2014-11-20 19:32:37 -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
Nick Winter
bfeb1457a1
Merge branch 'master' into production
2014-11-19 18:36:40 -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
2574f85f3e
Merge branch 'master' into production
2014-11-17 21:30:57 -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
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
