Connor Hudson
7de13d029b
get rid of carousel, make things centered if they need it
2016-06-23 15:46:02 -04:00
Connor Hudson
6d3d8b7446
more styling
2016-06-23 13:48:18 -04:00
Connor Hudson
c52a6e16e9
attempted mobile styling
2016-06-23 13:18:45 -04:00
Connor Hudson
230cadffa5
more styling, carousel
2016-06-22 16:48:58 -04:00
Connor Hudson
dd249e8b88
add assets for teacher page
2016-06-22 13:18:47 -04:00
Connor Hudson
9c14f7cb3f
create landing page
2016-06-22 13:18:19 -04:00
Connor Hudson
5d12e5773d
Merge pull request #584 from technoboy10/gh554-localize-faq
...
Fix GH-554: Localize FAQ title
2016-06-17 14:47:46 -04:00
Matthew Taylor
b337b47590
Merge pull request #586 from mewtaylor/issue/conference-updates
...
Fix GH-[571,563] – updates to the conference site
2016-06-17 14:14:53 -04:00
Matthew Taylor
f0b178c290
Merge pull request #583 from mewtaylor/issue/gh-541-faq-schools
...
Fix GH-541: Add "schools" section to faq
2016-06-17 09:39:41 -04:00
Matthew Taylor
32e9b089c5
updates to the conference site
...
1. new collaborators
2. new sold out language
3. some copy edits
2016-06-16 17:07:22 -04:00
Connor Hudson
1e571d0e2d
localize FAQ title
2016-06-16 15:11:43 -04:00
Matthew Taylor
f5cbdfa2c9
Merge pull request #582 from mewtaylor/issue/teacher-faq
...
Add teacher faq page
2016-06-16 11:31:29 -04:00
Connor Hudson
c188a268e2
Merge pull request #568 from TheGrits/patch-1
...
Fix gh-555: Squished News Icons
2016-06-16 11:17:44 -04:00
Matthew Taylor
b13a388425
Fix typo
...
thanks @technoboy10!
2016-06-16 10:54:35 -04:00
Matthew Taylor
8ef3acd5d9
Merge pull request #560 from mewtaylor/issue/gh-556-footer
...
Fix GH-556: Add "For Developers" to the footer
2016-06-16 10:28:19 -04:00
Matthew Taylor
098bc8618a
Merge pull request #577 from mewtaylor/issue/gh-573-grid-align
...
Fix GH-573: center align grid while left aligning projects
2016-06-16 10:24:53 -04:00
Matthew Taylor
b828200e94
add teacher faq page
2016-06-16 10:22:37 -04:00
Matthew Taylor
2ea2cfa6c5
Add "schools" section to faq
2016-06-15 15:22:41 -04:00
Matthew Taylor
ba5d8e0d63
Merge pull request #558 from mewtaylor/issue/gh-543-teacher-banner
...
Fix GH-543: Add teacher banner to splash page
2016-06-15 10:09:11 -04:00
Matthew Taylor
626b3f008e
Merge branch 'develop' of https://github.com/LLK/scratch-www into issue/gh-543-teacher-banner
...
* 'develop' of https://github.com/LLK/scratch-www : (29 commits)
Add explore redirects
Allow access to 2014 and 2015 pages
use route aliases for generalizable route patterns
remove `/components` from `routes.json`
Remove Make it Fly banner
Fix issues in FAQ of /developers page.
move shuffle to utility module
fix error with shuffleArray function
add shuffleArray function, shuffle most loved and most remixed
use `image` to get studio thumbnail
quick formatting fix for box header on search
Fix merge issue
Add localizations, minor style changes
Removed rows from grid, changed explore tabs
Removed extraneous image file
Whitespace added
Small fix
Support for studios
Refactoring, new grid component
Style changes
...
# Conflicts:
# src/views/splash/splash.jsx
# src/views/splash/splash.scss
2016-06-15 09:45:05 -04:00
Matthew Taylor
2f359c1d92
Merge pull request #576 from mewtaylor/issue/gh-574-explore-redirect
...
Fix GH-574: Add explore redirects
2016-06-15 09:36:51 -04:00
Matthew Taylor
2193914650
center align grid while left aligning projects
...
Fixes #573
2016-06-15 09:34:15 -04:00
Matthew Taylor
311f431ca1
Add explore redirects
...
for `/explore`, `/explore/projects` and `/explore/studios` to `/explore/<projects|studios>/all`
2016-06-15 08:19:27 -04:00
Matthew Taylor
55765551ae
Merge pull request #570 from mewtaylor/bugfix/fastly-condition
...
Bugfix: shorten fastly condition
2016-06-14 13:16:52 -04:00
Matthew Taylor
60187d4a75
Allow access to 2014 and 2015 pages
2016-06-14 12:42:13 -04:00
Matthew Taylor
dfc4f9574d
use route aliases for generalizable route patterns
...
1. match all `^/explore` to www
2. match all `^/search` to www
3. match all `^/conference` to www
2016-06-14 11:28:20 -04:00
Matthew Taylor
45d78b9c7c
remove /components
from routes.json
...
It's a dev-only route, and is in `dev-routes.json` already
2016-06-14 11:26:17 -04:00
The_Grits
1785c767b4
whoops
2016-06-13 15:37:31 -04:00
The_Grits
554dcb100c
Fix gh-555: Squished News Icons
2016-06-13 15:06:41 -04:00
Ray Schamp
01b662f77f
Merge pull request #567 from rschamp/hotfix/remove-banner
...
[Develop] Remove Make it Fly banner
2016-06-13 14:43:37 -04:00
Ray Schamp
e2dcd6c647
Remove Make it Fly banner
...
This reverts commit 7cf3846231
, reversing
changes made to afe14ebe88
.
2016-06-13 14:35:08 -04:00
Andrew Sliwinski
efee67770f
Merge pull request #565 from thisandagain/bugfix/apache
...
Fix issues in FAQ of /developers page.
2016-06-13 13:59:49 -04:00
Andrew Sliwinski
e05572dc0a
Fix issues in FAQ of /developers page.
2016-06-13 11:38:11 -04:00
Connor Hudson
d7c78bd234
Merge pull request #562 from technoboy10/gh123-randomize-rows
...
Fix GH-123: Shuffle top loved and top remixed
2016-06-13 10:38:18 -04:00
Matthew Taylor
e04b314656
remove dashes
...
Thanks @rschamp!
2016-06-13 10:07:00 -04:00
Matthew Taylor
5b73c4192d
change name to getUnsignedValue
...
thanks @rschamp!
2016-06-13 10:06:43 -04:00
Matthew Taylor
0c2a73a910
Don't use dash in name
...
It's used for grouping in `build-locales`.
2016-06-13 09:41:12 -04:00
Connor Hudson
fde193ca06
move shuffle to utility module
2016-06-13 09:40:32 -04:00
Matthew Taylor
e5f274933b
Add final copy for teacher account banner
2016-06-13 07:47:43 -04:00
Connor Hudson
3d6a95e84b
fix error with shuffleArray function
2016-06-09 17:33:49 -04:00
Connor Hudson
04166ab423
add shuffleArray function, shuffle most loved and most remixed
2016-06-09 17:22:31 -04:00
Matthew Taylor
e5467e5f45
Add "For Developers" to the footer
...
Fixes #556
2016-06-09 11:54:14 -04:00
Matthew Taylor
ce02c82665
Merge pull request #559 from mewtaylor/feature/explore-from-rthorn
...
Explore and Search Pages from rthorn
2016-06-09 11:03:46 -04:00
Matthew Taylor
ef0037942e
use image
to get studio thumbnail
...
same as with `project`
2016-06-09 09:44:09 -04:00
Matthew Taylor
b065ed5254
quick formatting fix for box header on search
2016-06-09 07:57:41 -04:00
Matthew Taylor
365c3d0bad
Fix merge issue
2016-06-09 07:44:28 -04:00
Matthew Taylor
9fad938eb8
Add localizations, minor style changes
2016-06-09 07:32:25 -04:00
Matthew Taylor
ac17850491
Add teacher banner to splash page
...
This only shows if the logged in user is a teacher, and persists for teachers.
2016-06-08 13:47:11 -04:00
Matthew Taylor
0894724dfd
Merge branch 'develop' of https://github.com/rthorn/scratch-www into feature/explore-from-rthorn
...
* 'develop' of https://github.com/rthorn/scratch-www :
Removed rows from grid, changed explore tabs
Removed extraneous image file
Whitespace added
Small fix
Support for studios
Refactoring, new grid component
Style changes
Changed path of search page to allow for studio tabs
Changes to path for search results
Removed unnecessary files
Search page functions
Starting mock of search page
Fixed problem with loading
Load button and tabs functioning
Merge remote-tracking branch 'LLK/develop' into develop
Early Explore Page
# Conflicts:
# src/components/navigation/www/navigation.jsx
2016-06-07 09:06:01 -04:00
Matthew Taylor
ad5b534f5e
Merge pull request #551 from mewtaylor/bugfix/mobile-nav-conference
...
[Master] hotfix: mobile nav conference
2016-06-06 14:42:35 -04:00