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): de30436e #20948

Merged
merged 70 commits into from Feb 28, 2018
Merged

DTL (Test > Levelbuilder): de30436e #20948

merged 70 commits into from Feb 28, 2018

Conversation

deploy-code-org
Copy link
Contributor

No description provided.

joshlory and others added 30 commits February 15, 2018 11:26
@joshlory
Make video metadata editable by level builders
185ce37
@joshlory
Don't let level builders delete videos
2965373
@joshlory
Remove unused video show view
8986e70
@joshlory
WIP
25cc75b
@joshlory
Add Video.merge_and_write_i18n, regenerate data.en.yml
fd79f2c
@joshlory
Update video i18n on save
b9f300a
@joshlory
Also update videos.csv
e56ce15
@joshlory
Fix rails tests
1d79f7b
@bencodeorg
Add views around starting and completing courses [ci skip]
39e1bdf
@Erin007
fetch featured projects for the public gallery
27c5cf6
@joshlory
Merge branch 'staging' into allow-editing-of-video-metadata
bcf27e6
@Erin007
update query to join all necessary tables
0a95d61
@Erin007
extract data for featured project cards from the info returned by the…
bfbebdf 
… query
@Erin007
combine featured and regular published projects
1d0caa5
@Erin007
only call fetch_featured_projects if we have the url param
891329d
@Erin007
prepend v. append and use the url to make different api calls to fetc…
a67e020 
…h projects
@Erin007
Merge branch 'staging' into featured-projects-experiment-flag
0606d42
@bencodeorg
Set default permissions for analytics schemas [ci skip]
d4542bb
@Erin007
combine where clauses and referece user db correctly
44bed6c
@Erin007
use make_thumbnail_url_cacheable and clean up the include_featured me…
bc8889b 
…thod
@Erin007
use Sequel.lit to actually get random featured projects
95f1686
@Erin007
Merge branch 'staging' into featured-projects-experiment-flag
b91bf47
@Erin007
Merge branch 'staging' into featured-projects-experiment-flag
5a67210
@Erin007
Merge branch 'staging' into featured-projects-experiment-flag
9c6f37c
@Erin007
fix merge conflict - blank line - in public.js
b24c11b
@joshlory
Levelbuilder may now edit video config files
42456f2
@joshlory
Remove "show" link
62303e8
@joshlory
Merge branch 'staging' into allow-editing-of-video-metadata
981511a
Add strict xml parsing
2202a62
add program manager permission
c40e60d
Clare Constantine and others added 28 commits February 27, 2018 12:01
Add program manager permission to workshops controller
9542b5d
Add a couple unit tests
96b4952
@balderdash
Merge pull request #20920 from code-dot-org/xml-strict
f309ccd 
Add strict xml parsing
@bencodeorg
Include private schools with AP data in census_details [ci skip]
10015ea
@bencodeorg
Merge branch 'staging' into add-view-definitions
6100d22
@deploy-code-org
Merge pull request #20927 from code-dot-org/staging
ff156ef 
DTT (Staging > Test) [robo-dtt]
Strip out utf8mb4 characters from census submissions
3458637
@bencodeorg
Merge pull request #20880 from code-dot-org/add-view-definitions
30c0207 
Add views around starting and completing courses [ci skip]
Change map to each
d40727d
Front end updates to reflect program manager permission
4220d08
fix workshop form error
0d88aaa
@drewsamnick
Merge pull request #20928 from code-dot-org/census-strip-utf8mb4-chars
657fe1f 
Strip out utf8mb4 characters from census submissions
PR feedback
cc997a9
@deploy-code-org
Merge pull request #20934 from code-dot-org/staging
af8488c 
DTT (Staging > Test) [robo-dtt]
@Erin007
test extract_data_for_featured_project_cards
ffa81da
@Erin007
test extract_data_for_featured_project_cards
eedac38
@Erin007
test include_featured
a0b4277
@Erin007
remove unused featured_db_result
56fbb81
@joshlory
Merge pull request #20728 from code-dot-org/allow-editing-of-video-me…
44c22f5 
…tadata

Allow editing of video metadata
@deploy-code-org
Merge pull request #20936 from code-dot-org/staging
cdade61 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org
staging content changes (-robo-commit)
e8e4890
@deploy-code-org
Merge pull request #20939 from code-dot-org/staging
5a461cc 
DTT (Staging > Test) [robo-dtt]
Fix failing test
ea4639d
@deploy-code-org
Merge pull request #20941 from code-dot-org/levelbuilder
3b6468c 
DTS (Levelbuilder > Staging) [robo-dts]
@Erin007
Merge pull request #20779 from code-dot-org/featured-projects-experim…
af84447 
…ent-flag

Fetch featured projects for the public gallery (behind flag)
@deploy-code-org
Merge pull request #20942 from code-dot-org/staging
8d382c7 
DTT (Staging > Test) [robo-dtt]
Merge pull request #20803 from code-dot-org/program-manager-permission
09030a8 
Program manager permission
@deploy-code-org
Merge pull request #20944 from code-dot-org/staging
de30436 
DTT (Staging > Test) [robo-dtt]
@deploy-code-org deploy-code-org merged commit f6bad97 into levelbuilder Feb 28, 2018
@balderdash balderdash deleted the dtl_candidate_de30436e branch September 18, 2018 06:00
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 @joshlory @bencodeorg @Erin007 @balderdash @drewsamnick