Skip to content

Merge staging-next into staging#9043

Merged
islemaster merged 133 commits into
stagingfrom
staging-next
Jun 21, 2016
Merged

Merge staging-next into staging#9043
islemaster merged 133 commits into
stagingfrom
staging-next

Conversation

@davidsbailey

Copy link
Copy Markdown
Member

No description provided.

cpirich and others added 30 commits May 25, 2016 12:24
Remove apps build dependency, use code-studio's copy of color.js
Implements update_document_type_form.
…er, then Run, then Finish with submitting contained level data
Also it now shows up at /admin/styleguide
…_sharing

calculateCodeInfo all the time (needed in hideSource mode when speed() API is called)
ashercodeorg and others added 26 commits June 20, 2016 17:08
Stops population of the *_on columns in the pegasus contacts table.
add optional answer feedback strings to match and multi
Switch index form unsubscribed_on to unsubscribed_at.
Rename files in pegasus/migrations/ for alphabetization purposes.
Fixes violations of and reenables the rubocop Style/EmptyElse check.
* add cdo-freegeoip cookbook

* add note to .kitchen.yml
[ci skip]

* update Berksfile.lock
[ci skip]
add a bunch of eyes tests for top instructions
Add api for copying assets between projects
…for-dialog

Give up on changing dialog margins globally
@islemaster islemaster changed the title DO NOT MERGE - dummy PR to run UI tests on staging-next Merge staging-next into staging Jun 21, 2016
@islemaster

Copy link
Copy Markdown
Contributor

Staging-next nearly passed UI and eyes tests at 7181bd3 - one issue was fixed by paul in 65f58e9

Ready to merge!

@islemaster islemaster merged commit 1b06066 into staging Jun 21, 2016
@ashercodeorg ashercodeorg deleted the staging-next branch August 9, 2016 18:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants