scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-04 12:51:28 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
4750 commits 216 branches 1 tag 485 MiB
Commit graph

4750 commits

This branch
This branch
All branches
Author SHA1 Message Date
Matthew Taylor
82942b988d Localize title of page after strings load 
This doesn't solve the issue of making it crawlable in other languages, but it does allow the title to be translatable for user parsing (and accessibility)
 2016-05-16 10:55:51 -04:00
Matthew Taylor
4abebd8194 Remove duplicate About Scratch entry 
Towards #419 – makes "About Scratch" work on the About page. Additionally, removes `defaultMessages` from the footer since we no longer use those.
 2016-05-16 10:19:52 -04:00
Ray Schamp
497bb6f357 Merge pull request #477 from TheGrits/patch-2 
Fix gh-309: Migrate Privacy Policy
 2016-05-16 09:47:24 -04:00
The_Grits
76c003d854 Lint fixes 2016-05-16 06:45:06 -04:00
The_Grits
5e9c87e9eb Update Travis 2016-05-16 06:44:01 -04:00
Ray Schamp
8de53ae375 Merge pull request #476 from rschamp/feature/no-native 
Improve performance of Travis builds
 2016-05-15 09:23:28 -04:00
The_Grits
5d05d19566 aha 
Does this fix the lint error?
 2016-05-14 23:21:10 -04:00
The_Grits
c2fca9c4c6 Squash and Merge 2016-05-14 22:39:40 -04:00
The_Grits
f3439eba5c Add privacypolicy route 2016-05-13 20:45:48 -04:00
Ray Schamp
7bd5f8f6c9 Cache pip 2016-05-13 15:33:46 -04:00
Ray Schamp
0f33ec836c Use published version of po2icu 
Version 0.0.2 has i18next-conv 2.2.5 which uses iconv-lite rather than iconv. So this means we don't have to patch gcc.
 2016-05-13 15:33:46 -04:00
Ray Schamp
dfac0380db Install devDependencies 2016-05-13 15:33:46 -04:00
Matthew Taylor
27af75e7fe Merge pull request #475 from mewtaylor/issue/gh-441-typography 
Fix GH-[441, 440]: Get rid of typography file, use `render` in conference
 2016-05-13 09:09:40 -04:00
Matthew Taylor
bf1b3f894d Some leftovers 
Thanks @rschamp again!
 2016-05-12 22:54:07 -04:00
Matthew Taylor
804a65e3d0 Whoops 
That change is coming later with more redux in conference :).
 2016-05-12 18:39:33 -04:00
Matthew Taylor
82dbfabcec Constrain view styles to within view name classes 
So that they don't affect styles declared outside the scope of the view. Thanks @rschamp!
 2016-05-12 18:32:57 -04:00
Matthew Taylor
e1cebe46db Ergonomics – get rid of typography file 
1. Merge typography into main
2. Get rid of use of `#view` in scss
3. Make `render` work with conference pages
 2016-05-12 18:05:26 -04:00
Ray Schamp
fa9c8bca1d Merge pull request #470 from TheGrits/patch-3 
Fix gh-457: Log In Margin
 2016-05-11 10:00:43 -04:00
The_Grits
8d294e4d29 Float 2016-05-11 09:53:39 -04:00
Rachel Thornton
4b632e4f5f Removed extraneous image file 2016-05-10 08:26:41 -04:00
Rachel Thornton
4a2a2c8ca2 Whitespace added 2016-05-10 08:22:48 -04:00
Rachel Thornton
cb02587ee3 Merge remote-tracking branch 'LLK/develop' into develop 2016-05-10 08:21:57 -04:00
Rachel Thornton
577ed2c746 Small fix 2016-05-10 08:18:47 -04:00
Rachel Thornton
9c6475aed5 Support for studios 
Search and Explore now support studios, thought currently the api is
not ready for them.
 2016-05-10 08:16:46 -04:00
Rachel Thornton
d7c9057cbd Refactoring, new grid component 
Significant refactoring of Explore and Search pages, including new grid
component for displaying projects
 2016-05-10 00:54:46 -04:00
The_Grits
75258be4a4 margin-right 
4.4px is the max margin we can put to the right of the button without the "Forgot password?" text wrapping.
 2016-05-09 11:27:22 -04:00
Matthew Taylor
4c72dd6d51 Merge branch 'TheGrits-patch-8' into develop 
* TheGrits-patch-8:
  Indent p element
  Edit spacing
  Whoops
  Squash and Merge
  Add DMCA route
 2016-05-03 10:23:59 -04:00
Matthew Taylor
fd1016059b Merge branch 'patch-8' of https://github.com/TheGrits/scratch-www into TheGrits-patch-8 
* 'patch-8' of https://github.com/TheGrits/scratch-www:
  Indent p element
  Edit spacing
  Whoops
  Squash and Merge
  Add DMCA route

# Conflicts:
#	src/routes.json
 2016-05-03 10:23:34 -04:00
Ray Schamp
64f91601f0 Merge branch 'hotfix/analytics' 2016-05-02 14:54:18 -04:00
Ray Schamp
c20a93dc96 Merge branch 'hotfix/analytics' into develop 2016-05-02 14:53:53 -04:00
Ray Schamp
12447823f2 Fix defaults for fastly and analytics 2016-05-02 14:53:19 -04:00
Ray Schamp
765e68b282 Merge pull request #465 from LLK/hotfix/analytics 
[Master] Hotfix: Add missing env variables needed for the build
 2016-05-02 14:02:04 -04:00
Ray Schamp
fb292f3773 Merge pull request #466 from LLK/hotfix/analytics 
[Develop] Hotfix: Add missing env variables needed for the build
 2016-05-02 14:01:55 -04:00
Ray Schamp
3833c07518 Define all environment variables by branch name 2016-05-02 13:44:55 -04:00
Ray Schamp
e48b04f907 Add missing env variables needed for build 2016-05-02 11:57:46 -04:00
Matthew Taylor
47d7257895 Merge pull request #462 from mewtaylor/hotfix/add-register-faq 
[Develop] Hotfix: Add Registration to FAQ
 2016-05-01 12:48:41 -04:00
Rachel Thornton
fdd78a5433 Style changes 
Changes to style for lint tests
 2016-04-30 16:38:48 -04:00
Rachel Thornton
eb499c929c Changed path of search page to allow for studio tabs 
Users and Forum tabs removed
 2016-04-30 16:03:11 -04:00
Rachel Thornton
e2a7698cde Changes to path for search results 
No longer uses google_results in url
Also now has correct link to project page from clicking on projects in
explore and search
 2016-04-30 14:50:11 -04:00
Rachel Thornton
fefcf47c71 Removed unnecessary files 2016-04-30 14:13:18 -04:00
Rachel Thornton
bca374b88f Merged changes to routing, separated Tabs into a component 2016-04-30 14:07:11 -04:00
Rachel Thornton
74a6d132bd Search page functions 2016-04-30 11:44:10 -04:00
Matthew Taylor
cc58f999f8 Merge pull request #461 from mewtaylor/hotfix/add-register-faq 
[Master] Hotfix: Add registration to FAQ
 2016-04-30 11:29:35 -04:00
Matthew Taylor
c28f90857b Add registration faq question 2016-04-29 17:37:41 -04:00
Matthew Taylor
07bbc38822 Merge pull request #433 from TheGrits/patch-7 
Fix gh-19: Migrate Community Guidelines
 2016-04-29 17:32:35 -04:00
The_Grits
20dcf8eb4f switch 2016-04-29 17:27:39 -04:00
The_Grits
64143704d5 Thanks Travis 
Got rid of a trailing space
 2016-04-29 17:22:49 -04:00
The_Grits
aaf4ee5b49 oops lol 
Gotta love those duplicate lines!
 2016-04-29 17:18:09 -04:00
The_Grits
09775ad4a5 Squash and Merge 2016-04-29 17:15:26 -04:00
Matthew Taylor
f7d31b547b Merge branch 'TheGrits-patch-3' into develop 
* TheGrits-patch-3:
  Disable mobile Safari phone numbers
 2016-04-29 16:40:54 -04:00