Skip to content
Commits on Dec 24, 2015
  1. @gbprz

    Migrate to Rails 4.2

    gbprz committed Dec 24, 2015
Commits on Sep 12, 2015
  1. @augustf
Commits on Aug 22, 2015
  1. @gbprz

    Adds new field config options for transitions and updates default tim…

    gbprz committed Aug 22, 2015
    …e field transition in database seeds
Commits on Aug 21, 2015
  1. @augustf

    Add timezone to screens for #498

    augustf committed Aug 21, 2015
Commits on May 12, 2015
  1. @augustf
Commits on May 9, 2015
  1. @augustf
Commits on May 6, 2015
  1. @gbprz
Commits on Apr 10, 2015
  1. @augustf

    Revert "Add time zone for screens per #498; timezone is still nil in …

    augustf committed Apr 10, 2015
    …the frontend JS"
    
    This reverts commit 16fc862.
Commits on Apr 9, 2015
  1. @augustf
Commits on Apr 7, 2015
  1. @augustf

    Revert "Contrain user uniqueness in model, not DB, to accomodate conc…

    augustf committed Apr 7, 2015
    …erto-identities"
    
    Aside from being from my misconfigured Mac, this commit should wait for some work on the identities table.
    
    This reverts commit 6944454.
  2. Contrain user uniqueness in model, not DB, to accomodate concerto-ide…

    your_name committed Apr 6, 2015
    …ntities
Commits on Oct 1, 2014
  1. @augustf
Commits on Sep 30, 2014
  1. @augustf
Commits on Aug 19, 2014
  1. @khanh

    Merge branch 'rails-4'

    khanh committed Aug 19, 2014
    Conflicts:
    	app/models/content.rb
    	db/schema.rb
Commits on Aug 5, 2014
  1. @augustf
Commits on Aug 4, 2014
  1. @augustf

    Clean up i18n for pages

    augustf committed Aug 3, 2014
Commits on Aug 3, 2014
  1. @augustf
Commits on Aug 2, 2014
  1. @augustf
Commits on Aug 1, 2014
  1. @augustf
Commits on Jun 7, 2014
  1. @zr2d2

    work on test errors

    zr2d2 committed Jun 7, 2014
  2. @zr2d2

    Merge branch 'master' into rails-4

    zr2d2 committed Jun 7, 2014
    * master: (70 commits)
      use correct english plural forms
      clean up activity mailer translations for #838
      Per documentcloud/docsplit#111 we're now using env vars to set the graphics conversion suite
      Fixing #949 by removing pirate files
      Pass all tests
      Fixed model method calls
      Add i18n missing keys rake task
      i18n english translations
      As of cancancan 1.8.2, tests pass - closing #943
      remove extraneous rake task
      i18n updates
      Finally found the critical syntax error...
      Found another trixy syntax error
      Fixed some syntax
      destroy children when content is deleted
      fix crash in weighted shuffler when content with id does not exist
      Reverted i18n commits and moved to branch
      fixed more interpolation fails
      fixed interpolation fails
      i18n - models pt. 2
      ...
    
    Conflicts:
    	Gemfile-plugins
    	Gemfile.lock
    	app/controllers/memberships_controller.rb
    	app/models/concerto_plugin.rb
    	config/environments/development.rb
    	db/schema.rb
Commits on May 29, 2014
  1. @augustf
Commits on May 23, 2014
  1. @augustf

    Added locale to screens for #498

    augustf committed May 23, 2014
  2. @zr2d2

    Merge branch 'master' into rails-4

    zr2d2 committed May 22, 2014
    * master: (33 commits)
      add french translation from Lucas Manssens
      General bundle update in keeping with #930 and the 1.8.x deprecation. The only restrictions left are for rails and Rubyzip (not sure why). Let's hope Generalissimo Travis approves of this little putsch
      rename variable and use clearer conditional
      fix feed visibility
      display group owned screen in my screens
      fix screen permission (don't show all screens in other section)
      Closes #924. Another Devilish Bug Vanquished.
      submissions#show issue where 'edit content' would block link
      #869 handle no files edits
      #869 support replacing graphic and stylesheet on template edit
      #869 add fields for graphic and stylesheet files
      Bump to 0.9.1.kilobalrog.
      Fixes #923 thanks for the hint @bamnet
      Disable viewport scaling for mobile devices
      changed responsiveness of menu per #521. it's not perfect, but it's a start without going crazy over mobile use
      fixed the attribution of the commit. sorry for being a concerto virgin...
      Revert "added "edit content" and some flashy jquery to actually do it"
      added "edit content" and some flashy jquery to actually do it
      Proper logging for Content Not Found for Frontend
      Closes #891.. Thanks @gabe283 thanks for finding this.
      ...
    
    Conflicts:
    	Gemfile
    	Gemfile.lock
Commits on May 21, 2014
  1. @khanh
Commits on May 17, 2014
  1. @zr2d2

    Merge branch 'master' into rails-4

    zr2d2 committed May 16, 2014
    * master: (24 commits)
      Implement Text_Resize FieldConfig. Resolves #904
      Fixes #920, we're checking fieldconfig updated_at now as well!
      Add timestamps to FieldConfig
      Include all templates by default
      got the semantic down pt2
      got the semantic down
      apparently this is the only way to do a post with link_to calling action results in ?method=post being attached to the url, looks like a bug in rails
      Even gods leave commented code in by mistake
      Fixes #915 , I am CSS GODDDD , take that zaiks
      1.8.x is done
      A comma
      Added field config for #904
      Last go with icalendar before I nuke 1.8 support from orbit
      Moved icalendar dependency of concerto_calendar back to the 1.5.x series to make Ruby 1.8 keep chugging
      Update hardare gem name and bump installed gems
      Revert "Merge pull request #917 from gabe283/CAS"
      Create Concerto admin group on first registration and redirect user sign_in route to CAS login page
      Added CAS omniauth support to Devise login
      Package names changed
      Initial CAS work
      ...
    
    Conflicts:
    	Gemfile.lock
    	db/schema.rb
Commits on May 15, 2014
  1. @khanh

    Add timestamps to FieldConfig

    khanh committed May 15, 2014
Commits on May 14, 2014
  1. @augustf

    Include all templates by default

    augustf committed May 14, 2014
Commits on May 12, 2014
  1. @augustf
Commits on Apr 27, 2014
  1. @zr2d2

    Merge branch 'master' into rails-4

    zr2d2 committed Apr 27, 2014
    * master:
      cherry-pick db/seeds from rails 4 branch, fix rails 3.2 compatability issues to close #914
    
    Conflicts:
    	db/seeds.rb
  2. @zr2d2

    cherry-pick db/seeds from rails 4 branch, fix rails 3.2 compatability…

    zr2d2 committed Apr 27, 2014
    … issues to close #914
    
    Conflicts:
    	db/seeds.rb
  3. @zr2d2

    resolve seed conflicts

    zr2d2 committed Apr 27, 2014
  4. @zr2d2

    Merge branch 'master' into rails-4

    zr2d2 committed Apr 27, 2014
    * master: (69 commits)
      Use the replace transition for the Time field by default, close #907.
      Use a default FieldConfig if one exists for #907.
      remove mailcatcher dependancies
      update rack-ssl
      Markup the controls based on the table of subscriptions, not the add button.
      Indentation / Dead code cleanup.
      Don't let non-editors appear to have access to update subscriptions.
      Store the Concerto version in the Enviroment Name, close #913.
      Bump to 0.9.0.kilobalrog.
      Make restart webserver button conditional
      Cleaned up content/submission editing workflow and added restart webserver button back
      Plugins crash if no controller hooks are specified since select is called on nil
      rvm no longer uses the rvmrc file
      fix 1.8.7 test incompatibility
      add missing tests
      fix end_time check when nil
      remove obsolete file
      add more tests identified by coverage report
      change group due to conflict with other fixtures
      add fixtures to support additional tests
      ...
    
    Conflicts:
    	Gemfile
    	Gemfile-plugins
    	Gemfile.lock
    	config/routes.rb
    	db/schema.rb
    	db/seeds.rb
  5. @bamnet
Commits on Feb 19, 2014
  1. @augustf

    Add concerto-hardware db stuff

    augustf committed Feb 18, 2014
Something went wrong with that request. Please try again.