Commit graph

2769 commits

Author SHA1 Message Date
Matthew Taylor
fd8515668f Merge pull request #144 from mewtaylor/issue/122-register-from-gobo
Add registration component to `JOIN SCRATCH`
2015-10-23 13:38:19 -04:00
Matthew Taylor
1a156cc2a4 Merge pull request #147 from mewtaylor/issue/130-studio-arrow-fix
Handle arrow display dynamically in carousel component
2015-10-23 13:28:41 -04:00
Matthew Taylor
317b520220 Handle arrow display dynamically
And handle specific case for studio homepage row. Fixes #130 and also stuff left over from #105
2015-10-23 13:28:11 -04:00
carljbowman
3034abc2b4 Update arrow icons on Carousels
Had to overwrite slick-slider's iconfont with background image for a quick fix.
2015-10-23 13:05:48 -04:00
Ray Schamp
fbd2ebd3d4 Deploy from Travis 2015-10-23 12:11:03 -04:00
Colby Gutierrez-Kraybill
3bf5f8b96c Adjust nitpicks, remove whitespace in (), add around + 2015-10-23 10:43:30 -04:00
Ray Schamp
9b587acc38 Merge pull request #145 from mewtaylor/bugfix/thumbnail-username-same-line
Display title and extras differently
2015-10-23 09:15:12 -04:00
Matthew Taylor
438401bde0 display title and extras differently
So that the creator username appear on the same line as other text, but so that studio titles still get cut off properly
2015-10-23 09:01:01 -04:00
Andrew Sliwinski
7e2751be62 Merge pull request #142 from mewtaylor/issue/forward-accept-language
Explicitly set `Accept-Language` to cookie lang
2015-10-23 08:50:44 -04:00
Andrew Sliwinski
9374d917dc Merge pull request #140 from rschamp/feature/remove-session-listener-on-unmount
Remove the session listener on unmount
2015-10-23 08:48:56 -04:00
Andrew Sliwinski
3545ed9382 Merge pull request #135 from carljbowman/Splash-Page-tweaks
Update spacing on Splash page elements
2015-10-23 08:48:20 -04:00
Matthew Taylor
237e663794 Add registration component to JOIN SCRATCH
fixes #122
2015-10-23 08:33:07 -04:00
Matthew Taylor
714355349f Explicitly set Accept-Language to cookie lang
So that xhr requests to scratchr2 can get the right language
2015-10-22 23:36:57 -04:00
Ray Schamp
be6358fba9 Merge pull request #138 from rschamp/feature/welcome-panel
Add welcome panel component to homepage
2015-10-22 22:42:47 -04:00
Ray Schamp
ce3fd38a10 Remove the session listener on unmount
This will prevent bugs if we ever use the mixin on a component that isn't a view
2015-10-22 20:57:04 -04:00
Ray Schamp
cb2f639d07 Localize the welcome panel 2015-10-22 20:55:17 -04:00
Ray Schamp
b6a6b7faad WIP 2015-10-22 18:40:04 -04:00
carljbowman
87b583dc58 Update spacing on Splash page elements
Added some spacing love to Intro, Video, and Carousel elements.
2015-10-22 17:44:49 -04:00
Ray Schamp
429aa03507 Add dismissable email confirmation banner 2015-10-22 17:19:31 -04:00
Ray Schamp
af415e1bf3 Set template cue to dismiss welcome panel 2015-10-22 17:17:27 -04:00
Colby Gutierrez-Kraybill
bec911f0a8 Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions 2015-10-22 15:12:38 -04:00
Colby Gutierrez-Kraybill
b33645beda Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions 2015-10-22 15:05:55 -04:00
Andrew Sliwinski
b200f94d6b Merge pull request #125 from carljbowman/HOC-Updates
Update: Make entire project "card" a link
2015-10-22 14:32:37 -04:00
Ray Schamp
58d3ed4ecb Add welcome component and show it conditionally
Move some of the colors used on the splash page into _colors.scss so they can be reused.
2015-10-22 12:21:47 -04:00
carljbowman
dc13d63d2e Update entire Tutorial cards to be clickable
Wrapped the Tutorial cards in link tags, rather than just the button.
2015-10-22 10:34:18 -04:00
Matthew Taylor
36eff8a9db Merge pull request #117 from mewtaylor/issue/105-hide-carousel-arrows
Override `Slider`'s `arrows` setting by row length
2015-10-22 09:15:40 -04:00
Andrew Sliwinski
5b804af280 Merge pull request #99 from rschamp/feature/build-travis-build
Test the build when we test our build
2015-10-22 08:33:41 -04:00
Andrew Sliwinski
7ce053e810 Merge pull request #121 from thisandagain/bugfix/96
Add window.Intl polyfill. Resolves GH-96
2015-10-22 08:33:19 -04:00
Andrew Sliwinski
d86703e5db Add window.Intl polyfill. Resolves GH-96 2015-10-21 20:49:31 -04:00
Matthew Taylor
fe96c6fa71 Override Slider's arrows setting by row length
If the row length is less than `slidesToShow`, don't show the arrows.
2015-10-21 16:49:50 -04:00
Matthew Taylor
1c567574d5 Merge pull request #114 from mewtaylor/issue/103-truncate-thumb-username
use ellipsis if text overflows
2015-10-21 16:22:54 -04:00
Ray Schamp
713317cb09 Merge pull request #115 from rschamp/feature/organize-splash-methods
Organize view methods
2015-10-21 15:23:27 -04:00
Matthew Taylor
a40915c60a use ellipsis if text overflows and urlify username
fixes #103 and #113
2015-10-21 15:22:59 -04:00
Ray Schamp
345540aa20 Organize view methods
Proposing this ordering: attributes, lifecycle, getters, handlers, rendering
2015-10-21 15:12:41 -04:00
Ray Schamp
41770ad549 Merge pull request #94 from thisandagain/bugfix/messages
Fix messages XHR request and prop defaults
2015-10-21 14:54:32 -04:00
Ray Schamp
0e515c14f4 Merge pull request #112 from mewtaylor/issue/108-scratched-caps
Capitalize `ScratchEd`
2015-10-21 14:47:48 -04:00
Matthew Taylor
05cfb5e9da Capitalize ScratchEd
Fixes #108
2015-10-21 14:46:51 -04:00
Ray Schamp
b847777d09 Merge pull request #111 from rschamp/feature/hide-empty-rows
Only display custom rows that exist and have items
2015-10-21 14:34:37 -04:00
Ray Schamp
8df5e41991 Only display custom rows that exist and have items 2015-10-21 14:27:29 -04:00
Ray Schamp
60a9681f3f Merge pull request #104 from rschamp/bugfix/message-count
Fix GH-97: Grow message bubble with count
2015-10-21 14:17:07 -04:00
Matthew Taylor
20a3efcbf4 Merge pull request #106 from mewtaylor/feature/project-count-from-api
Get project count from api when logged out
2015-10-21 14:17:03 -04:00
Matthew Taylor
43ea666141 Get project count from api when logged out 2015-10-21 14:12:34 -04:00
Ray Schamp
849cc30e1a Fix GH-97: Grow message bubble with count 2015-10-21 14:07:18 -04:00
Ray Schamp
07e1a96811 Test the build when we test our build
Use webpack --bail to actually return 1 when the build fails
2015-10-21 13:43:26 -04:00
Andrew Sliwinski
9ed814cbda Default admin panel to closed 2015-10-20 21:53:24 -04:00
Andrew Sliwinski
2553c69653 Set 'black' default props for thumbnails and carousel 2015-10-20 21:33:00 -04:00
Andrew Sliwinski
5960f72e81 Remove localhost from api call for message count 2015-10-20 21:22:54 -04:00
Ray Schamp
737a53294d Merge pull request #93 from rschamp/bugfix/fix-joining
Fix registration, fix upgraded react-modal
2015-10-20 19:45:29 -04:00
Ray Schamp
cad69eb33e Remove mixin import
ht @thisandagain
2015-10-20 19:38:43 -04:00
Ray Schamp
715ef7d675 Lint 2015-10-20 19:35:19 -04:00