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

Scenarios [work in progress] #325

Merged
merged 21 commits into from
Jun 19, 2014
Merged

Scenarios [work in progress] #325

merged 21 commits into from
Jun 19, 2014

Commits on May 15, 2014

  1. add basic scaffold of scenarios, including the ability to add agents … 

    …to scenarios, edit scenarios, and view scenarios. next step: import and export
    @cantino
    cantino committed May 15, 2014
    Configuration menu
    Copy the full SHA
    aaa4b7a View commit details
    Browse the repository at this point in the history

Commits on May 31, 2014

  1. Merge remote-tracking branch 'origin/master' into scenarios

    @cantino
    cantino committed May 31, 2014
    Configuration menu
    Copy the full SHA
    fc878f4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into scenarios 

    Conflicts:
	app/assets/stylesheets/application.css.scss.erb
	app/views/agents/index.html.erb
	app/views/agents/show.html.erb
    @cantino
    cantino committed May 31, 2014
    Configuration menu
    Copy the full SHA
    32ef369 View commit details
    Browse the repository at this point in the history

  3. Scope menu

    @cantino
    cantino committed May 31, 2014
    Configuration menu
    Copy the full SHA
    aefc7ba View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into scenarios

    @cantino
    cantino committed May 31, 2014
    Configuration menu
    Copy the full SHA
    8636c52 View commit details
    Browse the repository at this point in the history

  5. better handling of return paths, and more specs

    @cantino
    cantino committed May 31, 2014
    Configuration menu
    Copy the full SHA
    b25c38c View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into scenarios

    @cantino
    cantino committed May 31, 2014
    Configuration menu
    Copy the full SHA
    eb49a8b View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2014

  1. allow exporting of a set of Agents with their links from a Scenario; … 

    …Scenario guid is now generated and copied to export, as well as a source link when public
    @cantino
    cantino committed Jun 1, 2014
    Configuration menu
    Copy the full SHA
    6632502 View commit details
    Browse the repository at this point in the history

  2. easier removal of agents from scenarios via the menu

    @cantino
    cantino committed Jun 1, 2014
    Configuration menu
    Copy the full SHA
    b91faf6 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into scenarios

    @cantino
    cantino committed Jun 1, 2014
    Configuration menu
    Copy the full SHA
    a0aef96 View commit details
    Browse the repository at this point in the history

  4. diagram links back, export URL includes .json

    @cantino
    cantino committed Jun 1, 2014
    Configuration menu
    Copy the full SHA
    b9b6fa5 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2014

  1. upload and fetch by url, data object manages import; next step is act… 

    …ual import
    @cantino
    cantino committed Jun 2, 2014
    Configuration menu
    Copy the full SHA
    5c1fbdb View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2014

  1. Importing of Scenarios now works, creating any needed Agents by globa… 

    …l guid
    @cantino
    cantino committed Jun 5, 2014
    Configuration menu
    Copy the full SHA
    64564eb View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2014

  1. Merge remote-tracking branch 'origin/master' into scenarios

    @cantino
    cantino committed Jun 7, 2014
    Configuration menu
    Copy the full SHA
    f3ffb33 View commit details
    Browse the repository at this point in the history

  2. show description; allow updating of existing scenarios by URL

    @cantino
    cantino committed Jun 7, 2014
    Configuration menu
    Copy the full SHA
    bdc5638 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2014

  1. the import process now allows you to merge your agents with the incom… 

    …ing ones; next step is better UI
    @cantino
    cantino committed Jun 9, 2014
    Configuration menu
    Copy the full SHA
    827b623 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2014

  1. integrate dsander's suggestions

    @cantino
    cantino committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    cd5c706 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into scenarios

    @cantino
    cantino committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    a43d6ea View commit details
    Browse the repository at this point in the history

  3. fix OpenStruct for 1.9.3

    @cantino
    cantino committed Jun 10, 2014
    Configuration menu
    Copy the full SHA
    7ecd099 View commit details
    Browse the repository at this point in the history

Commits on Jun 14, 2014

  1. Merge branch 'master' into scenarios

    @cantino
    cantino committed Jun 14, 2014
    Configuration menu
    Copy the full SHA
    cca78da View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2014

  1. Nicer formatting of JSONEditor; minor tweeks; Scenarios show up in th… 

    …e quick navigation menu
    @cantino
    cantino committed Jun 15, 2014
    Configuration menu
    Copy the full SHA
    a7ed5b5 View commit details
    Browse the repository at this point in the history