Changeset [8da6c7ff1362f2007dc3754631e7f054aeb4615a] by Haris Khan
September 25th, 2010 @ 12:28 AM
Merge branch 'master' of github.com:wtg/concerto
Conflicts:
public/stylesheets/base.css
http://github.com/wtg/concerto/commit/8da6c7ff1362f2007dc3754631e7f...
Committed by Haris Khan
- A app/views/contents/_grid.html.erb
- A app/views/contents/_table.html.erb
- A public/images/elements/slider.png
- A public/images/layout/C/sidebar_light.png
- A public/images/layout/button_disclosure.png
- A public/javascripts/rangeinput.js
- A public/stylesheets/css.css
- R app/views/layouts/splitview.html.erb
- R public/images/layout/C/sidebar_sm.png
- M Gemfile
- M Gemfile.lock
- M app/controllers/contents_controller.rb
- M app/controllers/feeds_controller.rb
- M app/helpers/application_helper.rb
- M app/views/contents/graphic/_form.html.erb
- M app/views/contents/index.html.erb
- M app/views/contents/new.html.erb
- M app/views/feeds/edit.html.erb
- M app/views/feeds/new.html.erb
- M app/views/groups/edit.html.erb
- M app/views/groups/new.html.erb
- M app/views/layouts/application.html.erb
- M app/views/screens/edit.html.erb
- M app/views/screens/new.html.erb
- M public/images/layout/C/bg_sm.png
- M public/images/layout/button_feed_states.png
- M public/javascripts/application.js
- M public/javascripts/jquery-ujs
- M public/stylesheets/base.css
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>.