Commit graph

14410 commits

Author SHA1 Message Date
Andrew Sliwinski
e05572dc0a Fix issues in FAQ of /developers page. 2016-06-13 11:38:11 -04:00
Connor Hudson
d7c78bd234 Merge pull request 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 
2016-06-09 11:54:14 -04:00
Matthew Taylor
ce02c82665 Merge pull request 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 from mewtaylor/bugfix/mobile-nav-conference
[Master] hotfix: mobile nav conference
2016-06-06 14:42:35 -04:00
Matthew Taylor
bf1fa2934d Merge pull request from mewtaylor/bugfix/mobile-nav-conference
[Develop] hotfix: mobile nav conference
2016-06-06 11:01:12 -04:00
Connor Hudson
8022d76aaa Merge pull request from technoboy10/gh548-signout
Fix GH-548: Sign out should take effect before reload
2016-06-06 09:06:36 -04:00
Connor Hudson
75ce6378a2 remove comment 2016-06-06 08:46:28 -04:00
Connor Hudson
9c66939bc3 use defaults instead of defaultsDeep 2016-06-06 08:45:35 -04:00
Matthew Taylor
fb4464d0d4 Correction for Nichole Pinkard's name on /expect
Apologies for the copy error!
2016-06-06 08:32:48 -04:00
Matthew Taylor
fce41dc32e use row wrap instead of columns
apparently mobile doesn't like columns as much as row wrap for flexbox.
2016-06-06 08:29:51 -04:00
Matthew Taylor
8a2f4404c5 Merge pull request from mewtaylor/bugfix/conference-schedule
[Master] Hotfix: conference schedule formatting bugfixes
2016-06-03 23:05:33 -04:00
Matthew Taylor
bcec3d8fc6 Merge pull request from mewtaylor/bugfix/conference-schedule
[Develop] Hotfix: conference schedule bug fixes
2016-06-03 19:52:16 -04:00
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 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 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 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 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 from rschamp/bugfix/svgs
[Develop] Force SVG mimetype
2016-05-31 12:25:33 -04:00
Ray Schamp
7fb512f4a8 Merge pull request 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