Fixing conflicts alaashafaee#211

mohamedsaeed93 · Apr 25, 2014 · 083da34 · 083da34
2 parents 6db8e5e + 1e6504a
commit 083da34
Show file tree

Hide file tree

Showing 103 changed files with 36,852 additions and 554 deletions.
diff --git a/tutor/Gemfile b/tutor/Gemfile
@@ -57,6 +57,9 @@ gem 'foreman'
 # Use composite primary keys in models
 gem 'composite_primary_keys', '~> 6.0.1'
 
+#
+gem 'acts_as_list'
+
 #search
 gem 'tire'
 gem 'json_builder', '3.1.0'

diff --git a/tutor/Gemfile.lock b/tutor/Gemfile.lock
@@ -25,6 +25,8 @@ GEM
       multi_json (~> 1.3)
       thread_safe (~> 0.1)
       tzinfo (~> 0.3.37)
+    acts_as_list (0.4.0)
+      activerecord (>= 3.0)
     ansi (1.4.3)
     arel (4.0.2)
     bcrypt (3.1.7)
@@ -147,6 +149,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  acts_as_list
   coffee-rails (~> 4.0.0)
   composite_primary_keys (~> 6.0.1)
   devise

diff --git a/tutor/app/assets/images/glyphicons_003_user.png b/tutor/app/assets/images/glyphicons_003_user.png
diff --git a/tutor/app/assets/images/glyphicons_136_cogwheel.png b/tutor/app/assets/images/glyphicons_136_cogwheel.png
diff --git a/tutor/app/assets/images/glyphicons_280_settings.png b/tutor/app/assets/images/glyphicons_280_settings.png
diff --git a/tutor/app/assets/images/glyphicons_318_more_items.png b/tutor/app/assets/images/glyphicons_318_more_items.png