Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DTL (Test > Levelbuilder): c7e7c452 #30231

Merged
merged 130 commits into from Aug 9, 2019
Merged

DTL (Test > Levelbuilder): c7e7c452 #30231

merged 130 commits into from Aug 9, 2019

Conversation

deploy-code-org
Copy link
Contributor

No description provided.

Erin007 and others added 30 commits July 26, 2019 11:00
@Erin007
make script_level_id a required field for teacher feedback
89ceeb4
@ajpal
separate gamelab and spritelab constants
2a2f408
@Erin007
Merge branch 'staging' into req-script-level
5c4b19c
@jmkulwik
Disabled code workspace and code/design/data mode on widget levels
4e96541
@Erin007
fix typo and add change_column_null
fd13e04
@Erin007
migration to make script_level_id required for teacher feedbacks
e1b797d
@Erin007
remove model validation for script_level_id
8e31646
@jmkulwik
Updated widget mode to auto-run on page load.
97224ef
@jmkulwik
Merge remote-tracking branch 'origin/staging' into widget-mode-fixed-…
254717c 
…size
@jmkulwik
Removed run/reset button in widget mode
4e673da
@Erin007
include level_id, student_id and teacher_id not null in migration
69ec099
@Erin007
fix merge conflict in schema.rb by picking the later version
f4bd5a1
@breville
PL: Virtual Academic Year Workshop support
45959a4 
This adds workshop subjects "Virtual Workshop 1" through "Virtual Workshop 8", and allows them to be chosen for CSD and CSP, but only by workshop_admin users.

It also supresses all workshop emails when they are attempted to be sent for these workshops, since the team wants to send all such communications manually for now.
@breville
PL: improve robustness of subject check for mail sending
83f803c
@Erin007
include association script_level in teacher_feedback factory:
3cd4873
@Erin007
student_id can be null after student is deleted and disassociated fro…
ea9d79b 
…m teacher feedbacks
@Erin007
stray comma
ef07117
@ajpal
Merge branch 'staging' into jul31-p5lab-constants
ff83226
@breville
PL: test that emails are not sent for virtual workshops
2cba304
@islemaster
New links for the broken link checker ignore list
010c727 
https://www.blackrock.com/   
https://codemoji.com/ 
http://www.toxicode.fr/ 
https://www.polsinelli.com/offices/seattle  
https://chibitronics.com/  
http://digit.com.pk/
@breville
PL: Assume we always have a workshop for a workshop mailing
c8ed3ad
@bethanyaconnor
Add locale as a custom attribute to New Relic
854bc83
@breville
Forum: Discourse forum gets two more facilitator groups
5be44d8 
Like the CSF Facilitator group added back in #27382, it now gets groups for CSD and CSP Facilitators.

Also did some cleanup, and started supporting multiple add/remove groups per login.  The list is apparently comma-separated, as described briefly at https://meta.discourse.org/t/official-single-sign-on-for-discourse-sso/13045
@jmkulwik
Widget mode mini-refactor. Disable playspacePhoneFrame rather than cr…
02d4884 
…eating a new codepath within it.
@ajpal
Merge branch 'staging' into jul31-p5lab-constants
2df2a53
@ajpal
change names
b54fe4a
@ajpal
re-add edges
dcb9e5f
@ajpal
Switch to using common i18n
4a2d770
@Erin007
feedback style polish
3c79d9b
@ajpal
fix test
2fa093d
Hamms and others added 28 commits August 8, 2019 13:16
@Hamms
fix broken apps strings
2d20b30
@ajpal
Merge branch 'staging' into jul31-p5lab-constants
d9e5d8d
@Erin007
check user permissions rather than users
d28080e
@davidsbailey
make exemplar links use /projects/frozen when applicable
ef536d3
@jmkulwik
Disabled ruby tests that are causing the DTT to fail
cbf9974
@jmkulwik
Merge pull request #30208 from code-dot-org/skip-failing-ruby-tests
2a8e70b 
[Workaround] Disabled ruby tests that are causing the DTT to fail due to incorrect test DB
@Hamms
Merge pull request #30202 from code-dot-org/i18n-sync-down-out-08-08
646a33c 
I18n sync Down & Out 08/08
@deploy-code-org
Merge pull request #30209 from code-dot-org/staging
dc3fb15 
DTT (Staging > Test) [robo-dtt]
@Hamms
Merge pull request #30200 from code-dot-org/use-latest-redact-packages
35ac6da 
use updated versions of redactable-markdown and remark-plugins
@davidsbailey
Merge pull request #30205 from code-dot-org/fix-artist-exemplar-links
4223095 
make exemplar links use /projects/frozen when applicable
@breville
PL: fix another test
2df8bd6
@Erin007
Merge pull request #30206 from code-dot-org/feedback-homepage
b092c48 
Feedback: load performance, check UserPermissions rather than Users
@deploy-code-org
Merge pull request #30211 from code-dot-org/staging
4af9c00 
DTT (Staging > Test) [robo-dtt]
@breville
PL: fix unit test
b0ec6b6
@breville
hourofcode.com: adjust events page links
f1a673f
@wjordan
fix clear_secrets bug with empty hash
ef9a5e0
@wjordan
Merge pull request #30219 from code-dot-org/clear_secrets_empty_fix
49e3b4d 
fix clear_secrets bug with empty hash
@deploy-code-org
Merge pull request #30220 from code-dot-org/staging
6c92bef 
DTT (Staging > Test) [robo-dtt]
@bethanyaconnor
Merge pull request #30173 from code-dot-org/newrelic_locale
1fe73d8 
Add locale as a custom attribute to New Relic
@ajpal
Merge pull request #30044 from code-dot-org/jul31-p5lab-constants
0a7cdf4 
Separate gamelab, spritelab, and shared constants
@breville
Merge pull request #30215 from code-dot-org/hourofcode-adjust-faq-eve…
75e2006 
…nts-link

hourofcode.com: adjust events page links
@breville
Merge pull request #30159 from code-dot-org/pl-virtual-academic-year-…
347166c 
…workshop-support

PL: Virtual Academic Year Workshop support
@islemaster
Merge pull request #30167 from code-dot-org/islemaster-patch-1
a7dd312 
New links for the broken link checker ignore list
@jmkulwik
Merge pull request #30176 from code-dot-org/widget-phone-frame-logic
9efac83 
[Widget Mode] Refactor phone frame logic
@deploy-code-org
staging content changes (-robo-commit)
1271ff4
@deploy-code-org
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into s…
d89690c 
…taging
@deploy-code-org
Merge pull request #30223 from code-dot-org/levelbuilder
60f7047 
DTS (Levelbuilder > Staging) [robo-dts]
@deploy-code-org
Merge pull request #30224 from code-dot-org/staging
c7e7c45 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org deploy-code-org merged commit 909ef49 into levelbuilder Aug 9, 2019
@davidsbailey davidsbailey deleted the dtl_candidate_c7e7c452 branch September 6, 2019 22:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet