Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Commits on Feb 26, 2015
  1. August

    Merge pull request #1188 from concerto/position-order-fix

    augustf authored
    fix template preview image updating when it is modified
  2. Marvin Frederickson
  3. Marvin Frederickson
Commits on Feb 23, 2015
  1. August

    Some further refinements to #1185

    augustf authored
  2. August

    Bump to 2.2.7.

    augustf authored
  3. August
  4. August
Commits on Feb 18, 2015
  1. August
Commits on Feb 5, 2015
  1. Zach Rowe
  2. Zach Rowe

    Merge branch 'master' of git://github.com/concerto/concerto

    zr2d2 authored
    * 'master' of git://github.com/concerto/concerto: (56 commits)
      Revert "Clean up restriction of removing least leader from group per #1167"
      Clean up restriction of removing least leader from group per #1167
      Bump to 2.2.6.
      Revert "Bcrypt 3.1.7 was broken on OSX 10.10"
      Bcrypt 3.1.7 was broken on OSX 10.10
      A colon
      Change xframe options for preview per #1140
      mind the comments
      remove unnecessary block for cancan rules
      fix ActionController::UnknownFormat for png files
      update i18n task config for german
      Hallo Concerto
      combine non-english translations into one big file
      Bump to 2.2.5.
      [Frontend CSS] Hide cursor for .screen elements.
      delete duplicate translation
      only show leave group if membership can be deleted
      fix wrong count
      make devise views translatable
      add i18n coverage to groups views
      ...
    
    Conflicts:
    	app/controllers/contents_controller.rb
Commits on Feb 4, 2015
  1. August
  2. August

    Merge branch 'master' of https://github.com/concerto/concerto

    augustf authored
    * 'master' of https://github.com/concerto/concerto:
      update i18n task config for german
      Hallo Concerto
      combine non-english translations into one big file
  3. August
  4. August

    Merge pull request #1171 from simplysoft/german-translation

    augustf authored
    German translation
  5. August

    Bump to 2.2.6.

    augustf authored
  6. August

    Revert "Bcrypt 3.1.7 was broken on OSX 10.10"

    augustf authored
    This reverts commit ae0d2a2.
  7. August
  8. August

    Merge pull request #1179 from concerto/xframe

    augustf authored
    Change xframe options for preview per #1140
  9. August

    A colon

    augustf authored
  10. August
  11. Brian Michalski

    Merge pull request #1178 from simplysoft/bugs_and_defects

    bamnet authored
    remove unnecessary block for cancan rules
Commits on Feb 3, 2015
  1. simplysoft

    mind the comments

    simplysoft authored
  2. simplysoft
Commits on Jan 26, 2015
  1. August

    Merge pull request #1173 from simplysoft/bugs_and_defects

    augustf authored
    fix ActionController::UnknownFormat for png files
  2. simplysoft

    fix ActionController::UnknownFormat for png files

    simplysoft authored
    template preview urls like templates/1/preview.png?height=450&width=800 do have image/png format which was not handled
Commits on Jan 24, 2015
  1. simplysoft
  2. simplysoft

    Hallo Concerto

    simplysoft authored
    welcome german language :)
  3. simplysoft

    combine non-english translations into one big file

    simplysoft authored
    makes managing much easier
  4. August

    Bump to 2.2.5.

    augustf authored
  5. Kenley Cheung

    [Frontend CSS] Hide cursor for .screen elements.

    kench authored
    MOTIVATION : Request from concerto users list.
    NOTES : This was preferred over the expensive wildcard CSS operator.
Commits on Jan 12, 2015
  1. August

    Merge pull request #1164 from simplysoft/increase-i18n-coverage

    augustf authored
    Increase i18n coverage
  2. simplysoft
  3. August

    Merge pull request #1163 from simplysoft/cleanup-translation

    augustf authored
    Cleanup translation
  4. simplysoft
  5. simplysoft

    Merge remote-tracking branch 'origin/master' into increase-i18n-coverage

    simplysoft authored
    Conflicts:
    	app/views/feeds/moderate.html.erb
Something went wrong with that request. Please try again.