Skip to content

Conversation

@Bjvanminnen
Copy link
Contributor

No description provided.

wjordan and others added 30 commits June 25, 2015 14:51
small tweaks to milestone parser v2:
- FileUtils.cp instead of File.copy
- cleanup tests
- update aws-sdk to latest patch ver 2.0.48
(remove deprecation warnings in recent versions of minitest)
(prevent string-cast warnings in ga debugger)
Relying on User.next_unpassed_progression_level was not correct, since it will just return the first level for a progression that has not yet been started.  This meant we were showing 'continue' even when we should have been showing 'try now'.
…case they still point to the project from which they were copied during a remix.
They are now used for the course blocks on studio.code.org, and they are unit tested.
[Finishes #97359382] dont go back page when pressing backspace in applab
commit c82dca4
Merge: 49a8ead cf0cbd2
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Mon Jun 29 13:30:33 2015 -0700

    Merge pull request #2977 from code-dot-org/noBackwardsOnDelete

    [Finishes #97359382] dont go back page when pressing backspace in applab

commit cf0cbd2
Author: Brent Van Minnen <bjvanminnen@gmail.com>
Date:   Mon Jun 29 12:25:14 2015 -0700

    dont go back page when pressing backspace in applab
commit 6c1cbde
Merge: 0655343 779aaec
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Mon Jun 29 13:59:30 2015 -0700

    Merge pull request #2976 from code-dot-org/assets-api-remix

    Copy assets on remix

commit 0655343
Author: Continuous Integration <dev@code.org>
Date:   Mon Jun 29 20:53:56 2015 +0000

    dropbox and gsheet changes

commit 8be3737
Author: Continuous Integration <dev@code.org>
Date:   Mon Jun 29 20:38:13 2015 +0000

    Automatically built.

    commit c82dca4
    Merge: 49a8ead cf0cbd2
    Author: Bjvanminnen <Bjvanminnen@gmail.com>
    Date:   Mon Jun 29 13:30:33 2015 -0700

        Merge pull request #2977 from code-dot-org/noBackwardsOnDelete

        [Finishes #97359382] dont go back page when pressing backspace in applab

    commit cf0cbd2
    Author: Brent Van Minnen <bjvanminnen@gmail.com>
    Date:   Mon Jun 29 12:25:14 2015 -0700

        dont go back page when pressing backspace in applab

commit c82dca4
Merge: 49a8ead cf0cbd2
Author: Bjvanminnen <Bjvanminnen@gmail.com>
Date:   Mon Jun 29 13:30:33 2015 -0700

    Merge pull request #2977 from code-dot-org/noBackwardsOnDelete

    [Finishes #97359382] dont go back page when pressing backspace in applab

commit 779aaec
Author: David Bailey <dsb123@gmail.com>
Date:   Mon Jun 29 12:04:05 2015 -0700

    add test_assets_copy_all
fix jshint via github gui
commit 23eab42
Author: davidsbailey <davidsbailey@users.noreply.github.com>
Date:   Mon Jun 29 14:05:12 2015 -0700

    Update designMode.js

    fix jshint via github gui
- Add backtrace filter to abbreviate common paths (CDO, Gem paths) and remove common gems from the backtrace entirely (Rake)
- add standard STDOUT logger, use this for HipChat log messages if hip_chat_logging is not enabled (e.g. development)
- raise output from RakeUtils#system call as backtrace from nonzero exit status
Bjvanminnen added a commit that referenced this pull request Jun 30, 2015
@Bjvanminnen Bjvanminnen merged commit 4996743 into test Jun 30, 2015
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.

7 participants