scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-20 20:42:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
7584 commits 221 branches 1 tag 521 MiB
Commit graph

7584 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
c8f6c36b1f Fix schedule formatting 
1. Sort schedule by 24-hour time to handle 12-o-clock
2. Sort chunks by type AND time, since multiple chunks have the same name
 2016-06-03 19:43:53 -04:00
Connor Hudson
c2c5d806b3 Merge pull request #547 from technoboy10/fix-dmca 
Fix DMCA page
 2016-06-03 15:27:24 -04:00
Connor Hudson
5bd1f4f2ac add container div to fix dmca 2016-06-03 15:02:55 -04:00
Connor Hudson
245c9cbe4f Merge pull request #542 from technoboy10/gh307-newstatic 
Fix GH-307: Restyle FAQ and legal pages
 2016-06-03 14:31:08 -04:00
Technoboy10
acea4f4df1 move imports into .information-page 2016-06-03 14:16:17 -04:00
Technoboy10
fea1fc611f restrict styles to only informationpage element 2016-06-03 14:14:45 -04:00
Technoboy10
9853f5ba5a Move all styling into the InformationPage component 2016-06-03 14:02:29 -04:00
Ray Schamp
fb87c4b70b Merge pull request #545 from rschamp/performance/devtool 
Use eval for webpack devtool
 2016-06-02 15:28:04 -04:00
Ray Schamp
aca5e206f7 Use eval for webpack devtool 
The source-map devtool adds a lot of time to startup, and eval works just as well for debugging.
 2016-06-02 15:27:32 -04:00
Ray Schamp
9d6d447fc4 Merge pull request #539 from technoboy10/gh395-396-initialstate 
Fix GH-395 and GH-396: Add initial state to splash header and navbar
 2016-06-02 11:41:49 -04:00
Connor Hudson
86e4dd6ce8 Another results -> session fix 2016-06-02 10:04:54 -04:00
Connor Hudson
292a9773fc fix session.js 2016-06-01 17:23:19 -04:00
Connor Hudson
f280d1d8df Remove quotes around keys, results -> session 2016-06-01 17:22:11 -04:00
Connor Hudson
11621564f6 why hello there, travis 2016-06-01 17:11:18 -04:00
Connor Hudson
6f39466d9f Reduxified 2016-06-01 17:07:21 -04:00
Connor Hudson
fd1401fe1b used stricter comparison 2016-06-01 16:14:58 -04:00
Connor Hudson
4d65d478ed change to more extensible session 2016-06-01 15:28:18 -04:00
Connor Hudson
00ac15d475 add test, tweak terms 2016-06-01 12:05:03 -04:00
Connor Hudson
1178a50beb restyle all the things 2016-06-01 11:57:50 -04:00
Connor Hudson
10a4dc656e fix travis 2016-06-01 10:49:59 -04:00
Connor Hudson
e402363576 initial pass 2016-05-31 16:37:42 -04:00
Ray Schamp
d645e95bd7 Merge pull request #534 from rschamp/bugfix/svgs 
[Develop] Force SVG mimetype
 2016-05-31 12:25:33 -04:00
Ray Schamp
7fb512f4a8 Merge pull request #531 from rschamp/feature/cn-banner 
[Develop] Homepage module
 2016-05-31 12:25:16 -04:00
Ray Schamp
3632f3dc1d Merge branch 'release/2.2.9' into develop 2016-05-31 12:24:21 -04:00
Ray Schamp
3f660143f1 Merge pull request #533 from rschamp/bugfix/svgs 
[Master] Force SVG mimetype
 2016-05-31 10:44:30 -04:00
Ray Schamp
a0ba19a2c1 Force SVG mimetype 2016-05-31 10:42:54 -04:00
Ray Schamp
7cf3846231 Merge pull request #530 from rschamp/feature/cn-banner 
[Master] Homepage module
 2016-05-31 10:18:20 -04:00
Ray Schamp
afe14ebe88 Merge pull request #499 from LLK/release/2.2.9 
[Master] Release 2.2.9
 2016-05-31 10:08:51 -04:00
Ray Schamp
39e7433eaf Merge pull request #528 from rschamp/bugfix/GH-527 
Terminate view.html rewrite rule
 2016-05-31 09:39:02 -04:00
Ray Schamp
e323cbbb9f Terminate view.html rewrite rule 
Otherwise anything with html in the path matches. Fixes #527
 2016-05-31 09:38:13 -04:00
Ray Schamp
89bdeff631 Don't break up navigation on mobile 2016-05-31 09:32:04 -04:00
Ray Schamp
0335fe1275 Merge pull request #516 from rschamp/upgrade/react-15 
Upgrade to React 15
 2016-05-31 09:23:49 -04:00
Matthew Taylor
9f886a007f Merge pull request #526 from mewtaylor/issue/conference-mobile-tweaks 
Some additional mobile tweaks for conference
 2016-05-29 12:01:56 -04:00
Matthew Taylor
932dab40c7 Some additional mobile changes 2016-05-29 11:59:53 -04:00
Matthew Taylor
6eeebe05c3 Merge pull request #525 from mewtaylor/issue/conference-tweaks 
For GH-497: conference tweaks for fallout from schedule/typography
 2016-05-27 16:40:39 -04:00
Matthew Taylor
ad1e723188 Drop the text below the button 
thanks @carljbowman!
 2016-05-27 16:35:23 -04:00
Matthew Taylor
011032308c Consolidate text 
thanks @carljbowman !
 2016-05-27 16:19:51 -04:00
Matthew Taylor
c351d54e9b fix lint warning 
thanks @rschamp!
 2016-05-27 16:02:38 -04:00
Matthew Taylor
74ac6e52bb conference formatting tweaks for mobile 
thanks @carljbowman!
 2016-05-27 15:55:27 -04:00
Matthew Taylor
b07b61c925 Update conference to reflect being sold out 2016-05-27 15:55:08 -04:00
Ray Schamp
83094813f0 Merge pull request #524 from rschamp/bugfix/privacy-policy-links 
Fix account links on Privacy Policy page
 2016-05-27 14:33:55 -04:00
Ray Schamp
45abaff962 Fix account links on Privacy Policy page 2016-05-27 14:33:12 -04:00
Ray Schamp
878bdcb8d2 Merge pull request #522 from rschamp/bugfix/cache-condition 
[Develop] Fix cache condition request
 2016-05-27 14:21:58 -04:00
Ray Schamp
19758f3901 Merge pull request #521 from rschamp/bugfix/cache-condition 
[Release] Fix cache condition request
 2016-05-27 14:10:33 -04:00
Ray Schamp
ca97838695 Fix cache condition request 
The response from the request condition includes fields we don't want to send up with the cache condition
 2016-05-27 13:50:13 -04:00
Ray Schamp
992f6d7481 Update footer and nav styles per @carljbowman 2016-05-27 12:02:22 -04:00
Ray Schamp
623773b39e Merge pull request #520 from rschamp/bugfix/splash-formatting 
Fix line height and wrapping on splash components
 2016-05-27 11:51:43 -04:00
Ray Schamp
986341341b Fix line height and wrapping on splash components 2016-05-27 11:46:35 -04:00
Ray Schamp
fde29bffb5 Merge pull request #519 from TheGrits/patch-2 
Fix Password Reset Link
 2016-05-27 09:58:34 -04:00
The_Grits
4f75713bd5 Update privacypolicy.jsx 2016-05-27 09:56:56 -04:00