Permalink
Commits on Apr 7, 2016
  1. @augustf

    Bump to 2.3.3

    augustf committed Apr 7, 2016
  2. @augustf

    Update plugins

    augustf committed Apr 7, 2016
Commits on Apr 5, 2016
  1. @gbprz

    Merge pull request #1336 from concerto/content-resubmit-tooltip

    Content resubmit tooltip
    gbprz committed Apr 5, 2016
  2. @augustf

    Merge pull request #1338 from concerto/onlineScreenIcon

    Change icon color when screen is online
    augustf committed Apr 5, 2016
  3. @gbprz
Commits on Mar 28, 2016
  1. @gbprz

    Use page:change event

    gbprz committed Mar 28, 2016
  2. @gbprz

    Fix issue with timepicker

    gbprz committed Mar 28, 2016
Commits on Mar 27, 2016
  1. @gbprz
  2. @gbprz
Commits on Mar 22, 2016
  1. @augustf

    Merge pull request #1330 from concerto/fix_repeating_content

    Make frontend fields stateless to resolve repeating content issues.
    augustf committed Mar 22, 2016
Commits on Mar 20, 2016
  1. @mikldt

    Make frontend fields stateless to resolve repeating content issues.

    This eliminates the concept of a store for timeline data, which was just
    going to the client anyway when cookie store was enabled. Instead, the
    entire timeline worth of content will be sent to the client. This
    timeline is not reliant on getting a cookie back which could have been
    overwritten in the client by a simultaneous request.
    
    If a reliable store for this data is found, the store concept could be
    reinstated. However the only reason for this would seem to be if the
    client could not store the whole timeline, which seems unlikely.
    
    See #1329.
    mikldt committed Mar 20, 2016
Commits on Mar 16, 2016
  1. @mikldt

    Fix an error on graphic upload

    Uploading images for new content was failing with
    
        undefined local variable or method `image_info'
    
    Variables created in a block are scoped to that block, so it is now
    declared outside.
    mikldt committed Mar 16, 2016
Commits on Mar 11, 2016
  1. @mikldt

    Alphebitize screens to provide a consistent order

    Rather than the ever-changing DB return order. Closes #1326.
    mikldt committed Mar 11, 2016
  2. @mikldt

    Move screens#index Player count to a plugin view hook.

    Closes #1327. Users will not see a player count until the
    concerto-hardware gem is cut and they have updated it.
    mikldt committed Mar 11, 2016
Commits on Mar 8, 2016
  1. @augustf

    Merge pull request #1320 from concerto/1313-image-size-info

    display image size info
    augustf committed Mar 8, 2016
Commits on Feb 8, 2016
  1. @zr2d2

    Merge pull request #1310 from concerto/rails4.2

    Migrate to Rails 4.2
    zr2d2 committed Feb 8, 2016
Commits on Feb 3, 2016
  1. @mfrederickson
  2. @mfrederickson

    add image_info method

    mfrederickson committed Feb 3, 2016
  3. @mfrederickson
  4. @mfrederickson

    Merge pull request #1319 from concerto/pendingMemberships

    closes #1292 only shows badge when needed
    mfrederickson committed Feb 3, 2016
  5. @mfrederickson
Commits on Jan 29, 2016
  1. @gbprz
  2. @gbprz
  3. @gbprz
Commits on Jan 28, 2016
  1. @gbprz
Commits on Jan 27, 2016
  1. @augustf

    Merge pull request #1315 from concerto/pendingMemberships

    Add badge with pending membership count to group's manage members button
    augustf committed Jan 27, 2016
  2. @augustf

    Merge pull request #1316 from concerto/contentDateDefaults

    Use saved content start and end date/time while editing
    augustf committed Jan 27, 2016
Commits on Jan 26, 2016
  1. @gbprz
  2. @gbprz
Commits on Dec 29, 2015
  1. @gbprz
Commits on Dec 27, 2015
  1. @gbprz

    Update README

    gbprz committed Dec 27, 2015
  2. @gbprz

    Drop Ruby 1.9.3 build tests

    gbprz committed Dec 27, 2015
Commits on Dec 25, 2015
  1. @gbprz
  2. @gbprz
Commits on Dec 24, 2015
  1. @gbprz