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

DTP (Test > Production: 05abbd19) #19887

Merged
merged 138 commits into from
Jan 9, 2018
Merged

DTP (Test > Production: 05abbd19) #19887

merged 138 commits into from
Jan 9, 2018

Conversation

islemaster
Copy link
Contributor

No description provided.

joshlory and others added 30 commits December 20, 2017 17:51
@joshlory
Try to upgrade webpack to 2.7.0
cdbdfd0
@joshlory
Fix yarn storybook (still missing some styles)
c6a0b18
@joshlory
Fix loading @cdo/locale etc
fc0888c
@joshlory
Merge remote-tracking branch 'origin/staging' into update-webpack
fca11ac
@joshlory
Only replace the JSX rule, don't overwrite the whole rules array
406cdc0
@joshlory
Update script-loader references
e6ba4c2
@joshlory
Fix "configuration has an unknown property 'progress'"
7e4e87b
@Bjvanminnen
proxy studio.code.org/curriculum to curriculum.code.org
d5e4bae
@Bjvanminnen
curriculum_reference levels must have reference starting with /docs o…
622710f 
…r /curriculum
@Bjvanminnen
convert levels to specify /docs
0ac3d4c
@Bjvanminnen
allow blank
e230701
@Hamms
add config and flag for Burmese
539b17f
@Hamms
Label automatically-generated i18n PRs
c3679df
@joshlory
Fix weird issue with asset loading in Karma
1f4736d 
`grunt karma:entry --entry ./test/unit/code-studio/initApp/loadAppTest.js` was failing because blank_sharing_drawing.png wouldn't load. Weirdly, it was resolving to an absolute path in a temp folder in /var/folders/.../_karma_webpack_ insetad of the correct Karma asset URL.
@joshlory
Better fix for 1f4736d (see: codymikol/karma-webpack#289)
318bb27
@joshlory
Merge branch 'staging' into update-webpack
358d0d4 
# Conflicts:
#	apps/yarn.lock
@Hamms
split up teacher acceptance emails into teachercon and local summer v…
32e4b78 
…ersions
@joshlory
Add back storybook styles
1dbb4cb
@joshlory
Merge branch 'staging' into update-webpack
b523df2 
# Conflicts:
#	apps/webpack.js
@Hamms
add teacher school info trait, make it the default for teacher applic…
16319e5 
…ation factory
@Hamms
update tests with new application acceptance emails
0f09fce
@Hamms
include user school info when creating enrollment
72a561e
@Hamms
pass required arguments to mailer methods
2ec8509
@joshlory
Reduce diff
c9061e1
@islemaster
Encode UiTips dependencies better
d1fc468
@islemaster
Initial UiTips test (45% coverage)
c93df7b
@islemaster
Initial state tests (51% coverage)
24a5390
@joshlory
Remove http workaround that was necessary in webpack 1
4ff561b
@islemaster
Triggered tips tests (75% coverage)
9822983
@Bjvanminnen
use request.path instead of presence of param
c5fd9aa
Erin007 and others added 28 commits January 8, 2018 17:28
@Erin007
Remove galleryType: class from ProjectCardGrid and story
c38a484
@Erin007
remove class gallery from projectConstants
a1c1826
@mehalshah
Fix broken applications controller test
070b747
@cpirich
Merge pull request #19856 from code-dot-org/weblab_update_bramble_to_…
307d333 
…0.1.25

Update weblab to use bramble 0.1.25
@caleybrock
Merge pull request #19838 from code-dot-org/editing-states
cb1db9a 
Edit states for Manage Students table
Revert "Teacher app bug bash feedback"
94de111
Merge pull request #19871 from code-dot-org/revert-19762-teacher-app-…
4a859c4 
…bug-bash-feedback

Revert "Teacher app bug bash feedback"
@Hamms
update VariableFormGroup and contained components to ES6
6c0b6b6
@Hamms
add storybook entry for VariableFormGroup
fb75bc7
@deploy-code-org
Merge pull request #19876 from code-dot-org/staging
ab0b1d6 
DTT (Staging > Test) [robo-dtt]
@mehalshah
Merge pull request #19870 from code-dot-org/fix_one_broken_test
6593b17 
Fix broken applications controller test
Update study name to make it easier to test
6136050
@Erin007
Merge branch 'staging' into more-states-stats-changes
5b27126
@islemaster
Typo in test comment [ci skip]
2a9c0d7
@Erin007
pr feedback
2ed3bac
@deploy-code-org
Merge pull request #19880 from code-dot-org/staging
950f587 
DTT (Staging > Test) [robo-dtt]
@islemaster
Merge pull request #19818 from code-dot-org/es6-uitips
39a9c1b 
ES6: UiTips
Merge pull request #19868 from code-dot-org/resources-tab-add-firehouse
b1f053d 
Resource Tab Logging - Fix under-app click logs on load
@deploy-code-org
staging content changes (-robo-commit)
a980721
@deploy-code-org
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into s…
f07db71 
…taging
@Erin007
Merge pull request #19862 from code-dot-org/clean-up-personal-projects
fa8bbf6 
Clean up ProjectCard and related unused code
@Hamms
Merge pull request #19855 from code-dot-org/update-variable-form-grou…
098c9cf 
…p-to-es6

Update VariableFormGroup to es6
@Erin007
Merge pull request #19835 from code-dot-org/more-states-stats-changes
8995c8f 
More states stats changes
@Hamms
Merge pull request #19840 from code-dot-org/workshop-reprocess-script
b6f19ca 
add script to reprocess all workshop locations
@Hamms
Merge pull request #19843 from code-dot-org/i18n-sync-in-up-01-08
9293e55 
I18n sync In & Up 01/08
@deploy-code-org @islemaster
levelbuilder content changes (-robo-commit)
87dff2c
@deploy-code-org @islemaster
levelbuilder content changes (-robo-commit)
d0bd07a
@deploy-code-org
Merge pull request #19883 from code-dot-org/staging
05abbd1 
DTT (Staging > Test) [robo-dtt]
@islemaster islemaster merged commit 5dc811d into production Jan 9, 2018
@deploy-code-org deploy-code-org deleted the dtp_candidate_05abbd19 branch January 9, 2018 21:42
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