Permalink
Commits on Feb 8, 2016
  1. Merge pull request #1310 from concerto/rails4.2

    Migrate to Rails 4.2
    zr2d2 committed Feb 8, 2016
Commits on Nov 1, 2015
  1. XMerge branch 'master' of git://github.com/concerto/concerto

    * 'master' of git://github.com/concerto/concerto:
      simple-rss wasn't giving proper dependencies
    zr2d2 committed Nov 1, 2015
Commits on Oct 30, 2015
Commits on Sep 20, 2015
  1. update travis.yml [ci skip]

    zr2d2 committed Sep 20, 2015
Commits on Sep 16, 2015
Commits on Sep 15, 2015
Commits on Jul 3, 2015
Commits on Apr 18, 2015
  1. add back db adapters, we really should come up with a better way of i…

    …ncluding these in dev
    zr2d2 committed Apr 18, 2015
  2. fix duplicate class

    zr2d2 committed Apr 18, 2015
Commits on Apr 11, 2015
  1. adjust id's to be unique

    zr2d2 committed Apr 11, 2015
Commits on Apr 9, 2015
  1. redo js selectors, logic

    zr2d2 committed Apr 9, 2015
Commits on Apr 7, 2015
Commits on Feb 5, 2015
  1. Merge branch 'master' of git://github.com/concerto/concerto

    * '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
    zr2d2 committed Feb 5, 2015
Commits on Dec 27, 2014
  1. dry up notification call

    zr2d2 committed Dec 27, 2014
Commits on Dec 23, 2014
  1. Merge pull request #1162 from simplysoft/housekeeping

    I have no problem with that
    zr2d2 committed Dec 23, 2014
Commits on Dec 19, 2014
  1. Merge pull request #1153 from concerto/1148-params-fix

    fixes #1148 under ruby 1.9
    zr2d2 committed Dec 19, 2014
Commits on Dec 13, 2014
Commits on Nov 8, 2014
  1. finish upgrading sprockets

    zr2d2 committed Nov 8, 2014
  2. upgrade sprockets

    zr2d2 committed Nov 8, 2014
  3. upgrade sass-rails

    zr2d2 committed Nov 8, 2014
Commits on Nov 1, 2014
  1. bump rails

    zr2d2 committed Nov 1, 2014
Commits on Oct 29, 2014
  1. bump redcarpet

    zr2d2 committed Oct 29, 2014
  2. bump nprogress-rails

    zr2d2 committed Oct 29, 2014
  3. bump execjs

    zr2d2 committed Oct 29, 2014
  4. bump rubyzip

    zr2d2 committed Oct 29, 2014
  5. Merge branch 'master' of git://github.com/concerto/concerto

    * 'master' of git://github.com/concerto/concerto:
      Enable universe for Libreoffice
    zr2d2 committed Oct 29, 2014