Ray Schamp
3b729fcb0a
Move "should show banner" test to one function
2015-10-25 12:13:48 -04:00
Ray Schamp
8cde05fdc8
Fix remaining Modal styles
2015-10-25 12:13:47 -04:00
Ray Schamp
7e74c4a105
Use classNames everywhere with dynamic classNames
...
Fixes GH-141, and keeps it from being introduced on Banner
2015-10-25 12:13:23 -04:00
Matthew Taylor
ccd048893f
Merge branch 'develop' into feature/email-confirmation-banner
...
* develop:
Fix GH-168: Rehabilitate the `Modal` props.style
Fix GH-162: Show "user deletion canceled" modal
Set empty states on sign out
Clean up activity item rendering logic
Add some padding to the empty message
Make sure boxes aren't transparent
Add empty state for What's Happening box
Fix GH-124: Fix studio thumbnail URLs
Only show "Welcome" panel if user is < 2 weeks old
Fix #152 : Don't output activity without a message
Fix #102 : Add remix and love icons
Update arrow icons on Carousels
# Conflicts:
# src/components/modal/modal.jsx
# src/views/splash/splash.jsx
2015-10-25 09:05:35 -04:00
Andrew Sliwinski
b09d191dd5
Merge pull request #167 from rschamp/bugfix/GH-162
...
Fix GH-162: Show "user deletion canceled" modal
2015-10-25 05:26:06 -04:00
Andrew Sliwinski
790b765fc8
Merge pull request #169 from rschamp/bugfix/GH-168
...
Fix GH-168: Rehabilitate the `Modal` props.style
2015-10-25 05:25:59 -04:00
Ray Schamp
3963a15caa
Merge pull request #143 from rschamp/feature/empty-activity
...
Add empty state for What's Happening box
2015-10-24 18:58:53 -04:00
Ray Schamp
14fd4c5860
Fix GH-168: Rehabilitate the Modal props.style
...
This makes it more sane, and consistent with the way the react-modal `Modal` works. The old way made multiple modals on the page have the same `style` prop.
2015-10-24 17:15:03 -04:00
Ray Schamp
02cf7d0bcb
Fix GH-162: Show "user deletion canceled" modal
...
The look of the modals is all messed up. Will fix that separately.
2015-10-24 16:06:00 -04:00
Matthew Taylor
b9ecbae5ae
Merge pull request #166 from mewtaylor/issue/159-clear-activity-block
...
#159 – Set empty states on sign out
2015-10-24 14:55:06 -04:00
Matthew Taylor
eb38951f06
Set empty states on sign out
...
also make state setting a bit more uniform
2015-10-24 14:52:11 -04:00
Matthew Taylor
07bd1f215f
Move to using iframe in modal
...
like registration
2015-10-24 14:33:34 -04:00
Matthew Taylor
ade0959d94
Merge pull request #165 from rschamp/bugfix/GH-124
...
Fix GH-124: Fix studio thumbnail URLs
2015-10-24 14:03:09 -04:00
Ray Schamp
d6de9ffe37
Clean up activity item rendering logic
2015-10-24 12:44:20 -04:00
Ray Schamp
5865b6d619
Add some padding to the empty message
2015-10-24 12:38:23 -04:00
Ray Schamp
0b26be7036
Make sure boxes aren't transparent
2015-10-24 12:33:23 -04:00
Ray Schamp
c8834ed251
Add empty state for What's Happening box
2015-10-24 12:33:23 -04:00
Ray Schamp
21b7386270
Merge pull request #157 from rschamp/bugfix/GH-152
...
Fix #152 : Don't output activity without a message
2015-10-24 12:25:55 -04:00
Ray Schamp
718a6c1aae
Merge pull request #164 from rschamp/bugfix/GH-153
...
Only show "Welcome" panel if user is < 2 weeks old
2015-10-24 12:22:01 -04:00
Ray Schamp
99d7055a48
Fix GH-124: Fix studio thumbnail URLs
2015-10-24 12:20:59 -04:00
Ray Schamp
616e99c631
Only show "Welcome" panel if user is < 2 weeks old
...
Or if they've dismissed it. Fixes GH-153.
2015-10-24 12:06:16 -04:00
Ray Schamp
39550d805a
Fix #152 : Don't output activity without a message
2015-10-23 17:41:50 -04:00
Ray Schamp
29414d447b
Merge pull request #155 from rschamp/feature/remix-love-icons
...
Fix #102 : Add remix and love icons
2015-10-23 17:39:32 -04:00
Ray Schamp
717ede8afd
Fix #102 : Add remix and love icons
2015-10-23 17:07:40 -04:00
Matthew Taylor
cfb7fa0307
Merge branch 'develop' into feature/email-confirmation-banner
...
* develop:
separate out arrows var from settings object
Handle arrow display dynamically
Deploy from Travis
Adjust nitpicks, remove whitespace in (), add around +
display title and extras differently
Add registration component to `JOIN SCRATCH`
Explicitly set `Accept-Language` to cookie lang
Remove the session listener on unmount
Localize the welcome panel
Update spacing on Splash page elements
Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions
Handle sentry config and express routing/page handling errors, to do: handle uncaughtExceptions
Update entire Tutorial cards to be clickable
Add window.Intl polyfill. Resolves GH-96
Override `Slider`'s `arrows` setting by row length
use ellipsis if text overflows and urlify username
Test the build when we test our build
Default admin panel to closed
Set 'black' default props for thumbnails and carousel
Remove localhost from api call for message count
2015-10-23 15:30:13 -04:00
Ray Schamp
0b47ac87c4
Merge pull request #150 from carljbowman/Splash-Page-tweaks
...
Update arrow icons on Carousels
2015-10-23 15:18:46 -04:00
Matthew Taylor
f4d0fba079
Merge pull request #151 from mewtaylor/bugfix/make-arrows-appear
...
separate out arrows var from settings object
2015-10-23 15:15:27 -04:00
Matthew Taylor
c6095d6425
separate out arrows var from settings object
...
seems to be returning false when it shouldn't. When I was testing before it appears I was getting a cached js, so it didn't actually work.
2015-10-23 14:47:49 -04:00
Colby Gutierrez-Kraybill
9e9dc0221d
Merge pull request #132 from colbygk/feature/sentry-integration
...
Feature/sentry integration
2015-10-23 14:26:28 -04:00
Ray Schamp
e38b8a8983
Merge pull request #149 from rschamp/feature/travis-deploys
...
Deploy from Travis
2015-10-23 13:40:58 -04:00
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
