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: b22cbad0) #18318

Merged
merged 90 commits into from Oct 11, 2017
Merged

DTL (Test > Levelbuilder: b22cbad0) #18318

merged 90 commits into from Oct 11, 2017

Conversation

jeremydstone
Copy link

No description provided.

sureshc and others added 30 commits September 28, 2017 15:16
@sureshc
Display list of Program Managers assigned to Regional Partner
691ebf5
@sureshc
Assign program manager to regional partner without validation or erro…
7a3be27 
…r handling.
@sureshc
Workshop Admin can remove a Program Manager from a Regional Partner. …
b74b296 
…Also - prevent adding a duplicate Program Manager.
@sureshc
Search for and assign program managers.
9c01014
@sureshc
Merge branch 'edit-regional-partner' into assign-program-manager-to-r…
306b98d 
…egional-partner
@sureshc
remove manual load of model now that CanCanCan provides it
394042a
@sureshc
Merge branch 'edit-regional-partner' into assign-program-manager-to-r…
5980b9a 
…egional-partner
@sureshc
Merge branch 'edit-regional-partner' into assign-program-manager-to-r…
02d3955 
…egional-partner

# Conflicts:
#	dashboard/app/models/regional_partner.rb
@sureshc
Merge branch 'edit-regional-partner' into assign-program-manager-to-r…
5f4da87 
…egional-partner
@cpirich
update droplet
1c2a648
@cpirich
add DEFAULT_PROP_VALUES and setParamAtIndex
6beff2b
@cpirich
merge staging
afcc94e
@cpirich
update droplet build
1217340
@mehalshah
Email address shows up in CSV reports
80f30b0
@cpirich
apply dropdown to generic/unknown case, update/enhance tests
af38e74
Show error message on user signup failure
a5ddfcd
Fix typo in comment
9abb859
@sureshc
Merge branch 'edit-regional-partner' into assign-program-manager-to-r…
f9805fe 
…egional-partner
@islemaster
ES6ify ContractForm
0563a34
@islemaster
Address old TODO
7a9c3cd
@islemaster
ES6ify DomainsList
7c33881
@islemaster
ES6ify TypeChooser
62af4ca
@islemaster
Remove home-made curry
9935267
@sureshc
add tests for assign program manager
a890bb5
@islemaster
Misc ES6 changes
5a24612
@mehalshah
Checkpoint
cc3f9e9
@sureshc
minor edits
40b613c
@sureshc
remove selectize experiment
e901f0c
Remove console output
fb9750f
@islemaster
Implement review feedback
039e9b8
Joanne Polsky and others added 28 commits October 10, 2017 19:10
Use CSV for writting output
ed079d1
add tmpdir
8e6869f
remove weird log file
7a5dad8
Merge pull request #18289 from code-dot-org/write-updates-to-log-file
b8331fd 
Write updates for fix_bad_school_info_in_users to log file
@sureshc
Raise error if assignment fails
dcf42ad
@sureshc
Merge pull request #18043 from code-dot-org/assign-program-manager-to…
a7dcecf 
…-regional-partner

Assign program manager to regional partner
@ewjordan
Change number in sign_in_count check to account for order of operations
e1f6aed
@ewjordan
Enable Clever takeover of other oauth accounts
7cafa6e
@ewjordan
Allow silent takeover of Clever accounts
4be17b7
@cpirich
PR feedback - cleanup optional params
c77eb9e
Merge pull request #18297 from code-dot-org/staging
1eb7691 
DTT (Staging > Test) [Jeremy]
@cpirich
update weblab css file contents
8da35a4
@cpirich
Merge pull request #18231 from code-dot-org/setPropertyDropdown-defau…
2485556 
…lt-prop-values

Set property dropdown default prop values
@cpirich
create/use restorePreviousFileVersion(), avoid passing queryString th…
0efba9a 
…rough basePath()
@deploy-code-org
Merge pull request #18300 from code-dot-org/staging
34a3a15 
DTT (Staging > Test) [robo-dtt]
Remove extraneous props
8efe82c
@cpirich
Merge pull request #18270 from code-dot-org/encodeURIComponent-in-bas…
a5505c7 
…ePath

call encodeURIComponent in basePath(), fixes files with unusual characters
@cpirich
Merge pull request #18298 from code-dot-org/weblab-update-default-css…
f272bb8 
…-file-contents

Weblab: Update default CSS file contents
@Hamms
Merge pull request #18287 from code-dot-org/blockly-1.6.26
0b10adf 
Update Blockly to 1.6.26
@deploy-code-org
Merge pull request #18302 from code-dot-org/staging
f5c6a64 
DTT (Staging > Test) [robo-dtt]
@islemaster
Merge pull request #18283 from code-dot-org/react-es6-feedback
b0ad113 
React: ES6ify and test components in templates/feedback
@deploy-code-org
Merge pull request #18303 from code-dot-org/staging
1ae46b4 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org
staging content changes (-robo-commit)
4d9b572
@deploy-code-org
Merge branch 'staging' of github.com:code-dot-org/code-dot-org into s…
dc49b88 
…taging
@ewjordan
Merge pull request #18294 from code-dot-org/clever-takeover-should-on…
b20a19c 
…ly-pop-once

Ensure Clever account linking popup only shows up on first login
@aoby
Merge pull request #18285 from code-dot-org/pd-button-list-test-and-e…
5dc3835 
…xpand

Extend the Pd ButtonList form component to support custom input fields
@ewjordan
Merge pull request #18295 from code-dot-org/clever-oauth-takeover
7abe8cf 
Enable Clever takeover of other oauth accounts
@deploy-code-org
Merge pull request #18306 from code-dot-org/staging
b22cbad 
DTT (Staging > Test) [robo-dtt]
@jeremydstone jeremydstone merged commit 605875c into levelbuilder Oct 11, 2017
@deploy-code-org deploy-code-org deleted the dtl_candidate_b22cbad0 branch October 11, 2017 23:20
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