Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bootstrap Carousel inserted into tabs and connected to search button. Test file added. #12

Open
wants to merge 80 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
3821273
Merge branch 'week_3_test' into sergei
Feb 12, 2016
1f85032
Merge branch 'TH2' into sergei
Feb 12, 2016
8a80c27
Fixed coffee script
Feb 14, 2016
a9be5b0
images for album testing added
Feb 15, 2016
66d1a0a
added image size and social media meta tags
kylelk Feb 15, 2016
be0aba8
Images added, albums show page changed
Feb 15, 2016
2785548
Merge branch 'TH2' into kyle
kylelk Feb 15, 2016
f80f3ae
fixed more album link paths
kylelk Feb 15, 2016
cdf6a56
added default avatar to precompiled assets
kylelk Feb 16, 2016
728fee2
added path to jquery in application.js
kylelk Feb 16, 2016
dd438ad
added include tag for jquery
kylelk Feb 16, 2016
3fd7b31
fixed issue causing javascript to be included twice
kylelk Feb 16, 2016
051e611
few things added in for draggability
trentonhance Feb 16, 2016
a16e308
edit before merge with kyles branch
trentonhance Feb 16, 2016
01cafb0
fixed branch-added nav to album pages
trentonhance Feb 16, 2016
ff30e69
fixed branch-added nav to album pages
trentonhance Feb 16, 2016
e897f52
changed sign out to use a GET request instead of a DELETE
kylelk Feb 16, 2016
d480350
Fixed album references
Feb 16, 2016
97beb9d
quick save to merge with sergei
trentonhance Feb 16, 2016
95efdb2
merged with sergei branch
trentonhance Feb 16, 2016
a97c024
Merge branch 'kyle' of https://github.com/RailsFails/Sqribbler into TH2
trentonhance Feb 16, 2016
0859920
merged with sergei branch and kyles....fixing issues. friend follow b…
trentonhance Feb 16, 2016
29b2ce1
Back button fixed
Feb 16, 2016
bd3d780
partial adds from dman
trentonhance Feb 16, 2016
c73cef8
Nothing new really
Feb 16, 2016
2faa7d9
Merge branch 'master' into kyle
kylelk Feb 16, 2016
b44c693
Merge remote-tracking branch 'origin/master' into sergei
Feb 17, 2016
c4e406d
changed unfollow/follow link to use a button instead
Feb 17, 2016
dbd1898
Created method to return albums accessible to a user
Feb 17, 2016
7beabce
Added icon for albums and modified title length
Feb 17, 2016
0f90cbf
added comments
kylelk Feb 17, 2016
32a3258
added vote model
kylelk Feb 17, 2016
e0cb2d7
added voting system
kylelk Feb 18, 2016
4c1cec2
added more data to seed file
kylelk Feb 18, 2016
2a33f98
checked current user before showing edit and delete controls
kylelk Feb 18, 2016
69cec55
addon from dman-kyle
trentonhance Feb 18, 2016
d0b6c62
added tinymce to image description
kylelk Feb 18, 2016
d82b66f
added API json search for users
kylelk Feb 19, 2016
5a72a93
Merge branch 'Sergei' of https://github.com/RailsFails/Sqribbler into…
trentonhance Feb 19, 2016
cd7d436
trying to fix branch merge
trentonhance Feb 19, 2016
0cde57c
increased performance of user search
kylelk Feb 19, 2016
26739db
quick fix merge
trentonhance Feb 19, 2016
f287175
Merge branch 'kyle' of https://github.com/RailsFails/Sqribbler into TH2
trentonhance Feb 21, 2016
91dc41d
added AngularJS typeahead
kylelk Feb 21, 2016
db9ccdd
Merge branch 'kyle' of https://github.com/RailsFails/Sqribbler into TH2
trentonhance Feb 21, 2016
3f730bc
quick updates
trentonhance Feb 21, 2016
e61575c
Carousel.js file added
Feb 21, 2016
a1c38af
Merge branch 'TH2' of https://github.com/RailsFails/Sqribbler into se…
Feb 21, 2016
b75fd25
quick updates for drag
trentonhance Feb 21, 2016
d52e394
Merge branch 'Sergei' of https://github.com/RailsFails/Sqribbler into…
trentonhance Feb 21, 2016
4e95011
fixed path to default avatar image
kylelk Feb 21, 2016
423b167
quick updates for drag
trentonhance Feb 21, 2016
254b5d2
drage features added
trentonhance Feb 21, 2016
6ffda16
Fixed private album issue
Feb 21, 2016
a5ae219
Merge remote-tracking branch 'origin/TH2' into kyle_TH2_merge
kylelk Feb 21, 2016
ffd8669
before backend drag
trentonhance Feb 22, 2016
8fd14ba
added missing conversation_interlocutor method to user helper module
kylelk Feb 22, 2016
6ddbcb7
draggable updated
trentonhance Feb 22, 2016
ede9b40
made image undraggable
kylelk Feb 22, 2016
cc1a865
creating save feature for drag/drop
trentonhance Feb 22, 2016
cb80c73
changed text color of navbar links to white
kylelk Feb 22, 2016
ef1c0e5
Navbar links styles changed
Feb 22, 2016
47008a1
changed path to notification.mp3
kylelk Feb 22, 2016
ce11a2a
Navbar button styles changes to larger font size
Feb 22, 2016
0ae08ee
Merge remote-tracking branch 'origin/Sergei' into kyle
kylelk Feb 22, 2016
7410468
removed duplicate _landing_page_friends.html.erb file
kylelk Feb 22, 2016
7b8185a
raised the z-index of an image when dragging
kylelk Feb 22, 2016
8d851df
final for week-as of 2/21
trentonhance Feb 22, 2016
d426648
Merge remote-tracking branch 'origin/TH2' into kyle
kylelk Feb 22, 2016
bf091b8
checked if user is signed in before showing swipe nav
kylelk Feb 22, 2016
6d3ab45
Merge pull request #25 from RailsFails/kyle
trentonhance Feb 22, 2016
d30da03
update for menu
trentonhance Feb 22, 2016
ac88b30
changed typeahead width to 45% in swipe nav
kylelk Feb 22, 2016
ea1d835
Merge pull request #26 from RailsFails/TH2_test
trentonhance Feb 22, 2016
37950c7
contact page
trentonhance Feb 22, 2016
1ad1c1e
Merge branch 'TH2' of https://github.com/RailsFails/Sqribbler into TH2
trentonhance Feb 22, 2016
180bc0c
contact pageupdate/working company map
trentonhance Feb 22, 2016
8096462
contact pageupdate/working company map 2
trentonhance Feb 22, 2016
674f606
final update for week_4
trentonhance Feb 22, 2016
cf1dfff
Delete button fixed in album/show
Feb 22, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .rbenv-gemsets
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
-global
14 changes: 5 additions & 9 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,28 +3,22 @@ source 'http://rubygems.org'
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.4'


# Use sqlite3 as the database for Active Record
gem 'sqlite3'
# Use SCSS for stylesheets
gem 'sass-rails', '~> 5.0'
# Use Uglifier as compressor for JavaScript assets
gem 'uglifier', '>= 1.3.0'
# Use CoffeeScript for .coffee assets and views
gem 'coffee-script-source', '1.8.0'
#gem 'coffee-script-source', '1.8.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Gems for chat
gem 'private_pub'
gem 'thin'

# Use jquery as the JavaScript library
gem 'jquery-rails'
# REMOVED TURBOLINKS-

gem 'turbolinks'

# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
gem 'jbuilder', '~> 2.0'
# bundle exec rake doc:rails generates the API under doc/api.
Expand All @@ -35,6 +29,8 @@ gem 'faker'
gem 'tinymce-rails'
gem 'paperclip', '~> 4.3'
gem 'kaminari'
gem 'private_pub'
gem 'thin'

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'
Expand All @@ -44,7 +40,7 @@ gem 'kaminari'

group :production do
gem 'unicorn'
#gem 'pg'
gem 'pg'
end

group :development, :test do
Expand All @@ -58,4 +54,4 @@ group :development do
end

# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
gem 'tzinfo-data', platforms: [:mingw, :mswin, :jruby]
16 changes: 4 additions & 12 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,8 @@ GEM
activesupport (>= 3.0)
cocaine (0.5.8)
climate_control (>= 0.0.3, < 1.0)
coffee-rails (4.1.1)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.1.x)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.8.0)
concurrent-ruby (1.0.0)
cookiejar (0.3.2)
cookiejar (0.3.3)
daemons (1.2.3)
debug_inspector (0.0.2)
devise (3.5.6)
Expand Down Expand Up @@ -126,6 +119,8 @@ GEM
cocaine (~> 0.5.5)
mime-types
mimemagic (= 0.3.0)
pg (0.18.4)
pg (0.18.4-x86-mingw32)
private_pub (1.0.3)
faye
rack (1.6.4)
Expand Down Expand Up @@ -189,8 +184,6 @@ GEM
tilt (2.0.2)
tinymce-rails (4.3.3)
railties (>= 3.1.1)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
tzinfo-data (1.2016.1)
Expand Down Expand Up @@ -219,21 +212,20 @@ PLATFORMS

DEPENDENCIES
byebug
coffee-script-source (= 1.8.0)
devise
faker
jbuilder (~> 2.0)
jquery-rails
kaminari
paperclip (~> 4.3)
pg
private_pub
rails (= 4.2.4)
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
sqlite3
thin
tinymce-rails
turbolinks
tzinfo-data
uglifier (>= 1.3.0)
unicorn
Expand Down
Empty file added TODO.txt
Empty file.
Binary file added app/assets/images/Thumbs.db
Binary file not shown.
4 changes: 4 additions & 0 deletions app/assets/images/photo_album_icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/thumb-down-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/thumb-down.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/thumb-up-outline.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions app/assets/images/thumb-up.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images_for_albums_testing/For Me.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images_for_albums_testing/Gorilla.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images_for_albums_testing/Grumble.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images_for_albums_testing/Le coq.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images_for_albums_testing/SUBWAY.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/assets/images_for_albums_testing/Thumbs.db
Binary file not shown.
Empty file.
Binary file added app/assets/images_for_albums_testing/vw.jpg
Binary file added app/assets/images_for_albums_testing/zigzag.jpg
2 changes: 1 addition & 1 deletion app/assets/javascripts/albums.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// Place all the behaviors and hooks related to the matching controller here.
// All this logic will automatically be available in application.js.
jQuery(document).ready(function($) {
jQuery(document).on("page:change ready", function() {

$('#myCarousel').carousel({
interval: 5000
Expand Down
Loading