Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: MarkUsProject/Markus
base: 2fd89d32ad0a
Choose a base ref
...
head repository: MarkUsProject/Markus
compare: 623521ee298c
Choose a head ref
  • 5 commits
  • 10 files changed
  • 2 contributors

Commits on Sep 29, 2012

  1. Clean up of javascript includes to eliminate reduntant calls. Grouped… 

    … page-wide javascript in the main index template, 'group' spcecific js includes in the group template.
    @ioev
    ioev committed Sep 29, 2012
    Copy the full SHA
    63e5f53 View commit details
    Browse the repository at this point in the history

  2. Added locale string for "Add new group".

    @ioev
    ioev committed Sep 29, 2012
    Copy the full SHA
    ea1d081 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of git://github.com/MarkUsProject/Markus into i… 

    …ssue-846
    @ioev
    ioev committed Sep 29, 2012
    Copy the full SHA
    150ee7c View commit details
    Browse the repository at this point in the history

  4. Fixed a test name that was generating a warning because it was a dupl… 

    …icate. Fixed a call to gather an Assignments collectin to guarantee it will receive an array.
    @ioev
    ioev committed Sep 29, 2012
    Copy the full SHA
    17cb586 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2012

  1. Merge pull request #859 from ioev/issue-846 

    Deleting Groups Causes Rails Exceptions
    @jerboaa
    jerboaa committed Oct 3, 2012
    Copy the full SHA
    623521e View commit details
    Browse the repository at this point in the history