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

working on members epic #8

Open
wants to merge 56 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
2cf6744
readme
aliceFung Sep 22, 2015
5b8214e
gemfile, config and vendor files
aliceFung Sep 22, 2015
2bac976
angular working
aliceFung Sep 22, 2015
2998069
angular files
aliceFung Sep 22, 2015
262229e
drop dublication tables
ayva Sep 22, 2015
04d2553
db set properly
ayva Sep 22, 2015
69711f0
user with devise
aliceFung Sep 22, 2015
6292393
add bootstrap cdn, fixed db migration
aliceFung Sep 22, 2015
c310897
login form with controller
ayva Sep 22, 2015
6010866
login successful
aliceFung Sep 22, 2015
379c678
login form proceed
ayva Sep 22, 2015
0d1c7ef
logout successful
aliceFung Sep 22, 2015
2c19b62
board, list, card templates and models
ayva Sep 22, 2015
9209def
fixed routing, add seed
aliceFung Sep 22, 2015
c66a986
getting boards to the page
ayva Sep 22, 2015
31604b0
before merge
aliceFung Sep 22, 2015
23be829
workaround logout redirect
aliceFung Sep 23, 2015
16d4614
fixing dropdown
aliceFung Sep 23, 2015
2bcd560
show board
ayva Sep 23, 2015
6c6612b
show lists with cards on board
ayva Sep 23, 2015
b973e58
before merge
aliceFung Sep 23, 2015
c96ad4e
json poking
ayva Sep 23, 2015
399602e
before merge
aliceFung Sep 23, 2015
224f126
change to config
aliceFung Sep 23, 2015
d5387f4
parse json object
aliceFung Sep 23, 2015
d43ce64
new board
aliceFung Sep 23, 2015
2ae6c2a
editing board title
ayva Sep 23, 2015
30131ce
before merge
aliceFung Sep 23, 2015
7985a21
Merge branch 'master' of https://github.com/ayva/assignment_djello
aliceFung Sep 23, 2015
3b418d4
editing board title
aliceFung Sep 23, 2015
73dfff1
editing board title
ayva Sep 23, 2015
7376ad5
working edit board title
aliceFung Sep 23, 2015
8bf34d3
working create board
aliceFung Sep 23, 2015
3215e01
delet board success
ayva Sep 23, 2015
174b312
restrict from access others users boards
ayva Sep 23, 2015
4c4d6a8
create list
aliceFung Sep 23, 2015
df5d14c
formatting fix
aliceFung Sep 23, 2015
86f50cf
editing list
ayva Sep 23, 2015
5cb3ebd
before merge
aliceFung Sep 23, 2015
9dc3ff3
Merge branch 'master' of https://github.com/ayva/assignment_djello
aliceFung Sep 23, 2015
7fc0abb
list finished
aliceFung Sep 23, 2015
b5aaa8d
delete list and card controller
aliceFung Sep 23, 2015
95bcefe
debugging edit card index
aliceFung Sep 24, 2015
a74e6ea
modal window for card editing added
ayva Sep 24, 2015
d98ed09
before merge
aliceFung Sep 24, 2015
7230358
working on modal
aliceFung Sep 24, 2015
0334645
card modal edit
aliceFung Sep 24, 2015
2647709
mark card completed/deletion
aliceFung Sep 24, 2015
964cf2d
refactored edit card method
aliceFung Sep 24, 2015
613c3b3
fixed multiple card field edit bug
aliceFung Sep 24, 2015
f746b53
fixed modal hide bug
aliceFung Sep 24, 2015
c1592ce
fixed single list edit
aliceFung Sep 24, 2015
d11d8c5
working associations for card members
aliceFung Sep 24, 2015
241308c
route updates
aliceFung Sep 24, 2015
0147653
working on front end member methods
aliceFung Sep 25, 2015
8c903bc
delete gen. readme
aliceFung Sep 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
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
# assignment_djello
Project management with that great wobbly taste.

[Alice](https://github.com/aliceFung/assignment_djello) & [Olga](https://github.com/ayva/assignment_djello)
17 changes: 17 additions & 0 deletions djello/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# See https://help.github.com/articles/ignoring-files for more about ignoring files.
#
# If you find yourself ignoring temporary files generated by your text editor
# or operating system, you probably want to add a global ignore instead:
# git config --global core.excludesfile '~/.gitignore_global'

# Ignore bundler config.
/.bundle

# Ignore the default SQLite database.
/db/*.sqlite3
/db/*.sqlite3-journal

# Ignore all logfiles and tempfiles.
/log/*
!/log/.keep
/tmp
68 changes: 68 additions & 0 deletions djello/Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
source 'https://rubygems.org'


# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
gem 'rails', '4.2.3'

gem 'pg'
# 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-rails', '~> 4.1.0'
# See https://github.com/rails/execjs#readme for more supported runtimes
# gem 'therubyracer', platforms: :ruby

# Use jquery as the JavaScript library
gem 'jquery-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/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.
gem 'sdoc', '~> 0.4.0', group: :doc

#angular front-end gem dependencies
gem 'angularjs-rails'
gem 'angular_rails_csrf'

gem 'faker'
gem 'devise'

# Use ActiveModel has_secure_password
# gem 'bcrypt', '~> 3.1.7'

# Use Unicorn as the app server
# gem 'unicorn'

# Use Capistrano for deployment
# gem 'capistrano-rails', group: :development

group :development, :test do
gem 'pry-byebug'
gem 'rspec-rails'
gem 'factory_girl_rails'
gem 'guard-rspec'

gem 'better_errors'
gem 'binding_of_caller'
gem 'jazz_hands', github: 'nixme/jazz_hands', branch: 'bring-your-own-debugger'


# Call 'byebug' anywhere in the code to stop execution and get a debugger console
# gem 'byebug'

# Access an IRB console on exception pages or by using <%= console %> in views
gem 'web-console', '~> 2.0'

# Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
gem 'spring'
end

source "https://rails-assets.org" do
gem "rails-assets-angular-devise"
end

301 changes: 301 additions & 0 deletions djello/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,301 @@
GIT
remote: git://github.com/nixme/jazz_hands.git
revision: 5e4b48f145883ecb14b55bf04eacc28ac9662676
branch: bring-your-own-debugger
specs:
jazz_hands (0.5.2)
awesome_print (~> 1.2)
coolline (>= 0.4.2)
hirb (~> 0.7.1)
pry (~> 0.9.12)
pry-doc (~> 0.4.6)
pry-git (~> 0.2.3)
pry-rails (~> 0.3.2)
pry-remote (>= 0.1.7)
pry-stack_explorer (~> 0.4.9)
railties (>= 3.0, < 5.0)

GEM
remote: https://rubygems.org/
remote: https://rails-assets.org/
specs:
actionmailer (4.2.3)
actionpack (= 4.2.3)
actionview (= 4.2.3)
activejob (= 4.2.3)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 1.0, >= 1.0.5)
actionpack (4.2.3)
actionview (= 4.2.3)
activesupport (= 4.2.3)
rack (~> 1.6)
rack-test (~> 0.6.2)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (4.2.3)
activesupport (= 4.2.3)
builder (~> 3.1)
erubis (~> 2.7.0)
rails-dom-testing (~> 1.0, >= 1.0.5)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
activejob (4.2.3)
activesupport (= 4.2.3)
globalid (>= 0.3.0)
activemodel (4.2.3)
activesupport (= 4.2.3)
builder (~> 3.1)
activerecord (4.2.3)
activemodel (= 4.2.3)
activesupport (= 4.2.3)
arel (~> 6.0)
activesupport (4.2.3)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
angular_rails_csrf (1.0.4)
rails (>= 3, < 5)
angularjs-rails (1.4.4)
arel (6.0.3)
awesome_print (1.6.1)
bcrypt (3.1.10)
better_errors (2.1.1)
coderay (>= 1.0.0)
erubis (>= 2.6.6)
rack (>= 0.9.0)
binding_of_caller (0.7.2)
debug_inspector (>= 0.0.1)
builder (3.2.2)
byebug (2.7.0)
columnize (~> 0.3)
debugger-linecache (~> 1.2)
coderay (1.1.0)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.4.1)
coffee-script-source
execjs
coffee-script-source (1.9.1.1)
columnize (0.9.0)
coolline (0.5.0)
unicode_utils (~> 1.4)
debug_inspector (0.0.2)
debugger-linecache (1.2.0)
devise (3.5.2)
bcrypt (~> 3.0)
orm_adapter (~> 0.1)
railties (>= 3.2.6, < 5)
responders
thread_safe (~> 0.1)
warden (~> 1.2.3)
diff-lcs (1.2.5)
diffy (3.0.7)
erubis (2.7.0)
execjs (2.6.0)
factory_girl (4.5.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.5.0)
factory_girl (~> 4.5.0)
railties (>= 3.0.0)
faker (1.5.0)
i18n (~> 0.5)
ffi (1.9.10)
formatador (0.2.5)
globalid (0.3.6)
activesupport (>= 4.1.0)
grit (2.0.0)
diff-lcs (>= 1.1.2)
mime-types (>= 1.15)
guard (2.13.0)
formatador (>= 0.2.4)
listen (>= 2.7, <= 4.0)
lumberjack (~> 1.0)
nenv (~> 0.1)
notiffany (~> 0.0)
pry (>= 0.9.12)
shellany (~> 0.0)
thor (>= 0.18.1)
guard-compat (1.2.1)
guard-rspec (4.6.4)
guard (~> 2.1)
guard-compat (~> 1.1)
rspec (>= 2.99.0, < 4.0)
hirb (0.7.3)
i18n (0.7.0)
jbuilder (2.3.1)
activesupport (>= 3.0.0, < 5)
multi_json (~> 1.2)
jquery-rails (4.0.5)
rails-dom-testing (~> 1.0)
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
listen (3.0.3)
rb-fsevent (>= 0.9.3)
rb-inotify (>= 0.9)
loofah (2.0.3)
nokogiri (>= 1.5.9)
lumberjack (1.0.9)
mail (2.6.3)
mime-types (>= 1.16, < 3)
method_source (0.8.2)
mime-types (2.6.2)
mini_portile (0.6.2)
minitest (5.8.0)
multi_json (1.11.2)
nenv (0.2.0)
nokogiri (1.6.6.2)
mini_portile (~> 0.6.0)
notiffany (0.0.8)
nenv (~> 0.1)
shellany (~> 0.0)
orm_adapter (0.5.0)
pg (0.18.3)
pry (0.9.12.6)
coderay (~> 1.0)
method_source (~> 0.8)
slop (~> 3.4)
pry-byebug (1.3.2)
byebug (~> 2.7)
pry (~> 0.9.12)
pry-doc (0.4.6)
pry (>= 0.9)
yard (>= 0.8)
pry-git (0.2.3)
diffy
grit
pry (>= 0.9.8)
pry-rails (0.3.4)
pry (>= 0.9.10)
pry-remote (0.1.8)
pry (~> 0.9)
slop (~> 3.0)
pry-stack_explorer (0.4.9.2)
binding_of_caller (>= 0.7)
pry (>= 0.9.11)
rack (1.6.4)
rack-test (0.6.3)
rack (>= 1.0)
rails (4.2.3)
actionmailer (= 4.2.3)
actionpack (= 4.2.3)
actionview (= 4.2.3)
activejob (= 4.2.3)
activemodel (= 4.2.3)
activerecord (= 4.2.3)
activesupport (= 4.2.3)
bundler (>= 1.3.0, < 2.0)
railties (= 4.2.3)
sprockets-rails
rails-assets-angular (1.4.6)
rails-assets-angular-devise (1.1.0)
rails-assets-angular (>= 1.2.0, < 2)
rails-deprecated_sanitizer (1.0.3)
activesupport (>= 4.2.0.alpha)
rails-dom-testing (1.0.7)
activesupport (>= 4.2.0.beta, < 5.0)
nokogiri (~> 1.6.0)
rails-deprecated_sanitizer (>= 1.0.1)
rails-html-sanitizer (1.0.2)
loofah (~> 2.0)
railties (4.2.3)
actionpack (= 4.2.3)
activesupport (= 4.2.3)
rake (>= 0.8.7)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rb-fsevent (0.9.6)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdoc (4.2.0)
responders (2.1.0)
railties (>= 4.2.0, < 5)
rspec (3.3.0)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
rspec-expectations (3.3.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-mocks (3.3.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.3.0)
rspec-rails (3.3.3)
actionpack (>= 3.0, < 4.3)
activesupport (>= 3.0, < 4.3)
railties (>= 3.0, < 4.3)
rspec-core (~> 3.3.0)
rspec-expectations (~> 3.3.0)
rspec-mocks (~> 3.3.0)
rspec-support (~> 3.3.0)
rspec-support (3.3.0)
sass (3.4.18)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
sdoc (0.4.1)
json (~> 1.7, >= 1.7.7)
rdoc (~> 4.0)
shellany (0.0.1)
slop (3.6.0)
spring (1.4.0)
sprockets (3.3.4)
rack (~> 1.0)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
thor (0.19.1)
thread_safe (0.3.5)
tilt (2.0.1)
turbolinks (2.5.3)
coffee-rails
tzinfo (1.2.2)
thread_safe (~> 0.1)
uglifier (2.7.2)
execjs (>= 0.3.0)
json (>= 1.8.0)
unicode_utils (1.4.0)
warden (1.2.3)
rack (>= 1.0)
web-console (2.2.1)
activemodel (>= 4.0)
binding_of_caller (>= 0.7.2)
railties (>= 4.0)
sprockets-rails (>= 2.0, < 4.0)
yard (0.8.7.6)

PLATFORMS
ruby

DEPENDENCIES
angular_rails_csrf
angularjs-rails
better_errors
binding_of_caller
coffee-rails (~> 4.1.0)
devise
factory_girl_rails
faker
guard-rspec
jazz_hands!
jbuilder (~> 2.0)
jquery-rails
pg
pry-byebug
rails (= 4.2.3)
rails-assets-angular-devise!
rspec-rails
sass-rails (~> 5.0)
sdoc (~> 0.4.0)
spring
turbolinks
uglifier (>= 1.3.0)
web-console (~> 2.0)
Loading