Skip to content

DTP (Test > Production)#9358

Merged
jeremydstone merged 108 commits into
productionfrom
test
Jul 6, 2016
Merged

DTP (Test > Production)#9358
jeremydstone merged 108 commits into
productionfrom
test

Conversation

@jeremydstone

Copy link
Copy Markdown

No description provided.

ashercodeorg and others added 30 commits June 24, 2016 08:32
And remove the existing scrollbar. We wanted to override the scrollbar
for a couple of reasons; first, on OSX the scrollbar is hidden unless
you're actually scrolling, making it potentially difficult to discover
the "scrollability" of the region. Second, on other browsers, the
scrollbar was ugly and in the wrong place.

The new functionality adds appropriately-styled arrow buttons underneath
the hide button, which when clicked will scroll the instructions area.
The buttons are hidden when in collapsed mode or when the instructions
area is at its maximum height.
level_source_id is later fetched via ajax from /api/user_progress,
and that one is actually used.
As yet unused, but has at least basic support for project-backed level behavior too.
Put it in the setInitialAnimationList action creator in animationListModule.js, so soon when we want to call it on reset too, we can migrate old level animation JSON as well.
Somewhat repurpose sourceUrl property so it's only filled in when the animation is not stored in the animations API.

Fixes a merge bug with adding a new animation.
Fix retrieval of images from images.code.org by using our media proxy when loading a by-reference animation from source and the source URL is absolute.  Also simplifies the loadFromSource method by depending on the store to look up the source url.
Bump all references to stages in allthethings script, 19 and up (because 19 is where the gamelab stage got added) by one, so they refer to the level they referred to before.
ashercodeorg and others added 29 commits July 6, 2016 12:49
Adds the type column to the dashboard sections table.
For applab import, we need to be able to use the collections api against
projects that are not loaded on the page. With this change, you can now
say:

```javascript
sourcesApi.withProjectId('some-project').ajax(...)
```

And expect it to work.
In applab screen import, we need to fetch other projects so we can merge
their screens and assets. I'm putting the state maintenance for this
process into redux so that the UI components are simpler and everything
is easier to test.
Create new button component with unified styles
… a default). Fixed attachment encoding issue
Excludes IE 10 from activity-monitor.
Revert "Revert "Moving channel token logic from levels_helper into models""
…roject-form

Add redux actions/reducers for fetching channel and source information for a project
…nimations

Gamelab: Levels can prepopulate animations
…link

Make How It Works link work for embeds
Added attachment support to dashboard poste emails.
Remove unused level_source_id from appOptions
@jeremydstone jeremydstone merged commit 2f3e4b0 into production Jul 6, 2016
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.