Changeset [b8281db466d358f331c82cb329c16f896216ef5e] by Zach Rowe

August 8th, 2011 @ 12:30 AM

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

Conflicts:

app/views/users/_form.html.erb
config/locales/en.yml
db/schema.rb

https://github.com/concerto/concerto/commit/b8281db466d358f331c82cb...

Committed by Zach Rowe

  • A .travis.yml
  • A app/assets/images/ui-bg_flat_55_999999_40x100.png
  • A app/assets/images/ui-bg_flat_75_aaaaaa_40x100.png
  • A app/assets/images/ui-bg_glass_45_0078ae_1x400.png
  • A app/assets/images/ui-bg_glass_55_f8da4e_1x400.png
  • A app/assets/images/ui-bg_glass_75_79c9ec_1x400.png
  • A app/assets/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
  • A app/assets/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
  • A app/assets/images/ui-bg_gloss-wave_75_2191c0_500x100.png
  • A app/assets/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
  • A app/assets/images/ui-icons_0078ae_256x240.png
  • A app/assets/images/ui-icons_056b93_256x240.png
  • A app/assets/images/ui-icons_d8e7f3_256x240.png
  • A app/assets/images/ui-icons_e0fdff_256x240.png
  • A app/assets/images/ui-icons_f5e175_256x240.png
  • A app/assets/images/ui-icons_f7a50d_256x240.png
  • A app/assets/images/ui-icons_fcd113_256x240.png
  • A app/models/ability.rb
  • A config/initializers/translated_languages.rb
  • A config/locales/controllers/en.yml
  • A config/locales/rails-defaults/ar.yml
  • A config/locales/rails-defaults/bg.yml
  • A config/locales/rails-defaults/bn-IN.yml
  • A config/locales/rails-defaults/bs.yml
  • A config/locales/rails-defaults/ca.yml
  • A config/locales/rails-defaults/cs.rb
  • A config/locales/rails-defaults/cy.yml
  • A config/locales/rails-defaults/da.yml
  • A config/locales/rails-defaults/de-AT.yml
  • A config/locales/rails-defaults/de-CH.yml
  • A config/locales/rails-defaults/de.yml
  • A config/locales/rails-defaults/dsb.yml
  • A config/locales/rails-defaults/el.yml
  • A config/locales/rails-defaults/en.yml
  • A config/locales/rails-defaults/eo.yml
  • A config/locales/rails-defaults/es-AR.yml
  • A config/locales/rails-defaults/es-CL.yml
  • A config/locales/rails-defaults/es-CO.yml
  • A config/locales/rails-defaults/es-MX.yml
  • A config/locales/rails-defaults/es-PE.yml
  • A config/locales/rails-defaults/es.yml
  • A config/locales/rails-defaults/et.yml
  • A config/locales/rails-defaults/eu.yml
  • A config/locales/rails-defaults/fa.yml
  • A config/locales/rails-defaults/fi.yml
  • A config/locales/rails-defaults/fr-CA.yml
  • A config/locales/rails-defaults/fr-CH.yml
  • A config/locales/rails-defaults/fr.yml
  • A config/locales/rails-defaults/fur.yml
  • A config/locales/rails-defaults/gl-ES.yml
  • A config/locales/rails-defaults/gsw-CH.yml
  • A config/locales/rails-defaults/he.yml
  • A config/locales/rails-defaults/hi-IN.yml
  • A config/locales/rails-defaults/hi.yml
  • A config/locales/rails-defaults/hr.yml
  • A config/locales/rails-defaults/hsb.yml
  • A config/locales/rails-defaults/hu.yml
  • A config/locales/rails-defaults/id.yml
  • A config/locales/rails-defaults/is.yml
  • A config/locales/rails-defaults/it.yml
  • A config/locales/rails-defaults/ja.yml
  • A config/locales/rails-defaults/kn.yml
  • A config/locales/rails-defaults/ko.yml
  • A config/locales/rails-defaults/lo.yml
  • A config/locales/rails-defaults/lt.yml
  • A config/locales/rails-defaults/lv.yml
  • A config/locales/rails-defaults/mk.yml
  • A config/locales/rails-defaults/mn.yml
  • A config/locales/rails-defaults/nb.yml
  • A config/locales/rails-defaults/nl.yml
  • A config/locales/rails-defaults/nn.yml
  • A config/locales/rails-defaults/pl.yml
  • A config/locales/rails-defaults/pt-BR.yml
  • A config/locales/rails-defaults/pt-PT.yml
  • A config/locales/rails-defaults/rm.yml
  • A config/locales/rails-defaults/ro.yml
  • A config/locales/rails-defaults/ru.yml
  • A config/locales/rails-defaults/sk.yml
  • A config/locales/rails-defaults/sl.yml
  • A config/locales/rails-defaults/sr-Latn.yml
  • A config/locales/rails-defaults/sr.yml
  • A config/locales/rails-defaults/sv-SE.yml
  • A config/locales/rails-defaults/sw.yml
  • A config/locales/rails-defaults/th.rb
  • A config/locales/rails-defaults/tr.yml
  • A config/locales/rails-defaults/uk.yml
  • A config/locales/rails-defaults/vi.yml
  • A config/locales/rails-defaults/zh-CN.yml
  • A config/locales/rails-defaults/zh-TW.yml
  • A config/locales/views/contents/en.yml
  • A config/locales/views/elements/en.yml
  • A config/locales/views/feeds/en.yml
  • A config/locales/views/fields/en.yml
  • A config/locales/views/groups/en.yml
  • A config/locales/views/positions/en.yml
  • A config/locales/views/screens/en.yml
  • A config/locales/views/submissions/en.yml
  • A config/locales/views/subscriptions/en.yml
  • A config/locales/views/templates/en.yml
  • A config/locales/views/users/en.yml
  • A db/migrate/20110802060439_add_is_admin_to_users.rb
  • A db/migrate/20110803054805_add_permission_to_feeds.rb
  • R app/assets/stylesheets/images/ui-bg_flat_55_999999_40x100.png
  • R app/assets/stylesheets/images/ui-bg_flat_75_aaaaaa_40x100.png
  • R app/assets/stylesheets/images/ui-bg_glass_45_0078ae_1x400.png
  • R app/assets/stylesheets/images/ui-bg_glass_55_f8da4e_1x400.png
  • R app/assets/stylesheets/images/ui-bg_glass_75_79c9ec_1x400.png
  • R app/assets/stylesheets/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
  • R app/assets/stylesheets/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
  • R app/assets/stylesheets/images/ui-bg_gloss-wave_75_2191c0_500x100.png
  • R app/assets/stylesheets/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
  • R app/assets/stylesheets/images/ui-icons_0078ae_256x240.png
  • R app/assets/stylesheets/images/ui-icons_056b93_256x240.png
  • R app/assets/stylesheets/images/ui-icons_d8e7f3_256x240.png
  • R app/assets/stylesheets/images/ui-icons_e0fdff_256x240.png
  • R app/assets/stylesheets/images/ui-icons_f5e175_256x240.png
  • R app/assets/stylesheets/images/ui-icons_f7a50d_256x240.png
  • R app/assets/stylesheets/images/ui-icons_fcd113_256x240.png
  • R app/assets/javascripts/jquery-ui.min.js
  • M Gemfile
  • M Gemfile.lock
  • M app/assets/javascripts/application.js
  • M app/controllers/contents_controller.rb
  • M app/controllers/feeds_controller.rb
  • M app/controllers/fields_controller.rb
  • M app/controllers/groups_controller.rb
  • M app/controllers/memberships_controller.rb
  • M app/controllers/positions_controller.rb
  • M app/controllers/screens_controller.rb
  • M app/controllers/submissions_controller.rb
  • M app/controllers/subscriptions_controller.rb
  • M app/controllers/templates_controller.rb
  • M app/controllers/users_controller.rb
  • M app/models/user.rb
  • M app/views/contents/_form.html.erb
  • M app/views/contents/_table.html.erb
  • M app/views/contents/edit.html.erb
  • M app/views/contents/form_elements/_feeds.html.erb
  • M app/views/contents/graphic/_form.html.erb
  • M app/views/contents/new.html.erb
  • M app/views/elements/_topmenu.html.erb
  • M app/views/feeds/_form.html.erb
  • M app/views/feeds/edit.html.erb
  • M app/views/feeds/index.html.erb
  • M app/views/feeds/new.html.erb
  • M app/views/feeds/show.html.erb
  • M app/views/users/_form.html.erb
  • M config/application.rb
  • M config/environments/development.rb
  • M config/environments/production.rb
  • M config/environments/test.rb
  • M config/locales/en.yml
  • M db/schema.rb
  • M test/fixtures/feeds.yml
  • M test/fixtures/screens.yml
  • M test/fixtures/users.yml
  • M test/unit/content_test.rb
  • M test/unit/feed_test.rb
  • M test/unit/screen_test.rb
  • M test/unit/user_test.rb
New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป

Concerto is an open source digital signage system that makes it easy to engage a large community of people with graphical and text-based announcements, bulletins, and other messages... but enough about us, you came here to get involved.
<br />
If you think you've <b>found a bug in Concerto</b>, please click 'Create new ticket' and let us know about it.
<br />
Looking to peek at our source code? Head to <a href="https://github.com/concerto/concerto_v1">https://github.com/concerto/concerto_v1</a> (Concerto version 1) or <a href="https://github.com/concerto/concerto">https://github.com/concerto/concerto</a> (Concerto version 2).
<br />
Our getting started guide is available here: <a href="https://github.com/concerto/concerto/wiki/Getting-Involved">https://github.com/concerto/concerto/wiki/Getting-Involved</a>.