Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
247 commits
Select commit Hold shift + click to select a range
6744044
NIST password enforcement (#5945)
jmif Aug 24, 2020
e4dc25e
Improvements of dutch translations (#5811)
bmoelans Aug 25, 2020
f352531
Update id.coffee (#5949)
uluumbch Aug 25, 2020
2fff503
Little bit of August's translations for UA locale (#5946)
deivan Aug 25, 2020
da0ecb4
fix: stop validating password format on login
jmif Aug 25, 2020
7497f28
fix options.error undefined error (#5947)
smallst Aug 26, 2020
79a6cf7
fix: improve error message on teacher student change password
jmif Aug 27, 2020
fbc68d4
Simulate All button for pairwise simulation (#5898)
wjllance Aug 31, 2020
8cb1e3d
Temporarily disable Battle of Red Cliff tournament submissions
nwinter Sep 1, 2020
281e744
Enable C++ (#5934)
codeluggage Sep 1, 2020
c4a04d8
Cleanup the codequest banner (#5958)
AndrewJakubowicz Sep 1, 2020
c3f5390
Revert "Enable C++ (#5934)" (#5959)
AndrewJakubowicz Sep 1, 2020
25e914d
Fixes for tournament simulation
nwinter Sep 2, 2020
7a212a1
Enable C++ (#5960)
AndrewJakubowicz Sep 2, 2020
1eb9329
Add Software Eng job to about page (#5961)
AndrewJakubowicz Sep 2, 2020
19e2e1e
Remove apcsp links from the homepage (#5943)
AndrewJakubowicz Sep 2, 2020
14623ba
Simulate All button: includes session limit and mirror match info
nwinter Sep 2, 2020
104c4e2
Parents page additional flows (#5964)
jmif Sep 3, 2020
d2df5f4
fix: set min height on sticky footer of parents page
jmif Sep 4, 2020
466950e
fix: send live classes CTA clicked event to facebook from PageParents…
jmif Sep 4, 2020
58ba38f
fix: only route to Sydney M - F
jmif Sep 4, 2020
131ed90
Added final tournament leaderboard for the Battle of Red Cliffs
nwinter Sep 5, 2020
9cc1f03
Update uk.coffee
deivan Sep 6, 2020
75e9fa4
add Standardized Curricula in teacher resources hub (#5965)
smallst Sep 9, 2020
0df3060
Update CodeQuest rankings slightly for elementary vs. open
nwinter Sep 10, 2020
695688d
Revert "Temporarily disable Battle of Red Cliff tournament submissions"
nwinter Sep 10, 2020
4c6f7d1
Fix some transpilation/C++ stuff
nwinter Sep 10, 2020
10fafe2
More C++ fixes
nwinter Sep 10, 2020
98251f0
Updated CodeQuest tournament brackets slightly
nwinter Sep 10, 2020
65f05bc
fix standard cpp not allowe void main() (#5975)
smallst Sep 15, 2020
6a73777
Fix event checks node turning periods into commas on edit
nwinter Sep 15, 2020
1aa37a8
Allow writing Components/Systems in JavaScript (#5935)
nwinter Sep 15, 2020
fcde52a
Update CodeQuest rankings slightly after recategorizing a few players…
nwinter Sep 15, 2020
2811ebd
Merge branch 'master' of github.com:codecombat/codecombat
nwinter Sep 15, 2020
f63b18e
Update CodeQuest rankings slightly after recategorizing two more play…
nwinter Sep 15, 2020
ec21d1e
forms.coffee check radio input isChecked (#5976)
smallst Sep 16, 2020
b68a7bf
Fix obsolete title/description in Component schema config new return …
nwinter Sep 17, 2020
7c6346c
Update HoC activity to 2020 (#5979)
AndrewJakubowicz Sep 18, 2020
7b3e920
About page team updates (#5980)
AndrewJakubowicz Sep 18, 2020
85f6c84
Updated Job Postings (#5982)
AndrewJakubowicz Sep 22, 2020
987f0c4
Update HOC pdf to 2020 and add url route (#5983)
AndrewJakubowicz Sep 22, 2020
900a8e6
Update Esper
nwinter Sep 23, 2020
5cea4b7
Add Progress journal and engineering cycle worksheet Google doc (#5984)
AndrewJakubowicz Sep 23, 2020
72157d9
Update copyright year from 2019 to 2020
nwinter Sep 24, 2020
f8d3056
Add Customized license (#5978)
smallst Sep 24, 2020
bf8a524
Revert "Update Esper"
AndrewJakubowicz Sep 25, 2020
acf6f93
Migrate some jade to pug (#5986)
smallst Sep 28, 2020
017f211
Update Esper (#5988)
AndrewJakubowicz Sep 29, 2020
27697e6
Blog is no longer on Sett
nwinter Oct 1, 2020
b4a826c
Update license copyright year to 2020 (#5990)
dreeves Oct 2, 2020
59ec6ba
Customize licensor follow-up: translate error message for assign cour…
smallst Oct 3, 2020
2fd9b9e
Run copy-i18n-tags (#5997)
coco-ci Oct 6, 2020
bd39e6d
Parent page styling fix for Firefox (#6002)
AndrewJakubowicz Oct 7, 2020
c51d23e
Update Art Lead job description
AndrewJakubowicz Oct 9, 2020
ac88b5b
Centralize 'copied to clipboard' Noty messages
nwinter Oct 10, 2020
9604fca
Clarify what ThangType subscriber property does
nwinter Oct 10, 2020
332e1e6
Making mysterious Master Wizard's mayhem-manifested mauve marble mans…
nwinter Oct 11, 2020
8091e0b
Relax code bank section names character restrictions
nwinter Oct 12, 2020
2184415
fix cpp goals for lines-counting in right place (#6005)
smallst Oct 14, 2020
e2af8e8
Additional internal logging (#6013)
codeluggage Oct 16, 2020
ed87ced
Remove old A/B test code, including picking winning variant for reque…
nwinter Oct 17, 2020
cc654c6
disable some trackers in china (#6009)
smallst Oct 18, 2020
050c146
Work around buggy gem shop links
nwinter Oct 18, 2020
4581fc5
Run copy-i18n-tags (#6014)
coco-ci Oct 19, 2020
f1e5fff
Tweak logging (#6017)
codeluggage Oct 20, 2020
e206297
Fix homepage vimeo error message (#6018)
AndrewJakubowicz Oct 20, 2020
eb2fe5b
Fix local proxy target (#6019)
codeluggage Oct 21, 2020
7941e9b
parents route changed to use self-signup by default (#6020)
AndrewJakubowicz Oct 21, 2020
7736919
Remove monthly subscription option from parents page (#6021)
AndrewJakubowicz Oct 21, 2020
850bd9b
Check against all possible teacher types (#6012)
codeluggage Oct 22, 2020
9d7a643
translate some register error message (#6015)
smallst Oct 22, 2020
ff2054b
Fix login flicker (#6023)
codeluggage Oct 23, 2020
82ab3c8
more license presets (#6022)
smallst Oct 23, 2020
aeda576
Moved change was on wrong line (#6025)
codeluggage Oct 23, 2020
9767ff0
Basic error handling for contact modal
nwinter Oct 25, 2020
d3f8783
Run copy-i18n-tags (#6027)
coco-ci Oct 26, 2020
3f74dca
Pull over latest /i18n fixes from Ozaria
nwinter Oct 26, 2020
c7bac8a
Remove former Brazil partner Enlix
nwinter Oct 27, 2020
1a928ba
Fix leftover characters from Brazil removal commit
AndrewJakubowicz Oct 28, 2020
245ca66
Ozaria encouragement CTAs (#6028)
AndrewJakubowicz Oct 29, 2020
b552e87
Help Timetap debug their confirmation iframe
AndrewJakubowicz Oct 29, 2020
fed415d
Replace "Regeneration" with "Regen" to fix overlapping text (#6029)
Chaboi45 Oct 29, 2020
0e8530e
TimeTap page to debug iframe in private browsing (#6031)
AndrewJakubowicz Oct 30, 2020
08df9fb
Timetap confirmation celebration modal (#6030)
AndrewJakubowicz Oct 30, 2020
22847b1
Run copy-i18n-tags (#6034)
coco-ci Nov 2, 2020
d75820b
Update Norwegian (nb) translation (#6008)
martin4ndersen Nov 2, 2020
5b29f2a
Fix context menu showing up as empty gray square below HUD on initial…
nwinter Nov 3, 2020
e51afaf
Fix too-large /teachers/courses solutions buttons now that C++ is in;…
nwinter Nov 3, 2020
c06f8d4
Made component.attach to work with objects and ES6 classes (#602)
Bryukh Sep 28, 2020
c9eb1ab
Add additional subscription plan requests to the stripe plan enum (#6…
AndrewJakubowicz Nov 4, 2020
1766b6f
Ozaria properties that can cause validation errors
AndrewJakubowicz Nov 4, 2020
225d373
License request (#634) (#6036)
codeluggage Nov 4, 2020
4c7a741
Don't show Ozaria encouragement modal by default on first view of tea…
nwinter Nov 5, 2020
771c01a
Lifetime product migrated to an annual subscription pricing (#6038)
AndrewJakubowicz Nov 9, 2020
7af9d87
Update some instructions for translators (#6026)
nwinter Nov 10, 2020
afd47ec
Don't try to show user avatar portraits on contribute page
nwinter Nov 10, 2020
451434b
copy i18n tags fixing build error
AndrewJakubowicz Nov 10, 2020
46239df
Removed a couple duplicate i18n keys
nwinter Nov 10, 2020
4999631
Upcoming webinar headline and banner (#6045)
AndrewJakubowicz Nov 11, 2020
9b8830e
Fix webinar day error copy
AndrewJakubowicz Nov 12, 2020
02bc915
Fix automatic application of country coupons (#6048)
AndrewJakubowicz Nov 14, 2020
86ae6b0
Add spoken language selector to /play
nwinter Nov 15, 2020
1127c21
Run copy-i18n-tags (#6051)
coco-ci Nov 16, 2020
a988314
Fix capstone performance by removing backbone mediator event validati…
AndrewJakubowicz Nov 17, 2020
edfe026
Update favicon (#6050)
nwinter Nov 17, 2020
4de3f03
Remove Snowplow (#6049)
nwinter Nov 17, 2020
432a3ad
Remove webinar marketing (#6054)
AndrewJakubowicz Nov 17, 2020
84227b9
Run copy-i18n-tags (#6055)
coco-ci Nov 19, 2020
2ec172a
Handle error objects better (#6053)
codeluggage Nov 20, 2020
de08d51
Parent page v2 (#6056)
AndrewJakubowicz Nov 25, 2020
fb00fe1
Polish changes, new assets and animations (#6059)
codeluggage Nov 25, 2020
62bdeb7
Fix missing acorn_loose for our JS parser
nwinter Nov 25, 2020
9157599
Fix Mac Ctrl+P code editing behavior
nwinter Nov 26, 2020
afe5839
Parents page polish v2 (#6061)
codeluggage Nov 27, 2020
4e42d5e
Default to https for font loading (#6062)
codeluggage Nov 27, 2020
f140fbb
Specify pixelation for headers (#6064)
codeluggage Nov 27, 2020
076e2ea
Fix [Function] showing up in method docs instead of interpolated prop…
nwinter Nov 28, 2020
7e65b54
Fix font specificity, cut FAQ until it is live (#6065)
codeluggage Nov 28, 2020
c15f284
Update our CreateJS hit test performance monkey patch to further redu…
nwinter Nov 28, 2020
db90efa
Don't allow zooming out as far, easy to get lost in level editor
nwinter Nov 28, 2020
fcf2d97
Centralize fonts to avoid flicker (#6067)
codeluggage Nov 30, 2020
5623e22
Griffin responsiveness to Parent Page and jumbotron overflow-x (#6068)
AndrewJakubowicz Dec 1, 2020
39d4b21
Make content locking more obvious (#6060)
nwinter Dec 1, 2020
b867a46
Update ace editor version (#5647)
iainbeeston Dec 1, 2020
ee7dc88
Optimize images on /parents (#6070)
AndrewJakubowicz Dec 2, 2020
cf71104
Hour of Code 2020 QA branch (#6069)
AndrewJakubowicz Dec 3, 2020
370e01b
Fixed font size for H2 on parents page (#6073)
mohit-codecombat Dec 7, 2020
8cbb31f
Remove top banner and fix parent page overflowing (#6075)
AndrewJakubowicz Dec 8, 2020
c59248a
Update /about page (team, stats)
nwinter Dec 9, 2020
89bba7c
Propagate i18n
nwinter Dec 9, 2020
e88b0ce
Update /about jobs
nwinter Dec 9, 2020
39f97cb
Fix removal of createColorGroupTintButtons in Thang editor
nwinter Dec 9, 2020
46d45a3
Remove timestamps and re-encode images to try to solve manifest icon …
nwinter Dec 9, 2020
622a0ff
Run copy-i18n-tags (#6074)
coco-ci Dec 10, 2020
621954c
Admin spectate view improvements
nwinter Dec 10, 2020
f5cc345
Fix .jpg to .png reference for broken image
nwinter Dec 13, 2020
0b27819
Update ja.coffee (#6044)
Chaboi45 Dec 14, 2020
80a6078
Cleanup teacher appreciation banner (#6079)
AndrewJakubowicz Dec 15, 2020
9a480ea
Esports page (#6078)
AndrewJakubowicz Dec 16, 2020
93787f9
CodePoints implementation, other /league tweaks (#6085)
nwinter Dec 16, 2020
434288e
Update league button style (#6088)
mohit-codecombat Dec 16, 2020
df01906
Added padding between 'How it Works' and 'Season Arenas' sections (#6…
mohit-codecombat Dec 16, 2020
ab274d8
increase font size of esports-header (#6086)
mrfinch Dec 16, 2020
6fd8a60
Second round of League fixes and improvements (#6090)
codeluggage Dec 16, 2020
a2437a7
Fix esports routing and clan CTA (#6091)
AndrewJakubowicz Dec 16, 2020
a84067f
Run copy-i18n-tags (#6081)
coco-ci Dec 16, 2020
1406ac2
fr.locale (#6042)
TedMurvol Dec 17, 2020
82b6b0e
Update zh-HANS.coffee (#6041)
Levix Dec 17, 2020
dc0c40f
Run copy-i18n-tags (#6095)
coco-ci Dec 17, 2020
1825c9d
Backup font when loRes font fails on parents and league pages (#6100)
AndrewJakubowicz Dec 18, 2020
1041518
Add marketing video to parents page (#6094)
AndrewJakubowicz Dec 18, 2020
974f81a
on hover remove underline and lighten color similar to home page for …
mrfinch Dec 18, 2020
57c9a17
Mongolian language translations in mon.cofee (#6057)
Dec 18, 2020
ef3f68b
Narrow section border in parent page (#6084)
mohit-codecombat Dec 18, 2020
7c27612
Update course offerings subtext style (#6087)
mohit-codecombat Dec 18, 2020
b2cb71f
Hero Section: decrease size of header text (#6098)
mohit-codecombat Dec 18, 2020
29e2eee
Decrease padding bottom for Subhead and CTA (#6099)
mohit-codecombat Dec 18, 2020
d430ca5
Added padding when items are stacked in parents page (#6097)
mohit-codecombat Dec 18, 2020
d619c4c
Align concepts covered in parent page (#6082)
mohit-codecombat Dec 18, 2020
ea39850
Minor h1 pixelated update on parents page
AndrewJakubowicz Dec 18, 2020
e8f892e
Bold parent page header (#6083)
mohit-codecombat Dec 18, 2020
95fb384
Add Brehan to /about page
nwinter Dec 19, 2020
cb6543c
Rescue some unintentionally deleted HeroVictoryModal styles from #5853
nwinter Dec 19, 2020
f7678ab
Remove a few more unused CodePlay-related references
nwinter Dec 19, 2020
21f240e
Stop sending stub calculationTime
nwinter Dec 19, 2020
92e1506
🐛 Remove duplication of AI session from league clan page (#6092)
AndrewJakubowicz Dec 20, 2020
6d5e98e
Increase font for subheader1 and subheader2 (#6101)
mohit-codecombat Dec 21, 2020
66ed1ce
Run copy-i18n-tags (#6102)
coco-ci Dec 21, 2020
c48c13c
🐛 Scroll position shouldn't be saved between vue router pages (#6093)
AndrewJakubowicz Dec 22, 2020
35f0eaa
Remove background graphic from parent video (#6108)
AndrewJakubowicz Dec 22, 2020
8ac2d7f
fix wrong session language in classroom-ladder (#6105)
smallst Dec 23, 2020
7d5778b
For https://github.com/codecombat/codecombat/pull/5523 (#6109)
codeluggage Dec 23, 2020
f936738
Auto clan schema (#6106)
codeluggage Dec 24, 2020
3ffd97c
Update C++/Java runtime libraries
nwinter Dec 24, 2020
28616e3
Fix four above/below logic in league ladder (#6113)
AndrewJakubowicz Dec 29, 2020
84e16b0
Add displayName preference for clans on league page (#6114)
AndrewJakubowicz Dec 29, 2020
09bcbc6
Add User schema properties from Ozaria
nwinter Dec 26, 2020
5c08e87
Esports navigation header (#6117)
AndrewJakubowicz Dec 29, 2020
fa4b5a4
Fix CodePoints ladder (#6116)
AndrewJakubowicz Dec 30, 2020
cd04763
Frontend thoughts on leaderboard
AndrewJakubowicz Dec 30, 2020
2c6affd
Update C++ runtime (add C++ .size() method for our InitializerLists)
nwinter Dec 30, 2020
ac03c72
Fix space being smaller than 20 issue.
AndrewJakubowicz Dec 30, 2020
a9ce2d8
Fix naming consistency for codepoints leaderboard
AndrewJakubowicz Dec 30, 2020
e1ac9ed
Remove hacky dark-mode class management
AndrewJakubowicz Dec 30, 2020
a3a28c1
Remove additional class dark-mode
AndrewJakubowicz Dec 30, 2020
ab085d0
Minor below top 20 creatorName fix
AndrewJakubowicz Dec 30, 2020
7b039ee
Esports leaderboard client bugs (#6118)
AndrewJakubowicz Dec 30, 2020
052a6c5
Fix static navbar compile (#6119)
AndrewJakubowicz Dec 30, 2020
a51dcad
Fixed extra space in parent page for mobile devices (#6107)
mohit-codecombat Dec 31, 2020
f740130
Run copy-i18n-tags (#6120)
coco-ci Jan 4, 2021
fb74d39
Set hiding style and load optimize to avoid flicker (#6126)
codeluggage Jan 4, 2021
24e49c9
Additional mobile optimization (#6128)
mohit-codecombat Jan 5, 2021
45a117b
League mobile optimization (#6115)
mohit-codecombat Jan 5, 2021
9e2c587
Swedish translations (#6121)
kalaspuffar Jan 5, 2021
0e0e69d
Second batch of Swedish translations (#6122)
kalaspuffar Jan 5, 2021
a7e5d3f
Third batch of swedish translations. (#6123)
kalaspuffar Jan 5, 2021
872f2a8
Fourth batch of Swedish translations. (#6125)
kalaspuffar Jan 5, 2021
7cf78d9
Fifth batch of Swedish translations. (#6127)
kalaspuffar Jan 5, 2021
3f1414a
🐛 Esports league page ladder and clan loading (#6129)
AndrewJakubowicz Jan 6, 2021
880e4e4
hide drift widget from /play page (#6130)
mrfinch Jan 6, 2021
0f534e7
Sixth batch of Swedish translation. (#6132)
kalaspuffar Jan 7, 2021
9d137c5
Add autoclan metadata and clean up kind (#6136)
AndrewJakubowicz Jan 7, 2021
4723b95
update translatejs2cpp to support more array and json (#6110)
smallst Jan 10, 2021
7a88f17
Fixed spacing issue in leage page for small devices (#6135)
mohit-codecombat Jan 11, 2021
f1887d2
Js2cpp+ (#6138)
smallst Jan 11, 2021
9739880
Seventh batch of Swedish translations. (#6133)
kalaspuffar Jan 11, 2021
321c9d7
Auto fill level solution (#6134)
codeluggage Jan 12, 2021
5b51a21
Include latest C++/Java runtimes from Jaba
nwinter Jan 12, 2021
c400073
Clan to Team terminology renaming on league page (#6140)
AndrewJakubowicz Jan 13, 2021
8fbc8cd
Update Clan to Team missed copy
AndrewJakubowicz Jan 14, 2021
b318639
remove manbites.com images
mrfinch Jan 14, 2021
c2d1090
Revert "hide drift widget from /play page (#6130)"
nwinter Jan 14, 2021
ae9e1cd
Bug fix: incorrect link interpolation in nav bar (#6144)
AndrewJakubowicz Jan 14, 2021
7988cca
Academica third party esports bug fixes (#6149)
AndrewJakubowicz Jan 14, 2021
c37e73f
Academica team - student call to actions (#6151)
AndrewJakubowicz Jan 15, 2021
958966f
Modify account setting page (#6142)
smallst Jan 17, 2021
1a7863a
Fix unresponsive container (#6152)
AndrewJakubowicz Jan 17, 2021
cfba8b6
remove intercom integration
mrfinch Jan 13, 2021
e04a753
Increase max-width for league page (#6139)
mohit-codecombat Jan 20, 2021
cc600c5
Compress images for smaller file sizes (#6146)
nwinter Jan 21, 2021
78c7f44
Remove old parents page (#6147)
nwinter Jan 21, 2021
457c7e8
Load esper.js later for better performance (#6148)
nwinter Jan 21, 2021
af12ae4
Revert "Revert "hide drift widget from /play page (#6130)""
nwinter Jan 21, 2021
f62646d
Fix casing mistakes (Codecombat, Javascript)
nwinter Jan 21, 2021
ffe5129
Run copy-i18n-tags (#6157)
coco-ci Jan 22, 2021
c4ab742
Composition of graphic in the Free to Get Started section (#6104)
mohit-codecombat Jan 22, 2021
f19b87b
replace social proof icon and removed its shadow (#6156)
mohit-codecombat Jan 22, 2021
48c6f7b
Don't load Drift unless/until it's needed. (#6159)
nwinter Jan 22, 2021
889cc9c
Avoid error message by not refreshing simulate tab if it doesn't exis…
nwinter Jan 22, 2021
1876796
Add player count to AI League arena leaderboard (#6160)
nwinter Jan 22, 2021
f86dd8e
Use updated jaba runtimes
nwinter Jan 24, 2021
996fade
Add ability to choose a random sourceVariant for multiple options for…
nwinter Jan 24, 2021
470c93d
enable spectate in one team ladder (#6162)
smallst Jan 25, 2021
df02b38
Add optional chaining (#6164)
codeluggage Jan 25, 2021
17b4d14
Split contact modal routing (#6165)
codeluggage Jan 25, 2021
b52ea36
Update latest C++/Java runtimes from Jaba
nwinter Jan 25, 2021
27d59f9
League adjust leaderboard table (#6163)
mohit-codecombat Jan 26, 2021
e497234
Update Ambassador Page for Better Directions (#6161)
Chaboi45 Jan 26, 2021
aadad09
add a ? to avoid @spellThang undefined error (#6166)
smallst Jan 27, 2021
95e1265
Updated top banner blurb away from holiday season messaging
nwinter Jan 27, 2021
6c25346
Esports link from home and student first campaign view (#6167)
AndrewJakubowicz Jan 28, 2021
1419dab
🐛Fix spritesheet builder memory leak (#6168)
AndrewJakubowicz Jan 28, 2021
262f070
Run copy-i18n-tags (#6169)
coco-ci Jan 29, 2021
014f71b
Add student dashboard CTA for esports (#6170)
AndrewJakubowicz Jan 29, 2021
b9708a3
Let widgets co-exist without fighting over z-index (#6171)
codeluggage Jan 29, 2021
5279433
Fix outcomes reports not handling deleted courses
nwinter Jan 30, 2021
276cf91
Merge branch 'master' into deivan-uk-locale-patch-2
Bryukh Jan 31, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
17 changes: 10 additions & 7 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"presets": [
"env"
],
"plugins": [
"syntax-dynamic-import",
"babel-plugin-transform-object-rest-spread"
]
"presets": [
["@babel/preset-env", {
"modules": "commonjs"
}]
],
"plugins": [
"@babel/plugin-syntax-dynamic-import",
"@babel/plugin-proposal-object-rest-spread",
"@babel/plugin-proposal-optional-chaining"
]
}
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015-2018 CodeCombat Inc. and other contributors
Copyright (c) 2015-2020 CodeCombat Inc. and other contributors

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
4 changes: 0 additions & 4 deletions app/app.sass
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,3 @@
@import './styles/style-flat-variables.sass'
@import './styles/style-flat.sass'
@import './styles/treema-ext.sass'

// Ozaria common styles
// TODO move these imports to some file in ozaria folder?
@import 'ozaria/site/styles/common/common.sass'
14 changes: 14 additions & 0 deletions app/assets/fonts/vt323.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
/* vt323-regular - latin */
/* Generated at: https://google-webfonts-helper.herokuapp.com/fonts/vt323 */
@font-face {
font-family: 'VT323';
font-style: normal;
font-weight: 700;
src: url('vt323/vt323-v12-latin-regular.eot'); /* IE9 Compat Modes */
src: local(''),
url('vt323/vt323-v12-latin-regular.eot?#iefix') format('embedded-opentype'), /* IE6-IE8 */
url('vt323/vt323-v12-latin-regular.woff2') format('woff2'), /* Super Modern Browsers */
url('vt323/vt323-v12-latin-regular.woff') format('woff'), /* Modern Browsers */
url('vt323/vt323-v12-latin-regular.ttf') format('truetype'), /* Safari, Android, iOS */
url('vt323/vt323-v12-latin-regular.svg#VT323') format('svg'); /* Legacy iOS */
}
93 changes: 93 additions & 0 deletions app/assets/fonts/vt323/OFL.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
Copyright 2011, The VT323 Project Authors (peter.hull@oikoi.com)

This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
http://scripts.sil.org/OFL


-----------------------------------------------------------
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
-----------------------------------------------------------

PREAMBLE
The goals of the Open Font License (OFL) are to stimulate worldwide
development of collaborative font projects, to support the font creation
efforts of academic and linguistic communities, and to provide a free and
open framework in which fonts may be shared and improved in partnership
with others.

The OFL allows the licensed fonts to be used, studied, modified and
redistributed freely as long as they are not sold by themselves. The
fonts, including any derivative works, can be bundled, embedded,
redistributed and/or sold with any software provided that any reserved
names are not used by derivative works. The fonts and derivatives,
however, cannot be released under any other type of license. The
requirement for fonts to remain under this license does not apply
to any document created using the fonts or their derivatives.

DEFINITIONS
"Font Software" refers to the set of files released by the Copyright
Holder(s) under this license and clearly marked as such. This may
include source files, build scripts and documentation.

"Reserved Font Name" refers to any names specified as such after the
copyright statement(s).

"Original Version" refers to the collection of Font Software components as
distributed by the Copyright Holder(s).

"Modified Version" refers to any derivative made by adding to, deleting,
or substituting -- in part or in whole -- any of the components of the
Original Version, by changing formats or by porting the Font Software to a
new environment.

"Author" refers to any designer, engineer, programmer, technical
writer or other person who contributed to the Font Software.

PERMISSION & CONDITIONS
Permission is hereby granted, free of charge, to any person obtaining
a copy of the Font Software, to use, study, copy, merge, embed, modify,
redistribute, and sell modified and unmodified copies of the Font
Software, subject to the following conditions:

1) Neither the Font Software nor any of its individual components,
in Original or Modified Versions, may be sold by itself.

2) Original or Modified Versions of the Font Software may be bundled,
redistributed and/or sold with any software, provided that each copy
contains the above copyright notice and this license. These can be
included either as stand-alone text files, human-readable headers or
in the appropriate machine-readable metadata fields within text or
binary files as long as those fields can be easily viewed by the user.

3) No Modified Version of the Font Software may use the Reserved Font
Name(s) unless explicit written permission is granted by the corresponding
Copyright Holder. This restriction only applies to the primary font name as
presented to the users.

4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
Software shall not be used to promote, endorse or advertise any
Modified Version, except to acknowledge the contribution(s) of the
Copyright Holder(s) and the Author(s) or with their explicit written
permission.

5) The Font Software, modified or unmodified, in part or in whole,
must be distributed entirely under this license, and must not be
distributed under any other license. The requirement for fonts to
remain under this license does not apply to any document created
using the Font Software.

TERMINATION
This license becomes null and void if any of the above conditions are
not met.

DISCLAIMER
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
OTHER DEALINGS IN THE FONT SOFTWARE.
Binary file not shown.
Loading