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
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
Andrew Sliwinski
8734fbcdf4
Merge pull request #1466 from St19Galla/patch-4
...
Fix gh-1465: Add Ellen Daoust to Credits
2017-08-21 08:20:26 -04:00
St19_Galla
ad25e09980
Add Ellen Daoust
2017-08-16 13:39:17 -04:00
chrisgarrity
376aee0eb3
Add error checking and testing for translations ( #1401 )
...
* Add error checking and testing for translations. Also make build-locales quieter if there are no problems.
* Allow build with broken translations (to allow development), but fail test so that broken translations don't get merged or deployed
2017-08-15 09:32:18 -04:00
jwzimmer
f232569355
Fix GH-1420 Issue/refactor helper functions ( #1458 )
...
* put helper functions in separate file following Paul's style in scratch-gui
* remove console statements
* address review comments, object destructuring
2017-08-11 16:13:52 -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
St19_Galla
f3e53ae4c8
Add files via upload
2017-08-02 23:41:45 -04:00
St19_Galla
1817dde96d
Delete cards.svg
2017-08-02 23:41: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
221bc0a235
Merge pull request #1448 from rschamp/jobs
...
[Develop] Add Senior Backend Engineer job posting
2017-07-31 15:15:17 -04:00
Ray Schamp
3e371f5511
Merge branch 'develop' into jobs
2017-07-31 15:15:05 -04:00
Ray Schamp
ee342dfbdb
Merge pull request #1447 from rschamp/jobs
...
[Master] Add Senior Backend Engineer job posting
2017-07-31 15:14:38 -04:00
Ray Schamp
e369a439e3
Add Senior Backend Engineer job posting
2017-07-31 14:47:56 -04:00