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
Matt Lott
7433c437b6
Merge branch 'master' into production
2015-10-19 19:52:11 -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
Nick Winter
62e9bd5b2f
Merge zh-HANS.coffee
2015-10-19 12:29:20 -07:00
Matt Lott
3658f9dc4f
Update courses v1 beta users script
2015-10-19 11:22:01 -07:00
UltCombo
c02b311efa
Allow embedded help videos to go fullscreen
2015-10-19 03:44:19 -02:00
AkaKaras
e1e8dc33d2
zh-hans typos
2015-10-18 21:17:13 -04:00
AkaKaras
11baf3fd61
megre
2015-10-18 21:08:51 -04:00
AkaKaras
1d6d6011d8
zh-HANS and zh-HANT translation
...
both i18n are done, also had fix some typos
2015-10-18 21:05:40 -04:00
Imperadeiro98
1a664b519a
Uncommented strings from last merge
2015-10-18 15:39:03 +01:00
Imperadeiro98
a900cc003f
Merge pull request #3120 from artinhuang/master
...
Update to zh-HANS.coffee
2015-10-18 15:35:16 +01:00
artinhuang
3c7bb3443c
Modify some description,and add the new translations.
2015-10-18 18:39:49 +08:00
Imperadeiro98
13f30ca16a
Uncommented strings from last merge
2015-10-18 11:23:42 +01:00
Imperadeiro98
947204b10b
Merge pull request #3119 from snarkota/patch-1
...
Update lt.coffee
2015-10-18 11:18:48 +01:00
AkaKaras
a109786814
Merge remote-tracking branch 'codecombat/master' into translation
2015-10-17 22:50:37 -04:00
snarkota
23670b9f25
Update lt.coffee
...
First lines of lithuanian translation
2015-10-17 21:09:50 +03:00
Nick Winter
68c08af508
Merge branch 'master' into production
2015-10-16 16:07:17 -07:00
Nick Winter
eec818aa40
Merge branch 'master' of https://github.com/codecombat/codecombat
2015-10-16 16:07:04 -07:00
Nick Winter
5f8ab8a212
Added support for test campaigns that don't save their levels/achievements
2015-10-16 16:06:53 -07:00
Matt Lott
6f421b2ccc
Courses v1 beta users script
2015-10-16 15:23:13 -07:00
Sam Soffes
d2052980c4
Send sign out message directly
2015-10-16 15:02:33 -07:00
Nick Winter
a4af474cf6
Merge branch 'master' into production
2015-10-16 14:56:16 -07:00
Nick Winter
d5288a254b
Remove Ace of Coders tournament blurb from home page
2015-10-16 14:55:58 -07:00
