scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-30 10:58:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
14064 commits 216 branches 1 tag 480 MiB
Commit graph

14064 commits

This branch
This branch
All branches
Author SHA1 Message Date
Andrew Sliwinski
38216adce2 Merge pull request #12 from carljbowman/navigation-user-info 
Update User Info and Assets in Navigation
 2015-09-24 09:30:41 -04:00
carljbowman
1c6720b123 Update User Info and Assets in Navigation 2015-09-23 09:57:20 -04:00
Ray Schamp
f429140b07 Fix indentation 2015-09-22 10:26:20 -04:00
Ray Schamp
54cca4ef96 Don't lint json in providers 2015-09-22 10:26:20 -04:00
Ray Schamp
d6576409f1 Something like session handling 2015-09-22 10:26:19 -04:00
Ray Schamp
438919ac72 Heed warnings about giving children keys 2015-09-22 10:23:47 -04:00
Ray Schamp
89d64fa743 Use the right local port for www 2015-09-22 10:22:18 -04:00
carljbowman
e93b47285a Merge pull request #10 from carljbowman/navigation 
Navigation
 2015-09-21 13:42:01 -04:00
carljbowman
f5351b651a Removing Extra spaces from Button 2015-09-21 12:25:50 -04:00
carljbowman
d3ebcd6744 Replacing Tabs with Spaces 2015-09-21 11:32:17 -04:00
Andrew Sliwinski
5906e828b6 Merge pull request #5 from thisandagain/activity 
Add stub for 'Activity' component
 2015-09-21 11:08:29 -04:00
Andrew Sliwinski
8c3a3336f4 Remove trailing whitespace 2015-09-21 10:48:47 -04:00
Andrew Sliwinski
ed8ff0cad2 More format module to ./src/lib 2015-09-21 10:48:06 -04:00
Andrew Sliwinski
a85db60610 Resolve merge conflicts 2015-09-21 10:44:58 -04:00
carljbowman
e8bfa13a4f Updates based on PR Feedback 
- Removed Commented SCSS in Main
- Doubled checked Spaces over Tabs
 2015-09-21 09:52:53 -04:00
carljbowman
9a67d3fb98 Navigation WIP 2015-09-21 09:18:00 -04:00
Andrew Sliwinski
fc7f9bb300 Merge pull request #9 from thisandagain/develop 
Add deployment configuration
 2015-09-19 19:53:14 -04:00
Andrew Sliwinski
5eca8d03ae Add deployment configuration 2015-09-19 19:25:54 -04:00
Colby Gutierrez-Kraybill
56178f2b6c No console.log, how about a process.stdout.write instead. 2015-09-16 15:14:54 -04:00
Colby Gutierrez-Kraybill
95c6cd2a06 okay eslint. 2015-09-16 15:11:48 -04:00
Colby Gutierrez-Kraybill
1cf6cedaee Initial nginx config generation, can use environment variabes PORT and SERVER_NAME. Dynamically figures out static regex based on build directory 2015-09-16 15:09:15 -04:00
Ray Schamp
df1c214a01 Merge pull request #7 from rschamp/login 
Add log in component and basic functionality for logging in
 2015-09-16 10:33:25 -04:00
Ray Schamp
271dfa2fd9 Use classnames package to manage classnames 
https://facebook.github.io/react/docs/class-name-manipulation.html
 2015-09-16 10:14:00 -04:00
Ray Schamp
93d4638a04 Fix intro link spacing 2015-09-14 16:14:41 -04:00
Ray Schamp
ab85004e4e Add logged in state and dropdown 2015-09-14 16:14:40 -04:00
Ray Schamp
e1d3396019 Add login component 2015-09-14 16:14:40 -04:00
Ray Schamp
a4a96c9cc0 Add a dropdown component to the nav 2015-09-14 16:14:40 -04:00
Ray Schamp
e36bef3bce Use consistent quote style 2015-09-14 16:14:40 -04:00
Ray Schamp
a2ffa76b1d Enforce consistent function style 2015-09-14 16:14:40 -04:00
Ray Schamp
c4d7cdbdb2 Enforce no trailing spaces 2015-09-14 16:14:40 -04:00
Colby Gutierrez-Kraybill
003039dd47 avoid view if static 2015-09-14 16:03:39 -04:00
Colby Gutierrez-Kraybill
4b6cc3dfa2 Putting simplified version of 'resolve' in routes.json and modifying .eslintrc to create a convention that any variable matching ^_ (starts with _) will be excempt from the variable used check. 2015-09-14 13:36:00 -04:00
Colby Gutierrez-Kraybill
2e1cd7b7d7 To avoid JSLint warning on var path being assigned but never used (it's used in eval()), putting a rather ugly solution directly into the the 'resolve' property of the routes.json 2015-09-14 13:17:50 -04:00
Colby Gutierrez-Kraybill
393552bd46 Adding annotations to routes.json and correct interpreting code to include information about static assets. Will be used by routes-to-nginx-conf for building nginx regex patterns 2015-09-14 12:16:58 -04:00
Andrew Sliwinski
724551b40c Merge pull request #6 from rschamp/intro 
Add homepage intro component
 2015-09-10 17:13:09 -07:00
Ray Schamp
52c91e2c2e Format the project count 2015-09-09 22:30:53 -04:00
Ray Schamp
f76374b24e Add an "intro" component to the homepage 2015-09-09 22:26:07 -04:00
Ray Schamp
27fc9ff012 Add a modal component, extending react-modal 
Also fix some z-index quirks
 2015-09-09 22:26:06 -04:00
Ray Schamp
4a43d23720 Merge pull request #4 from rschamp/featured 
Add featured projects/studio row components to homepage
 2015-09-09 12:50:41 -04:00
Ray Schamp
b4147a8d53 Resolve feedback from PR, fix stylistic issues 2015-09-09 10:01:10 -04:00
Andrew Sliwinski
826ed270e5 Add stub for 'Activity' component 2015-09-08 19:54:55 -07:00
Ray Schamp
730e440ee6 Add example feature content to splash 2015-09-08 18:15:02 -04:00
Ray Schamp
d53a84925d Fix carousel styling for box container 2015-09-08 15:10:25 -04:00
Ray Schamp
a02c73ddf2 Add carousel component 2015-09-08 14:56:54 -04:00
Ray Schamp
2b2029f335 Add a command to stop the watch command 2015-09-08 14:56:54 -04:00
Andrew Sliwinski
27f0a305ff Merge pull request #3 from thisandagain/news 
News Component
 2015-09-08 09:20:57 -07:00
Andrew Sliwinski
d780e43ae3 Clean-up 'more' section in box component as per R 2015-09-08 09:05:27 -07:00
Andrew Sliwinski
67d95554cb Resolve lint error 2015-09-08 07:58:27 -07:00
Andrew Sliwinski
02d38c513a Resolve feedback from review. 2015-09-08 07:54:15 -07:00
Andrew Sliwinski
2835d6d34f Merge branch 'develop' into news 2015-09-06 16:19:19 -07:00