Commit graph

9342 commits

Author SHA1 Message Date
Scott Erickson
58eaec8e6b Refactor MainLadderView to use view in template 2015-10-26 14:23:06 -07:00
Matt Lott
48786372d8 🐛Prevent parallel managed sub unsubscribes
Our unsubscribe API does not support this.  Removing option from
subscription UI.

Fixes #2976
2015-10-26 13:45:38 -07:00
Nick Winter
afa410a370 Added Ace of Coders tournament rankings. 2015-10-26 13:30:49 -07:00
Rob Blanckaert
89b9ffae20 Make gnu coreutils happy with the db import script. 2015-10-26 15:46:07 -04:00
Rob Blanckaert
d26daf1dc0 Only show "press enter" for the selected line in autocomplete. 2015-10-26 15:39:22 -04:00
Imperadeiro98
6ee44bd6cc Fixed i18n in infinite_loop.jade 2015-10-26 12:46:06 +00:00
Rob
96654bd08f Script to (atleast on OS X) pull the newest mongo dump and import it, maintaining users. 2015-10-23 14:29:24 -07:00
Rob
5f56053d8f Tame nodemon 2015-10-23 13:16:30 -07:00
Imperadeiro98
169627af82 Added a missing spr in CLA.jade 2015-10-23 20:49:15 +01:00
Rob
79d7d6269a Brunch hangs forever on 1.8.8 with bleeding libsass, lets use 1.9.1 2015-10-23 11:17:17 -07:00
Scott Erickson
3df4f26293 Remove a test wrench thrown into CommunityView 2015-10-23 10:50:21 -07:00
Scott Erickson
fad9d0a757 Remove auto-reload delay, see if we can do without it now
According to a comment now deleted, we had auto reload delay 300ms for race
conditions, mainly onCompile tweaking source map file sourceMappingURL values.
That only happens in production now, though, so let's try removing it for development.

Original comment added: 5104f0a1e7
Michael deleted it :( 6d7864c415
2015-10-23 10:47:01 -07:00
Rob
6cc21c9c2a Reference patched brunch-sass in a way old NPM can understand. 2015-10-23 10:16:21 -07:00
Scott Erickson
921054d53f Improve brunch re-compile speed by updating bunch libraries
Also fixed a couple templates newer brunch complained about.
2015-10-23 10:09:34 -07:00
Imperadeiro98
8a8d8c9d23 Fixed use of i18n in popover 2015-10-23 16:54:42 +01:00
Imperadeiro98
09422910f7 Updated i18n 2015-10-23 16:49:05 +01:00
Scott Erickson
b475815e41 Refactor InvoicesView to use view in template 2015-10-22 15:26:52 -07:00
Scott Erickson
cd065f3ba6 Refactor TeachersFreeTrialView to use view in template 2015-10-22 15:23:04 -07:00
Scott Erickson
9de50ac181 Refactor CLAView to use view in template 2015-10-22 15:16:32 -07:00
Nick Winter
4af6162c5c Replace simple loop docs with while-true docs in course levels 2015-10-22 10:29:10 -07:00
Rob
8d43be2236 Switch from ruby sass to node-sass.
Support heroko style PORT specification
2015-10-22 09:23:47 -07:00
basicer
c9322a5595 Unbreak karma 2015-10-22 07:24:43 -07:00
basicer
2c171f34f0 Atempt to unbreak travis ci 2015-10-22 07:18:11 -07:00
Nick Winter
6bf0efa9fa Script to download and process tournament results 2015-10-22 06:43:54 -07:00
Nick Winter
110ee58b71 Fix 3126: campaigns not respecting i18n-coverage query 2015-10-22 06:42:42 -07:00
Nick Winter
0ca3bdc597 Merge branch 'master' of https://github.com/codecombat/codecombat 2015-10-22 06:41:59 -07:00
Nick Winter
c427a72e45 Handle network failures in subscriptionStats.js 2015-10-22 06:41:54 -07:00
Scott Erickson
ddf351aac7 Refactor PaymentsView to use view in template 2015-10-21 17:18:38 -07:00
Scott Erickson
680eb04285 Refactor AccountSettingsView to use view in template 2015-10-21 17:18:38 -07:00
Scott Erickson
9a29c26cc8 Refactor HomeView to use view in template 2015-10-21 17:18:38 -07:00
Rob
625babd4a0 Silly brunch, guess we'll just call nodemon 2015-10-21 17:13:39 -07:00
Scott Erickson
94d29d2e8a Move trailing slash removal to client Router, make client route "/play/" work for facebook 2015-10-21 16:55:48 -07:00
Rob
70c18ca2cc Actually return the server and not the http object. 2015-10-21 16:45:41 -07:00
Rob
2275c78b2d Install bower packages and brunch build on npm install.
`npm run dev` now gives you a brunch watch that is also running the dev server
2015-10-21 16:12:55 -07:00
Scott Erickson
57c5384ec1 Refactor editor:save-new-version from a mediator event to a normal Backbone event
Part of a push to move away from global subscriptions when 'local' ones will do.
2015-10-21 15:34:07 -07:00
Driphter
73e3afa5f8 Added non-mutating methods for player code 2015-10-21 18:30:10 -04:00
Scott Erickson
6636051765 Refactor HomeView to use new event callback naming guideline
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:18:13 -07:00
Scott Erickson
452e6467b4 Refactor PrepaidView to use new event callback naming guideline
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:16:44 -07:00
Scott Erickson
cef4fc0794 Refactor AccountSettingsView to use new event callback naming guideline
See: https://github.com/codecombat/codecombat/wiki/Events,-subscriptions,-shortcuts#events
2015-10-21 14:02:04 -07:00
Rob
1ff97243ad Hello, yes this is Rob. 2015-10-21 08:46:12 -07:00
Imperadeiro98
9b06d53856 Fixed previous merge 2015-10-20 18:25:07 +01:00
Imperadeiro98
91a0347b7d Merge pull request #3124 from snarkota/patch-2
Update lt.coffee
2015-10-20 18:23:13 +01:00
snarkota
343f6c378c Update lt.coffee
More translation strings
2015-10-20 19:35:45 +03:00
Matt Lott
3ed755076b Enable while True auto yielding for all level types 2015-10-20 06:42:46 -07:00
Nick Winter
b03091c35d Merge pull request #3123 from UltCombo/iframe-style
Remove iframe borders using CSS instead of DOM
2015-10-20 06:15:54 -07:00
UltCombo
2c97238a7f Remove iframe borders using CSS instead of DOM
This patch makes iframe borders render identically in all supported browsers (i.e. no border).

Although Chrome does not displays borders around iframes by default, Firefox and Edge (IE) had visible iframe borders prior to this patch. This is because, as [previously mentioned](https://github.com/codecombat/codecombat/pull/3122#discussion_r42338590), the DOM property was mistyped as `frameborder` when it should be `frameBorder`.

As this is presentational issue, it feels more appropriate to fix it using CSS. Therefore, I've removed the buggy JS code and added a generic CSS solution to reset iframes' border styling.
2015-10-19 22:58:51 -02:00
Matt Lott
cc642e7254 Auto yield while True loops for course levels 2015-10-19 16:46:53 -07:00
Rob
23451b89bd Pin commonjs-require-definition to 0.2.0 to be compatible with module system 2015-10-19 16:23:38 -07:00
Nick Winter
2539814687 Merge pull request #3122 from UltCombo/help-video-fullscreen
Allow embedded help videos to go fullscreen
2015-10-19 12:40:28 -07:00
Nick Winter
6c35fdfe40 Merge branch 'AkaKaras-translation' 2015-10-19 12:29:29 -07:00