scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-12-11 16:21:04 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
607 commits 220 branches 1 tag 506 MiB
Commit graph

204 commits

Author SHA1 Message Date
Matthew Taylor
a44894be6d Merge pull request #191 from mewtaylor/issue/95-message-notification-persists 
WIP #95 – Reset `unreadMessageCount` state
 2015-11-03 09:48:57 -05:00
Matthew Taylor
b2d05a996f Reset unreadMessageCount state 
1. When the component is unmounted
2. When the user's state changes to logged out

I think this should fix any state-side issues with the persistence for #95.
 2015-11-02 22:31:27 -05:00
Matthew Taylor
311c156947 Add missing translations to en.json 
Also add `Search` to translatable strings
 2015-10-30 10:05:08 -04:00
Andrew Sliwinski
18cd13701f Merge pull request #186 from mewtaylor/issue/180-clear-homepage-cache 
#180 – Use xhr to clear cache instead of form
 2015-10-29 18:36:00 -04:00
Matthew Taylor
d897d4387d Use xhr to clear cache instead of form 
because csrf. also, since we don't have a definite message/banner system in place yet, use the button itself for feedback rather than messages. The button will disable if it has been successfully used, or turn pink if there was an error (and it will not be disabled in that case).
 2015-10-29 10:28:32 -04:00
Ray Schamp
ac3fcd0096 Fix GH-177: Lower z-index for banners to 9 
The navigation is at 10, so we want the banners to be underneath that.
 2015-10-26 13:29:07 -04:00
Ray Schamp
b7f795f2d9 Merge pull request #139 from rschamp/feature/email-confirmation-banner 
Add email confirmation banner to homepage
 2015-10-25 12:19:42 -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
8014925cce Merge branch 'develop' of https://github.com/LLK/scratch-www into bugfix/GH-148 
# By Ray Schamp
# Via Andrew Sliwinski (2) and Ray Schamp (2)
* 'develop' of https://github.com/LLK/scratch-www:
  Fix GH-168: Rehabilitate the `Modal` props.style
  Fix GH-162: Show "user deletion canceled" modal
  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

# Conflicts:
#	src/components/registration/registration.jsx
 2015-10-25 09:11:43 -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
a2327632a5 Handle relaunch requests from the iframe 
Only attach the message listener when the modal is displaying. This prevents multiple listeners being set up by multiple registration components on the page.

Also, scope the `onMessage` handler to that component's iframe, so that we don't respond to other component's messages.
 2015-10-24 18:41:13 -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
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
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
99d7055a48 Fix GH-124: Fix studio thumbnail URLs 2015-10-24 12:20:59 -04:00
Ray Schamp
39550d805a Fix #152: Don't output activity without a message 2015-10-23 17:41:50 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
Ray Schamp
65734a9577 Adapt to upgraded react-modal style handling 2015-10-20 19:28:28 -04:00
Ray Schamp
66105f989c Re-enable join click handler 2015-10-20 17:58:28 -04:00
Matthew Taylor
5d4dbf638c Merge pull request #90 from mewtaylor/issue/update-language-footer 
Use language dropdown form to change language
 2015-10-20 16:52:42 -04:00
Matthew Taylor
7e4555e6b6 Use language dropdown form to change language 
xhr was not updating the session/cookie for some reason. So just force state change, and force form submission to change language
 2015-10-20 16:51:30 -04:00
Ray Schamp
804241a544 Merge pull request #87 from rschamp/bugfix/fix-login 
Use ReactDOM.findDOMNode for login field values
 2015-10-20 15:44:09 -04:00
Ray Schamp
13ee5ad86d Use ReactDOM.findDOMNode for login field values 
The direct reference didn't work as expected I think because we're nesting the `input` within our own `Input` components.
 2015-10-20 15:24:56 -04:00
Ray Schamp
6259cb5b97 Pull homepage rows from the API 
Not localized yet
 2015-10-20 14:49:25 -04:00
Ray Schamp
abfb485560 Merge pull request #83 from mewtaylor/issue/65-splash-activity-hookup 
Get *What's Happening?* box data from api
 2015-10-20 13:59:46 -04:00
Matthew Taylor
22e8ceca5e Activity with current friends-activity format 
This updates `activity.jsx` to handle the current `friends-activity` format (which is a bit hacky atm), and uses `FormattedRelative` to handle relative timestamps
 2015-10-20 13:41:17 -04:00
Andrew Sliwinski
0868a70f00 Remove unused responsive styles from modal.scss 2015-10-20 13:13:08 -04:00
Matthew Taylor
6c34e0bc6a get message count at minute intervals 2015-10-20 10:25:28 -04:00
Ray Schamp
bde208e16b Merge pull request #76 from mewtaylor/refactor/set-language-via-api 
Use api to set language instead of cookie
 2015-10-19 20:39:45 -04:00
Andrew Sliwinski
8647d01e1f Merge pull request #75 from mewtaylor/bugfix/define-format-message 
Define `formatMessage` when used.
 2015-10-19 20:37:24 -04:00
Andrew Sliwinski
dae7288395 Merge pull request #73 from rschamp/feature/login-captcha-redirect 
Redirect to CAPTCHA when too many login attempts fail
 2015-10-19 20:34:10 -04:00
Matthew Taylor
010109a767 Use api to set language instead of cookie 
just to be safe. But i'm leaving in the `set` method of `jar.js` so we can easily move to it in the future.
 2015-10-19 19:49:24 -04:00
Matthew Taylor
e9d24b083a define formateMessage 
I was forgetting to define it, like is done in `activity.jsx`. I was also incorrectly interpreting the documentation
 2015-10-19 19:36:56 -04:00
Ray Schamp
70f06b6be8 Redirect to CAPTCHA when too many attempts fail 2015-10-19 16:36:46 -04:00
Matthew Taylor
43786861c8 Add AdminPanel component 
And include it on the splash page.
 2015-10-19 14:55:38 -04:00
Matthew Taylor
58ef98016a General cleanup 2015-10-16 15:10:27 -04:00
Matthew Taylor
997b94a91c Merge branch 'develop' into feature/react-intl 
* develop:
  Fix 'M' issue in Firefox
  Widen modal to account for tooltip overflow
  Name Registration component
  Refresh session, close popup after registration
  Add standalone legacy registration iframe

# Conflicts:
#	server/proxies.json
#	src/components/navigation/navigation.jsx
 2015-10-16 11:14:45 -04:00
Matthew Taylor
c1de837595 Add formatted messages 
only to components and things that will be going out in the first deploy
 2015-10-16 11:04:01 -04:00
Matthew Taylor
d0b22d0f97 Forgot to include these as part of init restructure 2015-10-16 11:02:41 -04:00
Matthew Taylor
567067ce88 Make LanguageChooser isolated in funcitonality 
and only set cookie client side, rather than using the post request
 2015-10-16 11:01:40 -04:00
Matthew Taylor
be5d8cd3eb use po2icu to get po files as json icu files 2015-10-15 23:02:57 -04:00
carljbowman
694d8a7597 Fix 'M' issue in Firefox 
Set fixed 'text-indent' to push content out of the navigation element.
 2015-10-15 15:26:33 -06:00
Ray Schamp
f44e0b249a Widen modal to account for tooltip overflow 2015-10-15 11:13:31 -06:00
Ray Schamp
8b8aa0ee48 Name Registration component 2015-10-15 11:13:31 -06:00
Ray Schamp
fcec859cbe Refresh session, close popup after registration 2015-10-15 11:13:31 -06:00
Ray Schamp
6b1ce8549e Add standalone legacy registration iframe 2015-10-15 11:13:02 -06:00
Ray Schamp
d3b8c2085e Add the language dropdown, it almost works 2015-10-15 11:48:03 -04:00
Matthew Taylor
54920f5e9f Merge branch 'develop' into feature/upgrade-react-0.14 
* develop:
  Avoid class name conflict on login li
  Update Hover JS fuctions with intative naming
  Remove extra white space on HOC Landing
  Add Collaborators and Logos
  Add CN Logo to Hide & Seek asset
  Remove excess/unused CSS
  Update HOC with Banner Hoverstates & Assets
 2015-10-14 23:03:01 -04:00
Matthew Taylor
c3b62c8f05 Update core react dependencies 2015-10-14 22:59:38 -04:00
Ray Schamp
1696921354 Avoid class name conflict on login li 2015-10-14 15:02:36 -06:00
Andrew Sliwinski
f3d6a273fb Resolve merge conflict 2015-10-13 15:57:55 -04:00
Ray Schamp
79a8d771d6 Merge pull request #52 from rschamp/feature/selenium-entry 
Make app more transparent to Selenium
 2015-10-13 13:32:14 -06:00
Andrew Sliwinski
605e8236d6 Merge pull request #53 from rschamp/feature/identify-things 
Identify all nav items
 2015-10-13 08:55:35 -04:00
Andrew Sliwinski
840a84147a Merge pull request #48 from rschamp/feature/ego-- 
Fix GH-39: use the current user's profile URL
 2015-10-13 08:46:40 -04:00
Ray Schamp
6a967026de Identify all nav items 2015-10-09 14:42:47 -06:00
Ray Schamp
da9174c520 Make app more transparent to Selenium 2015-10-09 14:16:37 -06:00
Ray Schamp
3b51c5cb27 Merge pull request #43 from rschamp/feature/named-exports 
Name all the exports for easier debugging
 2015-10-09 10:44:41 -06:00
Ray Schamp
f613255cc7 Fix GH-39: use the current user's profile URL 2015-10-09 10:43:41 -06:00
Ray Schamp
2affa1b77e Name all the exports for easier debugging 2015-10-08 14:25:18 -06:00
Ray Schamp
347ff4fe71 Fix GH-37: Construct project urls correctly 2015-10-08 13:55:31 -06:00
Ray Schamp
d457897971 Merge pull request #34 from rschamp/bugfix/navigation-quirks 
Fix navigation quirks
 2015-10-08 10:46:49 -06:00
Ray Schamp
0f395255b0 Fix GH-23: link Explore to 30 day view 2015-10-07 22:40:03 -04:00
Ray Schamp
0251932631 /# is for suckers. preventDefault all the things 2015-10-07 22:40:02 -04:00
Ray Schamp
3d7f5ee66b Fix GH-21: toggle dropdown when clicking Sign in 2015-10-07 22:40:02 -04:00
Ray Schamp
4e38c1a050 Fix GH-25: close dropdowns on login/logout 2015-10-07 22:36:11 -04:00