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): 1f23ca93 #19954

Merged
merged 57 commits into from Jan 11, 2018
Merged

DTL (Test > Levelbuilder): 1f23ca93 #19954

merged 57 commits into from Jan 11, 2018

Conversation

deploy-code-org
Copy link
Contributor

No description provided.

Drew Samnick and others added 30 commits December 8, 2017 15:24
Return school_type with other school data
0cb300d
Create census banner to show to teachers with nces school ids
21a7052
Allow school location to be controlled in SchoolNotFound
dc1a627
Fix broken tests
95131a6
Rename onVerb functions to handleVerb
a948ab1
Remove calls to .bind(this)
bcdcb08
Add comment to clarify purpose of dismissSchoolInfoForm
ced0427
Construct data from state/props instead of serializing forms
e01270b
Break up long render()
3870649
Consolodate initial state and reset state
565162b
Add image to census teacher banner
a464475
Add follow up question about in class vs after school
2cd1cbb
Add Thank You view
1760161
Fix test failure
6f59912
@drewsamnick
Merge pull request #19604 from code-dot-org/census-teacher-banner-spe…
90e5382 
…c-change

Census teacher banner spec change
@drewsamnick
Merge branch 'staging' into census-teacher-banner
39df72d
@drewsamnick
Merge branch 'staging' into census-teacher-banner
622f01d
Fix merge issues
6f1072f
More merge fixes
5f6fe65
Another merge issue
4f9461e
Increase adhoc webserver creation timeout to 2 hours
916eacd
@breville
Homepage: remove gsheet dependency
f123895
Update next_census_display after successful submission
375311e
Open /yourschool link in a new tab
664a72a
Turn mouse into a cursor when you hover over the "Update here" link
47250ef
Change "Looks like ..." to "It looks like ..."
e47fff4
@Bjvanminnen
code for generating discount code report
42cb3f3
Break up long line
af3c02c
@Bjvanminnen
get rid of unused param
8520acb
@Bjvanminnen
handle anonymous user
3cd0625
Drew Samnick and others added 27 commits January 10, 2018 11:37
Add state_school_id to schools
761ca50
Add state_cs_offering model
f9c0c7a
@drewsamnick
Merge branch 'staging' into census-state-data
590dd0b
@drewsamnick
Merge branch 'staging' into census-state-data
b19200e
@drewsamnick
Merge pull request #19894 from code-dot-org/census-teacher-banner-bug…
b9a98c1 
…fixes

Census teacher banner bug fixes
Use sequence to generate unique state_school_id values
fcab2c8
@Bjvanminnen
Merge pull request #19899 from code-dot-org/discountCodeReporting
113040c 
code for generating discount code report
@deploy-code-org
Merge pull request #19925 from code-dot-org/staging
f2df041 
DTT (Staging > Test) [robo-dtt]
@drewsamnick
Merge pull request #19559 from code-dot-org/census-teacher-banner
6911899 
Create census banner to show to teachers with nces school ids
@deploy-code-org
Merge pull request #19927 from code-dot-org/staging
4688b56 
DTT (Staging > Test) [robo-dtt]
@davidsbailey
use 8 character commit prefix when auto-marking dtt green
11909b2
@breville
Homepage: code review feedback
61293b8 
Also removes actions that aren't currently used.  We can revive any that are needed later, but it seemed worth cleaning up for now.
@drewsamnick
Merge pull request #19911 from code-dot-org/census-state-data
9677a74 
Census state data
@deploy-code-org
Merge pull request #19932 from code-dot-org/staging
e46697f 
DTT (Staging > Test) [robo-dtt]
@davidsbailey
remove trailing whitespace
a0c3de8
@davidsbailey
Merge pull request #19930 from code-dot-org/eight-char-prefix
8b8d62e 
use 8 character commit prefix when auto-marking dtt green
@deploy-code-org
Update schema cache dump after schema changes.
73957d6
@Bjvanminnen
Merge pull request #19910 from code-dot-org/anonHideSurvey
f7050de 
handle anonymous user
@deploy-code-org
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into s…
7e07d82 
…taging
@breville
Merge pull request #19807 from code-dot-org/homepage-remove-gsheet-de…
84b74c5 
…pendency

Homepage: remove gsheet dependency
@deploy-code-org
staging content changes (-)
9a0b0ec
@deploy-code-org
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into s…
7f82f51 
…taging
@deploy-code-org
Merge pull request #19937 from code-dot-org/staging
8e85781 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org
staging content changes (-robo-commit)
a73cac5
@deploy-code-org
Merge pull request #19939 from code-dot-org/staging
393c7ea 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org
Merge pull request #19940 from code-dot-org/levelbuilder
39d00b4 
DTS (Levelbuilder > Staging) [robo-dts]
@Erin007
Merge pull request #19941 from code-dot-org/staging
1f23ca9 
DTT (Staging > Test) [Erin B. ]
@deploy-code-org deploy-code-org merged commit 9b6801e into levelbuilder Jan 11, 2018
@balderdash balderdash deleted the dtl_candidate_1f23ca93 branch September 18, 2018 05:49
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
6 participants
@deploy-code-org @drewsamnick @breville @Bjvanminnen @davidsbailey @Erin007