Commit graph

13247 commits

Author SHA1 Message Date
Matthew Taylor
1f722a046f resize svgs 2017-09-08 16:37:18 -04:00
Matthew Taylor
92ed6adead fix typo
thanks @jwzimmer!
2017-09-08 16:08:53 -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
Andrew Sliwinski
af0f0d30a1 Merge pull request #1513 from thisandagain/bugfix/1509
Changed 'Animate a Name' educator guide link
2017-09-07 15:59:09 -04:00
Matthew Taylor
7a3290a2ca show recipient for owner notification 2017-09-07 14:55:48 -04:00
LiFaytheGoblin
b5c44bae96 Fixes GH-1435/Make as many names as possible on credits page non-translate 2017-09-07 17:33:12 +02: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
6092bfe5fc Add messages l10n file to Transifex 2017-09-05 12:05:30 -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
c27667fb4a Merge pull request #1486 from Kenny2github/patch-1
Update name for zh-tw language
2017-09-05 09:58:56 -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
98cccaa5da Merge pull request #1498 from mewtaylor/issue/legacy-routes
Pass to legacy on message routes with `ajax`
2017-09-01 14:40:47 -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
63963254f9 Merge pull request #1496 from mewtaylor/issue/gh-1494
Fix GH-1494: fix formatting for dismiss icon, unread message count
2017-09-01 11:15:18 -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
8ea23e1725 Merge pull request #1490 from LLK/release/2.2.24
[Master] Release 2.2.24
2017-08-31 13:41:01 -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
Ken
42eda2c2a1 Update name for zh-tw 2017-08-26 13:22:37 +08: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
chrisgarrity
c8d1fee211 Merge pull request #1482 from Kenny2github/patch-1
Correct “WeDo” case
2017-08-23 09:12:07 -04: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
jwzimmer
354eb7676d Issue/gh 1428 my stuff signing in (#1464)
* put helper functions in separate file following Paul's style in scratch-gui

* remove console statements

* address review comments, object destructuring

* added new tests for invalid username/ passwords and the + New Project, + New Studio buttons

* uncomment out test after talking to Ray

* added a test for no username and no password
2017-08-22 16:58:23 -04:00