Linda
e119cea627
Fixes GH-1435/Reduce work for translators on credits page ( #1514 )
...
* Fixes GH-1435/Make as many names as possible on credits page non-translate
* fixed the travis error that occured before
2017-09-15 17:24:41 -04:00
Matthew Taylor
1335de9b57
Direct studio activity link to the activity tab
...
Fixes #1540 by ensuring that the anchor link for studio activity is directed to the activity tab of the studio
2017-09-15 15:49:57 -04:00
Matthew Taylor
426259fbe8
Merge pull request #1542 from mewtaylor/issue/manager-thumbnail-activity
...
[Develop] Hotfix: use recipient thumbnail, not actor for manager activity
2017-09-13 14:11:50 -04:00
Matthew Taylor
d4b0207bb0
clean up stuff
2017-09-13 13:51:17 -04:00
Matthew Taylor
98cbfd638f
use recipient thumbnail, not actor for manager activity
...
Fixes an issue where the thumbnail mismatches the username presented
2017-09-13 13:47:27 -04:00
Matthew Taylor
16a5208624
Merge pull request #1477 from Petroochio/IS-1195-radio-button-tabbing
...
Fix issue 1195 registration gender tabbing
2017-09-13 08:26:37 -04:00
Matthew Taylor
556b527dc3
Merge pull request #1529 from towerofnix/fix-class-typo
...
Fix CSS class of forum post message row
2017-09-13 08:18:43 -04:00
Matthew Taylor
94ce746f9b
Merge pull request #1533 from mewtaylor/hotfix/highlight-unread-rows
...
[Develop] Hotfix: highlight unread message row in light blue
2017-09-11 10:16:04 -04:00
Matthew Taylor
057f741f89
highlight unread message row in light blue
...
This addresses issues with seeing unread notifications by highlighting them as light blue, along with more opaque icons
2017-09-11 09:59:24 -04:00
Florrie
14fd4e9a5b
Change CSS class .mod-studio-activity to .mod-forum-activity in forum post message row
2017-09-10 10:11:27 -03:00
Matthew Taylor
9f3b0c903e
Merge branch 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www into develop
...
* 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www:
remove debug message
2017-09-09 17:00:39 -04:00
Matthew Taylor
a90dd6e296
remove debug message
2017-09-09 16:59:39 -04:00
Matthew Taylor
88ea667f8c
Merge branch 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www into develop
...
* 'hotfix/fix-interval' of github.com:mewtaylor/scratch-www:
call as anonymous method
2017-09-09 16:56:05 -04:00
Matthew Taylor
ffa6b7d376
call as anonymous method
2017-09-09 16:55:43 -04:00
Matthew Taylor
35ab2ebe48
Merge pull request #1525 from mewtaylor/hotfix/fix-interval
...
[Develop] fix parentheses around interval
2017-09-09 16:03:53 -04:00
Matthew Taylor
7917f15874
fix parentheses around interval
2017-09-09 15:56:01 -04:00
Matthew Taylor
2a48f8a9a2
Merge pull request #1523 from LLK/release/messages-page
...
[Develop] Release: new notifications page
2017-09-09 01:07:59 -04:00
Matthew Taylor
d18fd0064b
change width to min-width on icon
...
fixes #1521 but no idea why **shrug**
2017-09-08 18:09:55 -04:00
Matthew Taylor
026c035af3
adjust line-height for notifications
...
this applies to the comments only
2017-09-08 14:24:59 -04:00
Matthew Taylor
9e3823e6e7
add icons to social message notifications
2017-09-08 14:10:46 -04:00
Matthew Taylor
1dffc08445
change the way invites are assigned
...
assign invites directly to the state rather than by defaults in order to ensure empty objects can be part of an update
2017-09-08 10:24:39 -04:00
Matthew Taylor
7e85d2c731
fix invite for initial
2017-09-08 09:38:47 -04:00
Matthew Taylor
b82d312dd8
make invite an array instead of an object
...
When trying to clear the invite, because invite is currently an object, it’s getting the state’s existing invite re-applied via `defaultsDeep`. Making it an array should solve this issue
2017-09-08 09:29:46 -04:00
Matthew Taylor
7a3290a2ca
show recipient for owner notification
2017-09-07 14:55:48 -04:00
Andrew Sliwinski
f3ee0443e8
Changed 'Animate a Name' educator guide link. Resolved GH-1509
2017-09-07 08:16:38 -04:00
Matthew Taylor
7945a7eff1
only dispatch count if the user is present
...
this prevents a console error
2017-09-06 14:25:44 -04:00
Matthew Taylor
ce88466ee4
tweak formatting for message content
...
helps with comment formatting
2017-09-06 11:41:26 -04:00
Matthew Taylor
2bd9b184c5
Fix GH-[1505, 1507]: hide message counter on 0 ( #1510 )
...
* Hide messages counter when at 0
fixes #1507
* check for body before looking at success
fixes #1505
2017-09-06 10:05:14 -04:00
Matthew Taylor
b77e278927
handle logout on messages page ( #1503 )
...
Go back to redirecting to splash on logout, and empty messages page too.
2017-09-05 14:31:10 -04:00
Matthew Taylor
432a6240aa
have tab link go to curator tab
2017-09-05 12:38:16 -04:00
Matthew Taylor
5772eed8f7
use lodash instead of assign
...
this fixes #1500 , since lodash works in ie11 but `assign` does not
2017-09-05 12:28:01 -04:00
Matthew Taylor
b7f1f5e913
fix comment message handling
...
add comment message to redux to access the current user, and fix the string
2017-09-05 12:06:06 -04:00
Matthew Taylor
d7fe43fad7
fix commentee assignment
2017-09-05 11:41:56 -04:00
chrisgarrity
c7eabe18c3
Merge pull request #1483 from Petroochio/gh-1470-credits-overflow
...
Fix gh-1470 Firefox Overflow on Credits Page
2017-09-05 10:15:31 -04:00
Matthew Taylor
e9f54b3fd3
use border-bottom, not top
...
this fixes an issue with comment bubble displays in firefox
2017-09-05 10:06:27 -04:00
Matthew Taylor
74400b0599
add comments to redux methods
2017-09-05 10:03:48 -04:00
Matthew Taylor
23c40c8f5e
if social messages less than 0, display 0
...
handles a caching edge case with admin messages.
2017-09-05 10:03:35 -04:00
chrisgarrity
1311de0a61
Merge pull request #1493 from chrisgarrity/gh1454-teacher-invite
...
Revise student invitation string
2017-09-05 09:57:54 -04:00
Matthew Taylor
6493052725
Use username, not user id, for profile link
2017-09-05 09:10:41 -04:00
Matthew Taylor
b62a4db590
Pass to legacy on message routes with ajax
...
Currenlty, some legacy endpoints are failing because they’re being directed to www. A similar thing happened with `/explore`, and this is the same fix
2017-09-01 14:39:47 -04:00
Matthew Taylor
71b93cb207
reduce unread count on successful admin message dismiss
2017-09-01 11:07:21 -04:00
Matthew Taylor
630ae5e462
fix formatting for numbers and for dismiss icon
...
fixes #1494
2017-09-01 11:05:29 -04:00
Matthew Taylor
3dee0e46d2
continue to use proxy msg count for now
2017-09-01 10:20:18 -04:00
Matthew Taylor
654dafdaee
fix binding for admin message dismissal
...
based on https://stackoverflow.com/questions/39009611/react-bindthis-value-in-opposite-order-on-function-declaration
2017-09-01 10:00:20 -04:00
chrisgarrity
b10b8a3d51
Revise student invitation string
...
fixes #1454 .
Changes ‘has invited you to join the class:’ sentence fragment to a complete sentence ‘Your teacher has invited you to join a class:’ to account for languages that reverse the order of subject/object.
2017-09-01 09:20:36 -04:00
Matthew Taylor
779c42717b
I think I misunderstood the xhr docs
2017-08-31 23:39:49 -04:00
Matthew Taylor
3022a565ce
json-encode body
2017-08-31 18:39:03 -04:00
Matthew Taylor
9ace64fda7
add csrf for message clear requests
2017-08-31 18:24:58 -04:00
Matthew Taylor
6dbc4abdc5
subtract admin notifications from social count
...
fallout from #1487
2017-08-31 17:48:07 -04:00
Matthew Taylor
3dd768f2f6
GH-1361: Implement Notifications Page ( #1487 )
...
* start work on www page
committing out of paranoia.
including changing splash page endpoints
* updates from feedback
thanks @rschamp! This includes:
1. splitting out messages list into a separate component (for clarity)
2. some comment/formatting adjustments for the api calls
3. removal of an extraneous property in emoji-text
* remove duplicate string declaration
* use object.assign instead of defaults deep
we don’t need deep defaults
* fix react warnings
2017-08-31 17:05:22 -04:00
Matthew Taylor
a089b664da
Merge pull request #1491 from LLK/release/2.2.24
...
[Develop] Release 2.2.24
2017-08-31 13:41:15 -04:00
Matthew Taylor
38d79df894
Change header for download page
...
follow up from https://github.com/LLK/scratch-www/pull/1475#issuecomment-326034683
2017-08-30 12:58:08 -04:00
The_Grits
9942e91175
Add Tracy Tang ( #1489 )
2017-08-29 22:41:10 -04:00
Peter Gyory
59435d9ec6
Fix gh-1470 Firefox Overflow on Credits Page
...
Add specific style on credits page to allow for word wrap
2017-08-23 14:43:18 -06:00
Ken
a5cf7c60d6
Correct “WeDo” case
2017-08-23 10:49:25 +08:00
The_Grits
21210e1fa5
Re-Add Community Moderator ( #1480 )
2017-08-22 19:25:31 -04:00
Ken
0f1bd3df17
Update text for “learn more” links ( #1478 )
...
* Update text for “learn more” links
* Remove “Scratch” from string
2017-08-22 09:51:21 -04:00
St19_Galla
283572ed29
Fix gh-1472 & gh-1473: FAQ Updates ( #1475 )
...
* various updates
* adding 2.0
2017-08-21 18:55:56 -04:00
Peter Gyory
69effaac79
Fix issue 1195 registration gender tabbing
...
Add focus highlight scss for radio buttons
on demographic registration step
2017-08-21 15:13:49 -06:00
St19_Galla
ad25e09980
Add Ellen Daoust
2017-08-16 13:39:17 -04:00
Ken
6dc5bfa788
Update credits ( #1451 )
...
Fixes #1450
Thanks @Kenny2github
2017-08-09 08:36:48 -04:00
chrisgarrity
6743364447
Merge pull request #1446 from St19Galla/patch-5
...
Fix #1444 : Change Things to Try to Tips
2017-08-09 08:28:10 -04:00
St19_Galla
b087874859
Update landing.jsx
2017-08-02 23:43:44 -04:00
St19_Galla
3f0f4d23e7
Update landing.jsx
2017-08-02 23:42:17 -04:00
Matthew Taylor
b13c76e1ea
Merge pull request #1436 from TheGrits/patch-4
...
Fix gh-1433: Fix Gunicorn Link
2017-08-02 08:31:05 -04:00
Matthew Taylor
1cda176c9e
Merge pull request #1434 from LiFaytheGoblin/issue/gh-1432-Addition_to_Credits_Page
...
Added JT Galla to the Credits Page under 'Aknowledgements'
2017-07-31 15:15:33 -04:00
Ray Schamp
3e371f5511
Merge branch 'develop' into jobs
2017-07-31 15:15:05 -04:00
Ray Schamp
e369a439e3
Add Senior Backend Engineer job posting
2017-07-31 14:47:56 -04:00
Matthew Taylor
fcb635b5a9
Merge pull request #1443 from St19Galla/patch-4
...
Fix gh-1442: Remove Moderator Position
2017-07-31 14:16:05 -04:00
St19_Galla
c472699dbe
Update landing.jsx
2017-07-31 11:22:24 -04:00
Matthew Taylor
52a968f6ce
Merge pull request #1427 from TheGrits/patch-3
...
Alphabetize Routes List v2
2017-07-31 08:07:30 -04:00
Matthew Taylor
5bd66cd628
Merge pull request #1439 from TheGrits/patch-5
...
Fix gh-1438: Update Community Guidelines
2017-07-28 15:35:24 -04:00
Matthew Taylor
d285cb08d7
Merge pull request #1443 from St19Galla/patch-4
...
Fix gh-1442: Remove Moderator Position
2017-07-28 14:00:13 -04:00
St19_Galla
dd9386b8e8
TTT -> Tips
2017-07-28 13:49:41 -04:00
St19_Galla
2cf2e7e951
Remove Moderator Position
2017-07-27 11:30:39 -04:00
The_Grits
d8a62719cb
Update Community Guidelines
2017-07-26 14:49:17 -04:00
The_Grits
0d76d58f5f
Make donate a redirect
2017-07-26 10:26:32 -04:00
The_Grits
487fd1b47a
Fix Gunicorn Link
2017-07-25 20:38:03 -04:00
LiFaytheGoblin
f9a9130351
Added JT Galla to the Credits Page under 'Aknowledgements'
2017-07-25 22:11:05 +02:00
Matthew Taylor
e2a596ea9d
Squashed commit of the following:
...
commit b8a05d962434a3b8b49b9c8241b92c3f90e98bca79e6#1423 from mewtaylor/hotfix/camp-page
Hotfix Scratch Camp 2017 Page
commit bca79e652a#1421 )
commit 4a9418d49c#1409 )
* Add files via upload
* Create downdeep.jsx
* Delete downdeep.jsx
* Delete downdeep.scss
* Delete l10n.json
* Delete downdeep.jsx
* Create dd.jsx
* Rename dd.jsx to filler.jsx
* Add files via upload
* Delete dd.jsx
* Delete filler.jsx
* Create filler.jsx
* Add files via upload
* Delete filler.jsx
* Update routes.json
* whoops
* travis
* Update downdeep.jsx
* Update downdeep.scss
* Update downdeep.scss
* Update _colors.scss
* what i get for rushing
* Update downdeep.jsx
* Update l10n.json
* thisandagain's changes
* Carl's Changes
* carl's changes
* carl's changes
* Update downdeep.jsx
* Rename downdeep.jsx to camp.jsx
* Rename downdeep.scss to camp.scss
* Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx
* Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss
* Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json
* Update camp.jsx
* Add files via upload
* Update camp.jsx
* Update camp.scss
* Update l10n.json
* Create filler
* Add files via upload
* Delete bubbles.svg
* Delete dolphin.svg
* Delete fish-divider.svg
* Delete fish-divider2.svg
* Delete map.svg
* Delete ocean-bottom.svg
* Delete ocean-top.svg
* Delete treasure.svg
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update camp.jsx
* whoops
* Update camp.scss
* Update l10n.json
* Update camp.scss
* Update camp.jsx
* Update _colors.scss
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update _colors.scss
* Update camp.scss
* Update camp.scss
commit 3f90e98593c8afebf84a37a6#1413 from rschamp/hotfix/rip-smartystreets
[Master] Remove SmartyStreets API
2017-07-21 12:10:48 -04:00
Matthew Taylor
e264a1d2c9
Merge pull request #1426 from St19Galla/patch-2
...
Fix gh-1425 // Camp Page Typo
2017-07-21 12:02:11 -04:00
The_Grits
d936d0d9c4
Add -redirect tags + reorder
2017-07-21 09:51:45 -04:00
The_Grits
5fa9c6a05f
Alphabetize Routes List v2
2017-07-21 07:30:42 -04:00
St19_Galla
110e47f1d2
Update l10n.json
2017-07-20 22:28:03 -04:00
Matthew Taylor
d0e7c29b5f
key api calls on username check
...
`this.props.user` will now return `true` because there is a default user object that’s empty. So, instead, wait for an actual user object
2017-07-20 15:01:36 -04:00
Matthew Taylor
8561385324
Update name for legacy carousel
2017-07-20 13:56:11 -04:00
Matthew Taylor
cb4ca51061
Add new carousel component
...
1. Moves carousel to `LegacyCarousel` since it currently is designed to handle JSON from proxy endpoints
2. Add separate `Carousel` endpoint to handle data from project models in scratch’s new api, the standard moving forward.
2017-07-20 13:47:14 -04:00
Matthew Taylor
7d9b6fc5d8
Merge pull request #1415 from St19Galla/patch-2
...
Fix gh-1410: Correct "Tips" Page Link
2017-07-20 07:40:59 -04:00
Matthew Taylor
36583f0d04
Merge pull request #1416 from mewtaylor/issue/custom-rows-api
...
Move custom homepage row to new api endpoints
2017-07-19 17:19:27 -04:00
St19_Galla
9f47d504ec
Update l10n.json ( #1421 )
2017-07-19 15:42:16 -04:00
St19_Galla
43b8f0b38f
Down Deep - Scratch Camp 2017 Page ( #1409 )
...
* Add files via upload
* Create downdeep.jsx
* Delete downdeep.jsx
* Delete downdeep.scss
* Delete l10n.json
* Delete downdeep.jsx
* Create dd.jsx
* Rename dd.jsx to filler.jsx
* Add files via upload
* Delete dd.jsx
* Delete filler.jsx
* Create filler.jsx
* Add files via upload
* Delete filler.jsx
* Update routes.json
* whoops
* travis
* Update downdeep.jsx
* Update downdeep.scss
* Update downdeep.scss
* Update _colors.scss
* what i get for rushing
* Update downdeep.jsx
* Update l10n.json
* thisandagain's changes
* Carl's Changes
* carl's changes
* carl's changes
* Update downdeep.jsx
* Rename downdeep.jsx to camp.jsx
* Rename downdeep.scss to camp.scss
* Rename src/views/downdeep/camp.jsx to src/views/camp/camp.jsx
* Rename src/views/downdeep/camp.scss to src/views/camp/camp.scss
* Rename src/views/downdeep/l10n.json to src/views/camp/l10n.json
* Update camp.jsx
* Add files via upload
* Update camp.jsx
* Update camp.scss
* Update l10n.json
* Create filler
* Add files via upload
* Delete bubbles.svg
* Delete dolphin.svg
* Delete fish-divider.svg
* Delete fish-divider2.svg
* Delete map.svg
* Delete ocean-bottom.svg
* Delete ocean-top.svg
* Delete treasure.svg
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update camp.jsx
* whoops
* Update camp.scss
* Update l10n.json
* Update camp.scss
* Update camp.jsx
* Update _colors.scss
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update camp.scss
* Update _colors.scss
* Update camp.scss
* Update camp.scss
2017-07-19 11:48:29 -04:00
Matthew Taylor
36dc8283b8
move projects loved by following to new api endpoint
2017-07-19 11:25:39 -04:00
Matthew Taylor
753a3e1eed
Split splash into container/presentation component
...
This does a bit of upkeep based on recs from @rschamp that:
1. Splits splash into container/presentation components
2. Updates the default project count to 20 million
3. makes the api calls that get info from the api take in arguments rather than use the session
4. Updates `MapStateToProps` to be more specific in what it uses beyond just `session` and `permissions`
Thanks @rschamp!
2017-07-17 12:19:49 -04:00
chrisgarrity
4cc353ab43
remove obsolete strings
...
‘Help’ and ‘Discuss’ are not needed now that they’ve been replaced with the Tips page.
Fixes #1362
2017-07-17 10:14:32 -04:00
Matthew Taylor
8c94a04e77
Move custom homepage row to new api endpoints
...
This goes along with https://github.com/LLK/scratch-api/pull/292 . This can be updated if we choose to migrate the `lovedByFollowing` endpoint off of proxy as well.
2017-07-13 15:35:18 -04:00
St19_Galla
093d8f4eb3
Update tips.jsx
2017-07-13 12:48:18 -04:00
Ray Schamp
02b36ab9f3
Merge pull request #1414 from rschamp/hotfix/rip-smartystreets
...
[Develop] Remove SmartyStreets API
2017-07-13 10:52:58 -04:00
Ray Schamp
84a37a671f
Remove SmartyStreets API
...
We are so lax with this that it's not actually helping us, and we don't have a plan with them anymore.
2017-07-13 10:44:50 -04:00
Matthew Taylor
03785b78f6
Merge pull request #1406 from TheGrits/patch-3
...
Fix gh-1382: Centre Align Note
2017-07-13 10:38:04 -04:00
The_Grits
6533b5b50a
Misplaced Periods Fix
2017-07-10 19:49:13 -04:00
