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.

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

merge from main #94

Merged
merged 28 commits into from
Mar 10, 2016
Merged

Commits on Mar 2, 2016

  1. Updated Save As to save the Script window contents, also made the Fil…

    …e>Save Click functional
    deaspo committed Mar 2, 2016
    Configuration menu
    Copy the full SHA
    5ca4e67 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2016

  1. Configuration menu
    Copy the full SHA
    7f4267a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    99908b1 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2016

  1. Merge pull request #41 from africanmathsinitiative/master

    Update main branch
    stevekogo committed Mar 7, 2016
    Configuration menu
    Copy the full SHA
    e822b42 View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2016

  1. Merge pull request #42 from africanmathsinitiative/master

    Update main branch
    stevekogo committed Mar 8, 2016
    Configuration menu
    Copy the full SHA
    9788fa3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    45b4f47 View commit details
    Browse the repository at this point in the history
  3. Initial boxplot tidying

    maxwellfundi committed Mar 8, 2016
    Configuration menu
    Copy the full SHA
    915d32f View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    103bcfe View commit details
    Browse the repository at this point in the history
  5. Merge pull request #1004 from deaspo/dlgSaveAs

    Updated Save As to save the Script window contents, also made the File>Save Click functional
    dannyparsons committed Mar 8, 2016
    Configuration menu
    Copy the full SHA
    f37d208 View commit details
    Browse the repository at this point in the history
  6. finalised boxplot

    maxwellfundi committed Mar 8, 2016
    Configuration menu
    Copy the full SHA
    5c480a0 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f324133 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    d7dbf5b View commit details
    Browse the repository at this point in the history
  9. Merge pull request #1030 from dannyparsons/SimpleWithGroups

    Tidy of RLink functions and created user controls for Saving objects
    dannyparsons committed Mar 8, 2016
    Configuration menu
    Copy the full SHA
    e8cfc1a View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    4079de2 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2016

  1. Configuration menu
    Copy the full SHA
    5747ad5 View commit details
    Browse the repository at this point in the history
  2. dlgRegularSequence

    Adding dataframe Length functionality
    Lunalo committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    2281e43 View commit details
    Browse the repository at this point in the history
  3. dlgRegularSequene

    checking for OKEnabled
    Lunalo committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    019c3c3 View commit details
    Browse the repository at this point in the history
  4. adding value changed event

    Lunalo committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    0739170 View commit details
    Browse the repository at this point in the history
  5. Tidying up

    Lunalo committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    9a2a50f View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    615f2a5 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    7e6a7a0 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    5fd3e07 View commit details
    Browse the repository at this point in the history
  9. dlgRegularSequence

    Tidying up
    Lunalo committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    17305b2 View commit details
    Browse the repository at this point in the history
  10. Merge pull request #1035 from Lunalo/dlgRegularSequence

    Dlg regular sequence
    dannyparsons committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    dc74199 View commit details
    Browse the repository at this point in the history
  11. Editing updates

    stevekogo committed Mar 9, 2016
    Configuration menu
    Copy the full SHA
    f4e39d0 View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2016

  1. Changed thing as discussed on git.

    Moving Horizontal boxplot to the main and also changing the subdialogs SetDefaults
    maxwellfundi committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    d993380 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1027 from stevekogo/R-methods

    Extended functionality of move_columns_in_data method to operate on more  than one column
    dannyparsons committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    bb7595d View commit details
    Browse the repository at this point in the history
  3. Merge pull request #1029 from maxwellfundi/tidyingUpBoxplot

    finalised boxplot
    dannyparsons committed Mar 10, 2016
    Configuration menu
    Copy the full SHA
    42cdab0 View commit details
    Browse the repository at this point in the history