scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-27 17:45:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
2855 commits 216 branches 1 tag 475 MiB
Commit graph

2855 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
8cb008f4b1
Merge pull request #1894 from LLK/hotfix/gdpr 
[Master] Hotfix Privacy Policy updates
 2018-05-23 11:34:38 -04:00
Andrew Sliwinski
c0ac741065 Remove link from email address 2018-05-23 09:55:56 -04:00
Andrew Sliwinski
0a7bcdf907 Fix mailto link 2018-05-23 09:55:52 -04:00
Andrew Sliwinski
311d7e5959 Fix links to account settings / password 2018-05-23 09:55:48 -04:00
Andrew Sliwinski
59ca64579e Fix typo 2018-05-23 09:55:42 -04:00
Andrew Sliwinski
244a76149b Resolve lint issues 2018-05-23 09:55:36 -04:00
Andrew Sliwinski
f6a11e1c43 Update default 'opt-in' state for teacher registration 2018-05-23 09:55:27 -04:00
Andrew Sliwinski
71af5978ad Update privacy policy 2018-05-23 09:55:08 -04:00
Andrew Sliwinski
f19a6c6196 Remove link from email address 2018-05-22 16:15:26 -04:00
Andrew Sliwinski
7241164cf7 Fix mailto link 2018-05-22 09:59:08 -04:00
Andrew Sliwinski
8b9df4857f Fix links to account settings / password 2018-05-22 09:58:17 -04:00
Andrew Sliwinski
495d9e1177 Fix typo 2018-05-22 09:24:36 -04:00
Andrew Sliwinski
585a2e6686
Merge pull request #1891 from thisandagain/hotfix/privacy 
[Develop] Hotfix - Update Privacy Policy
 2018-05-21 17:15:21 -04:00
Andrew Sliwinski
88e99e655b Resolve lint issues 2018-05-21 17:04:50 -04:00
Andrew Sliwinski
d78d78e1fa Update default 'opt-in' state for teacher registration 2018-05-21 15:55:42 -04:00
Andrew Sliwinski
881c2affa4 Update privacy policy 2018-05-21 15:55:21 -04:00
BryceLTaylor
86e9549cee Make all Selenium tests of login-failures work and use css to select elements. 2018-05-17 11:52:05 -04:00
BryceLTaylor
e7f57122c2 Make Selenium Helper function to click element by CSS 2018-05-17 11:33:21 -04:00
Andrew Sliwinski
a4189359d8
Merge pull request #1886 from thisandagain/bugfix/1880 
Remove references to Linux for the Scratch 2.0 offline editor
 2018-05-16 10:01:20 -04:00
Andrew Sliwinski
32fc959ed2 Remove references to Linux in download l10n strings 2018-05-16 09:44:11 -04:00
Andrew Sliwinski
a302d37eef Remove references to Linux for the Scratch 2.0 offline editor. Resolves GH-1880 2018-05-15 10:19:12 -04:00
Bryce Taylor
c6e4b2ec09
Merge pull request #1885 from BryceLTaylor/Selenium-Tests 
Remove Selenium smoke tests that sign in with no username
 2018-05-15 09:56:48 -04:00
BryceLTaylor
4e017d3ca7 Remove Selenium smoke tests that sign in with no username since they break constantly. 2018-05-15 09:26:52 -04:00
Bryce Taylor
fe1ef5a750
Merge pull request #1879 from BryceLTaylor/Verbose-Testing 
Verbose testing
 2018-05-14 11:31:39 -04:00
Ray Schamp
75ee8d7660
Merge pull request #1871 from LLK/release/april-2018 
[Master] April 2018 Release
 2018-05-14 11:30:09 -04:00
Ray Schamp
297b4c14f5
Merge pull request #1882 from LLK/release/april-2018 
[Develop] April 2018 Release
 2018-05-14 10:52:53 -04:00
BryceLTaylor
e88d5f8745 Add verbose method of running integration tests to output results of each test. 2018-05-08 16:43:41 -04:00
BryceLTaylor
93e483e6e9 Split integration test test_signing_in_and_my_stuff into test-login-failures and test-my-stuff 2018-05-08 16:29:35 -04:00
BryceLTaylor
cb484da6b0 Update test_navbar_links integration test to use selenium_helpers 2018-05-08 16:28:02 -04:00
BryceLTaylor
cb52f679be Move Selenium-Helpers file and point integration tests to it 2018-05-08 16:26:48 -04:00
BryceLTaylor
d0a2266c10 Update gitignore to ignore node_modules in integration tests 2018-05-08 16:20:57 -04:00
BryceLTaylor
9ece2e6ea6 Update selenium-webdriver and chromedriver versions to match gui. 2018-05-08 16:19:56 -04:00
chrisgarrity
1cfc5a8144
Merge pull request #1875 from chrisgarrity/issue/fix-path-for-fastly 
Correct preview route for fastly
 2018-05-03 08:14:48 -04:00
chrisgarrity
6df58e41fd Correct preview route for fastly 
- use more explicit route
- handle fastly error in the callback correctly
- more succinct parsing of the URL path
 2018-05-02 17:04:14 -04:00
chrisgarrity
d1420862ea
Initial GUI embed (#1869) 
- `/preview/editor` will load GUI with an empty project
- `/preview/:id/editor` will load GUI with a project from the projects server (not local data)
- passes intl object to GUI
- `/preview/:id` with show the project page with an embedded player
- `/preview/:id/fullscreen` will load the project page with the player in fullscreen mode.

* Note that we needed to Increase memory for the build to avoid running out of heap space, and build time increases by about 2 minutes
 2018-05-02 15:27:49 -04:00
chrisgarrity
04e27ec02a
Merge pull request #1870 from chrisgarrity/tx-add-research 
Add research view to transifex config
 2018-05-02 09:58:52 -04:00
chrisgarrity
8afaf36232 Add research view to transifex config 
the `view/research/l10n.json` configuration was missing from the transifex config, so translations are missing.
 2018-05-01 20:11:20 -04:00
chrisgarrity
4e9e791e2e
Merge pull request #1867 from LLK/hotfix/close-conf-reg 
[MASTER] Close registration when full
 2018-04-27 12:01:19 -04:00
chrisgarrity
65e7657680
Merge pull request #1868 from LLK/hotfix/close-conf-reg 
[DEVELOP] Close registration when full
 2018-04-26 15:00:22 -04:00
chrisgarrity
b8326a3d57
Feature/preview project2 (#1856) 
* Add user-session awareness
  - only show remix button if user is logged in (TBD: probably will want to hide if project creator == user)
* decorate text with @mentions and #hashtags
* Add studios, loves, favs
* In-place editing of title and description if current user is author and project shared (with validation)
 2018-04-24 11:00:47 -04:00
Linda
569773c0ea Gh 1834/add kazahk to language menu (#1859) 
* added kazakh to languages
 2018-04-24 10:33:52 -04:00
Ray Schamp
02e2ec8403
Merge pull request #1864 from LLK/hotfix/conference-remove-dorm 
[Master] Remove dorm information from 2018 Conference page
 2018-04-23 16:40:02 -04:00
Ray Schamp
773b77d5e8
Merge pull request #1863 from LLK/hotfix/remove-recent-row 
[Master] remove recent projects row
 2018-04-23 16:39:53 -04:00
Ray Schamp
c173922df6
Merge pull request #1861 from LLK/hotfix/conference-remove-dorm 
[Develop] Remove dorm information from 2018 Conference page
 2018-04-23 16:38:53 -04:00
Ray Schamp
9816846409
Merge pull request #1862 from LLK/hotfix/remove-recent-row 
[Develop] remove recent projects row
 2018-04-23 16:37:58 -04:00
chrisgarrity
520bd21cf2 remove obsolete l10n message 2018-04-23 16:29:51 -04:00
chrisgarrity
8cd28baef4 Remove recently shared row 2018-04-20 17:33:38 -04:00
Linda
ef763d6612
Merge pull request #2 from LLK/develop 
update
 2018-04-20 14:06:44 +02:00
chrisgarrity
ce6d78c715 Remove NEU dorm accomodations 
Dorms are no longer available. Fixes #1851
 2018-04-19 17:06:58 -04:00
Sarah Otts
5195e0e6b4
Merge pull request #1853 from seotts/issue/counter-notification 
Update DMCA copy
 2018-04-11 11:29:35 -05:00