Merge branch 'development' of https://github.com/Rulingcom/orbit into development
Conflicts: config/mongoid.yml
saurabhbhatia
5
Gemfile
|
|
@ -46,14 +46,15 @@ gem 'sinatra'
|
|||
gem 'sprockets'
|
||||
gem 'social-share-button'
|
||||
|
||||
gem 'tinymce-rails'
|
||||
gem 'ckeditor_rails'
|
||||
# gem 'tinymce-rails', "~> 3.5.8"
|
||||
gem 'therubyracer' if RUBY_PLATFORM.downcase.include?("linux")
|
||||
gem 'libv8', '~> 3.11.8' if RUBY_PLATFORM.downcase.include?("linux")
|
||||
gem 'mongoid-encryptor', :require => 'mongoid/encryptor'
|
||||
gem 'rb-readline','~> 0.4.2' if RUBY_PLATFORM.downcase.include?("linux")
|
||||
|
||||
|
||||
gem "impressionist", :git => 'git://github.com/charlotte-ruby/impressionist.git'
|
||||
gem "impressionist",'1.2.0'
|
||||
#gem 'contacts'
|
||||
#gem 'event-calendar', :require => 'event_calendar'#, :git => 'git://github.com/elevation/event_calendar.git'
|
||||
|
||||
|
|
|
|||
|
Before 
(image error) Size: 923 B After 
(image error) Size: 923 B
|
|
Before 
(image error) Size: 43 KiB After 
(image error) Size: 43 KiB
|
|
Before 
(image error) Size: 1.2 KiB After 
(image error) Size: 1.2 KiB
|
|
Before 
(image error) Size: 8.0 KiB After 
(image error) Size: 8.0 KiB
|
|
Before 
(image error) Size: 209 B After 
(image error) Size: 209 B
|
|
Before 
(image error) Size: 44 KiB After 
(image error) Size: 44 KiB
|
|
Before 
(image error) Size: 157 B After 
(image error) Size: 157 B
|
|
Before 
(image error) Size: 211 B After 
(image error) Size: 211 B
|
|
Before 
(image error) Size: 393 B After 
(image error) Size: 393 B
|
|
Before 
(image error) Size: 499 B After 
(image error) Size: 499 B
|
|
Before 
(image error) Size: 6.3 KiB After 
(image error) Size: 6.3 KiB
|
|
Before 
(image error) Size: 504 B After 
(image error) Size: 504 B
|
|
Before 
(image error) Size: 724 KiB After 
(image error) Size: 724 KiB
|
|
Before 
(image error) Size: 1.1 KiB After 
(image error) Size: 1.1 KiB
|
|
Before 
(image error) Size: 798 B After 
(image error) Size: 798 B
|
|
Before 
(image error) Size: 2.4 KiB After 
(image error) Size: 2.4 KiB
|
|
Before 
(image error) Size: 820 B After 
(image error) Size: 820 B
|
|
Before 
(image error) Size: 2.4 KiB After 
(image error) Size: 2.4 KiB
|
|
Before 
(image error) Size: 1.4 KiB After 
(image error) Size: 1.4 KiB
|
|
Before 
(image error) Size: 778 B After 
(image error) Size: 778 B
|
|
Before 
(image error) Size: 2.7 KiB After 
(image error) Size: 2.7 KiB
|
|
Before 
(image error) Size: 104 KiB After 
(image error) Size: 104 KiB
|
|
Before 
(image error) Size: 3.6 KiB After 
(image error) Size: 3.6 KiB
|
|
Before 
(image error) Size: 1.2 KiB After 
(image error) Size: 1.2 KiB
|
|
Before 
(image error) Size: 1.0 KiB After 
(image error) Size: 1.0 KiB
|
|
Before 
(image error) Size: 2.2 KiB After 
(image error) Size: 2.2 KiB
|
|
Before 
(image error) Size: 824 B After 
(image error) Size: 824 B
|
|
Before 
(image error) Size: 845 B After 
(image error) Size: 845 B
|
|
Before 
(image error) Size: 1.8 KiB After 
(image error) Size: 1.8 KiB
|
|
Before 
(image error) Size: 548 B After 
(image error) Size: 548 B
|
|
Before 
(image error) Size: 2.9 KiB After 
(image error) Size: 2.9 KiB
|
|
Before 
(image error) Size: 54 KiB After 
(image error) Size: 54 KiB
|
|
Before 
(image error) Size: 36 KiB After 
(image error) Size: 36 KiB
|
|
Before 
(image error) Size: 46 KiB After 
(image error) Size: 46 KiB
|
|
Before 
(image error) Size: 7.0 KiB After 
(image error) Size: 7.0 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 17 KiB After 
(image error) Size: 17 KiB
|
|
Before 
(image error) Size: 918 B After 
(image error) Size: 918 B
|
|
Before 
(image error) Size: 1.8 KiB After 
(image error) Size: 1.8 KiB
|
|
Before 
(image error) Size: 44 KiB After 
(image error) Size: 44 KiB
|
|
Before 
(image error) Size: 2.4 KiB After 
(image error) Size: 2.4 KiB
|
|
Before 
(image error) Size: 4.8 KiB After 
(image error) Size: 4.8 KiB
|
|
Before 
(image error) Size: 6.2 KiB After 
(image error) Size: 6.2 KiB
|
|
Before 
(image error) Size: 8.6 KiB After 
(image error) Size: 8.6 KiB
|
|
Before 
(image error) Size: 10 KiB After 
(image error) Size: 10 KiB
|
|
Before 
(image error) Size: 14 KiB After 
(image error) Size: 14 KiB
|
|
Before 
(image error) Size: 735 B After 
(image error) Size: 735 B
|
|
Before 
(image error) Size: 1.5 KiB After 
(image error) Size: 1.5 KiB
|
|
Before 
(image error) Size: 1.1 KiB After 
(image error) Size: 1.1 KiB
|
|
Before 
(image error) Size: 13 KiB After 
(image error) Size: 13 KiB
|
|
Before 
(image error) Size: 228 KiB After 
(image error) Size: 228 KiB
|
|
Before 
(image error) Size: 14 KiB After 
(image error) Size: 14 KiB
|
|
Before 
(image error) Size: 927 B After 
(image error) Size: 927 B
|
|
Before 
(image error) Size: 1.8 KiB After 
(image error) Size: 1.8 KiB
|
|
Before 
(image error) Size: 27 KiB After 
(image error) Size: 27 KiB
|
|
Before 
(image error) Size: 2.4 KiB After 
(image error) Size: 2.4 KiB
|
|
Before 
(image error) Size: 4.8 KiB After 
(image error) Size: 4.8 KiB
|