scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-23 15:47:53 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2354 commits 216 branches 1 tag 464 MiB
Commit graph

2354 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
St19_Galla
200f4a6107 Delete resources.svg 2017-07-31 11:21:40 -04:00
St19_Galla
190abf45e0 Add files via upload 2017-07-31 11:21:19 -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
Matthew Taylor
b2e4d02679 Merge pull request #1440 from LLK/release/2.2.23 
[Develop] Release 2.2.23
 2017-07-27 15:58:46 -04:00
Matthew Taylor
6f0521cc8a Merge pull request #1441 from LLK/release/2.2.23 
[Master] Release 2.2.23
 2017-07-27 15:13:49 -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
4c77b1acba Merge pull request #1430 from mewtaylor/hotfix/camp-page-edits 
[Master] Hotfix: Edits to the scratch camp page
 2017-07-21 16:30:14 -04:00
Matthew Taylor
e2a596ea9d Squashed commit of the following: 
commit b8a05d9624
Author: Matthew Taylor <mewtaylor@gmail.com>
Date:   Fri Jul 21 12:06:06 2017 -0400

    only change style for links on page

    otherwise, the footer links were getting the new styling

commit 34a3b8b49b
Author: St19_Galla <fcbdsp@gmail.com>
Date:   Thu Jul 20 22:28:03 2017 -0400

    Update l10n.json

commit 9c8241b92c
Merge: 3f90e98 bca79e6
Author: Matthew Taylor <mewtaylor@gmail.com>
Date:   Thu Jul 20 16:36:32 2017 -0400

    Merge pull request #1423 from mewtaylor/hotfix/camp-page

    Hotfix Scratch Camp 2017 Page

commit bca79e652a
Author: St19_Galla <fcbdsp@gmail.com>
Date:   Wed Jul 19 15:42:16 2017 -0400

    Update l10n.json (#1421)

commit 4a9418d49c
Author: St19_Galla <fcbdsp@gmail.com>
Date:   Wed Jul 19 11:48:29 2017 -0400

    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

commit 3f90e98593
Merge: c8afebf 84a37a6
Author: Ray Schamp <rschamp@users.noreply.github.com>
Date:   Thu Jul 13 16:32:51 2017 -0400

    Merge pull request #1413 from rschamp/hotfix/rip-smartystreets

    [Master] Remove SmartyStreets API
 2017-07-21 12:10:48 -04:00
Matthew Taylor
b8a05d9624 only change style for links on page 
otherwise, the footer links were getting the new styling
 2017-07-21 12:06:06 -04:00
St19_Galla
34a3b8b49b Update l10n.json 2017-07-21 12:03:10 -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
9c8241b92c Merge pull request #1423 from mewtaylor/hotfix/camp-page 
Hotfix Scratch Camp 2017 Page
 2017-07-20 16:36:32 -04:00