Commit graph

75 commits

Author SHA1 Message Date
tomlum
d121de84e9 removes far temporarily 2023-08-14 21:36:16 -04:00
Tom Lum
2b47139208
Revert "Revert "Merge pull request #7762 from scratchfoundation/revert-7759-F…" 2023-08-03 13:00:31 -04:00
tomlum
2557f57272 Revert "Merge pull request #7762 from scratchfoundation/revert-7759-FAR-Revert"
This reverts commit faf84d0cfa, reversing
changes made to 5b190b3acd.
2023-08-01 14:32:02 -04:00
Tom Lum
e6153740b7
Revert "revert FAR" 2023-07-26 13:10:49 -04:00
tomlum
3d607cdb3b revert FAR 2023-07-25 11:11:09 -04:00
tomlum
4d73900c77 far lint fixes 2023-07-13 10:11:55 -04:00
tomlum
c276e006ff updates design and fixes redux issues 2023-07-12 17:01:45 -04:00
Tom Lum
132280477b
Merge branch 'develop' into force-account-rename 2023-07-11 12:49:16 -04:00
tomlum
8868d00e23 validation and misc lint fixes 2023-06-28 22:49:28 -04:00
tomlum
2f7e12bd0c adds force account rename page 2023-06-15 21:40:33 -04:00
Colby Gutierrez-Kraybill
5cdafb8bc9 Handle generic ipban redirect if session says so 2023-05-09 17:16:37 -04:00
Colby Gutierrez-Kraybill
d343b514ba Use handleSessionResponse to perform VPN redirect 2023-03-27 12:18:42 -04:00
Colby Gutierrez-Kraybill
21a795cd0b Add vpn_required to defaults in various pages. 2023-03-27 12:18:42 -04:00
Colby Gutierrez-Kraybill
12438d8360 Add in vpn redirect to require staff to use vpn 2023-03-27 12:18:42 -04:00
tomlum
b2fc878903 design check 2023-03-16 14:22:19 -04:00
rschamp
930bb78304 Handle Totally Normal™ flags 2022-03-11 14:22:43 -05:00
seotts
80a99bc0b6 Remove use of studio transfer feature flag
Remove another use
2021-09-21 10:40:18 -04:00
seotts
3ef41d2790 Remove use of new studios feature flag 2021-09-20 13:40:37 -04:00
Eric Rosenbaum
5811332cd7 lint fixes 2021-07-23 13:57:25 -04:00
Eric Rosenbaum
072e888c1d use feature flag 2021-07-20 10:51:10 -04:00
seotts
ad3f50ac10 Revert "Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-page""
This reverts commit 5b7127a271.

# Conflicts:
#	src/views/preview/subactions.jsx
2021-06-17 17:19:51 -04:00
picklesrus
d3e368bce2
Merge branch 'develop' into studio-comments-off 2021-06-17 13:47:03 -04:00
seotts
5b7127a271 Revert "Merge pull request #5573 from seotts/muted-add-proj-via-proj-page"
This reverts commit d468072552, reversing
changes made to 469878a2fc.
2021-06-17 09:02:31 -04:00
picklesrus
64f9d80c2a
Merge branch 'develop' into studio-comments-off 2021-06-15 17:24:43 -04:00
seotts
1a753dfde3 Put Add to Studio change behind session flag 2021-06-15 09:45:09 -04:00
picklesrus
fcbcef244b Show a status message in place of the usual comment components when studio comments are turned off. 2021-06-10 15:36:48 -04:00
picklesrus
b65ab82a89
Merge pull request #5561 from picklesrus/project-comments
handle project comments turned off
2021-06-09 09:41:44 -04:00
seotts
3d6a789812 update session when user gets muted 2021-06-08 13:38:35 -04:00
picklesrus
ef801112cd
Merge branch 'develop' into project-comments 2021-06-07 15:38:40 -04:00
picklesrus
993dd36aa5 WIP of being able to turn off project comments. 2021-06-07 11:28:29 -04:00
Paul Kaplan
cb8a869e4f Merge branch 'develop' into muted-users-cant-edit-studios 2021-05-26 10:58:12 -04:00
seotts
19a9997e0f Muted users can’t edit studios
linting fixes
2021-05-21 09:46:19 -04:00
Paul Kaplan
cc66341252 Wait for session to be fetched before loading comments 2021-05-17 14:53:02 -04:00
Paul Kaplan
134cd927ec Add classroomId to studio reducer 2021-05-13 13:20:26 -04:00
Ben Wheeler
3156976fee update method of checking goodlist of pages for banned user to see 2021-05-07 13:14:53 -04:00
Benjamin Wheeler
732b596c61
Revert "Add privacy policy and terms of use to allowlist" 2021-05-05 16:17:22 -04:00
Benjamin Wheeler
7242fbfbf0
Merge pull request #5220 from apple502j/patch-23
Add privacy policy and terms of use to allowlist
2021-04-29 13:53:01 -04:00
Ben Wheeler
ec710a1d98 removed redundant goodlist page paths 2021-04-29 13:48:30 -04:00
Paul Kaplan
c789a27018 Fix logged in selector with test 2021-04-21 14:52:53 -04:00
Paul Kaplan
cd8ae4b197 Use lodash.get to simplify permissions, move test data into fixtures for better testing 2021-04-02 12:33:18 -04:00
apple502j
9a3fc9876c
Add privacy policy and terms of use to allowlist 2021-04-02 04:28:27 +09:00
Paul Kaplan
f03fbb503b Add session selector and tests 2021-03-23 15:18:36 -04:00
Ben Wheeler
6654362b2c fix for session promise issue 2020-01-14 22:03:05 -05:00
Ben Wheeler
7b46ddf243 Revert "Merge pull request #3628 from LLK/revert-3618-hotfix/join-retry-session"
This reverts commit 7c9a098598, reversing
changes made to 2c68f2041e.
2020-01-14 21:58:38 -05:00
Benjamin Wheeler
1dbe89f2bc
Revert "[Develop] Hotfix/join retry session" 2020-01-09 08:44:27 -05:00
Ben Wheeler
d53fe43241 fix bug, updating session request retry code per rschamp's feedback 2019-12-16 17:53:30 -05:00
Ben Wheeler
69e519286d session tests mock api response various ways 2019-12-16 13:35:24 -05:00
Ben Wheeler
b8d5799e75 refactor lib/session so that it can be used arbitrary number of times 2019-12-14 22:44:26 -05:00
Ben Wheeler
39c32e7c5f Add lib/session.js, add refreshSessionWithRetry() 2019-12-03 21:18:00 -05:00
Ray Schamp
590f505a61 Revert "Merge pull request #1788 from LLK/revert-1775-hotfix/es6-upgrade"
This reverts commit 1b1b396e92, reversing
changes made to a144bab0e6.
2018-01-30 11:53:12 -05:00