Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
90 commits
Select commit Hold shift + click to select a range
165ab3d
spring 2019 iteration 0
Mar 20, 2019
bc850f3
password reset email not working
Mar 26, 2019
c5199c0
meaningless changes before merge
Mar 27, 2019
ab4c57f
conflicts in sessions/new
Mar 27, 2019
76fa88c
Complete email send by gmail
yyvax Mar 27, 2019
f79eb6a
asd
Mar 27, 2019
e5e0ffd
asd
Mar 27, 2019
b96a575
weather
Mar 27, 2019
f91ae04
weather
Mar 27, 2019
67196e7
weather
Mar 27, 2019
7e98c9c
weather
Mar 27, 2019
145bffb
change
Mar 28, 2019
78bb06d
password
Mar 28, 2019
1bf936a
add migrate files
Mar 28, 2019
3b45702
comment test
Mar 28, 2019
9184114
comment test
Mar 28, 2019
05407bb
comment test
Mar 28, 2019
bc84f87
comment test
Mar 28, 2019
04c6869
comment test
Mar 28, 2019
3990e68
comment test
Mar 28, 2019
ba22400
comment test
Mar 28, 2019
e721e90
merging conflict
yyvax Mar 28, 2019
14e8a2c
change default url
yyvax Mar 28, 2019
4675ed4
changes footers
yyvax Mar 28, 2019
2125557
A few test cases added
Mar 29, 2019
fd69fde
changed test cases
Mar 29, 2019
8bb5424
merged with most recent
Mar 29, 2019
89139b0
Iteration 1 finished
rickydengli Mar 29, 2019
d0f107e
default url options
yyvax Apr 7, 2019
71d3aa2
weather update
Apr 7, 2019
ba61474
delete a meaningless line in routes.rb
yyvax Apr 7, 2019
57b6587
weather update
Apr 7, 2019
033f935
Merge branch 'master' of https://github.com/csce606-activevolcano/Tam…
yyvax Apr 7, 2019
571bf7c
Revert "delete a meaningless line in routes.rb"
yyvax Apr 7, 2019
0288263
Login in page changed
Apr 9, 2019
d9ef6f9
Login in page changed
Apr 9, 2019
fd63142
trival changed in login page
yyvax Apr 10, 2019
1988ce4
merge tan and cheng's changes
yyvax Apr 10, 2019
b71b912
Cucumber files changed
Apr 10, 2019
73eab1d
change top bar color
Apr 10, 2019
d599511
changed back to gem 'pg'
Apr 10, 2019
5e5732b
user interface changed
Apr 10, 2019
960c3ad
Merge branch 'password-reset' of https://github.com/csce606-activevol…
Apr 10, 2019
820203e
new feature
Apr 10, 2019
c64dea5
router changed
Apr 10, 2019
90a06f6
test
Apr 19, 2019
f64cf72
Merge branch 'weather' of https://github.com/csce606-activevolcano/Ta…
Apr 19, 2019
56324ba
test
Apr 19, 2019
b436af7
Login page autoscaled
Apr 19, 2019
a772cf6
modify user interface to mobile
Apr 19, 2019
816a6e4
add updating profile functionality
yyvax Apr 19, 2019
2969160
change margin top
Apr 19, 2019
5ea2f9b
Merge edit info and previous version
yyvax Apr 19, 2019
76431c6
merge weather and edit
yyvax Apr 20, 2019
9cd6a6c
navbar changed
Apr 20, 2019
93fba47
merge password-reset branch
Apr 20, 2019
8b019dc
change route
Apr 20, 2019
5d71d37
navbar
Apr 20, 2019
d79abc2
dynamic cart report
Apr 28, 2019
cac23e3
asdad
Apr 28, 2019
585f8b6
asdad
Apr 28, 2019
e6c1421
asdad
Apr 28, 2019
16ff371
asdad
Apr 28, 2019
4010d6f
asdad
Apr 28, 2019
1ddd2a8
background photo changed
Apr 28, 2019
a6fa7eb
asdad
Apr 28, 2019
a501443
asdad
Apr 28, 2019
0b274c4
asdasdadad
Apr 28, 2019
842aae9
final
Apr 28, 2019
ab5c9f2
final
Apr 28, 2019
29215c4
final
Apr 28, 2019
cafc1fc
final
Apr 28, 2019
b33821c
final
Apr 28, 2019
7664b1a
final
Apr 28, 2019
569b879
final
Apr 28, 2019
af4df53
added timeout feature when server is down
Apr 30, 2019
4981dfc
enable dashboard refreshing
Apr 30, 2019
b6f1529
login page full screen
Apr 30, 2019
05ed031
fix merge conflict
Apr 30, 2019
3c056c7
checklist background change
Apr 30, 2019
e69d990
checklist background change
Apr 30, 2019
ec8e138
change reset page
Apr 30, 2019
46119e9
Iteration 3 added
rickydengli May 1, 2019
6c499ce
Iteration 4 added
rickydengli May 1, 2019
2f4a8a0
Merge branch 'master' of https://github.com/csce606-activevolcano/Tam…
May 1, 2019
e524bb1
final
May 1, 2019
9874da6
asda
May 1, 2019
60d3def
asda
May 1, 2019
596af05
bug fixed
May 1, 2019
a23be7d
fixed all possible bugs
May 2, 2019
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 .bundle/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
BUNDLE_WITHOUT: "production"
Binary file added Documents/Spring2019/Iteration 1.tar
Binary file not shown.
Binary file added Documents/Spring2019/Iteration0.tar
Binary file not shown.
Binary file added Documents/Spring2019/Iteration3.tar
Binary file not shown.
Binary file added Documents/Spring2019/Iteration4.tar
Binary file not shown.
3 changes: 2 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ group :test do
gem 'minitest-reporters', '1.0.5'
gem 'mini_backtrace', '0.1.3'
gem 'guard-minitest', '2.3.1'
gem 'simplecov', :require => false
end


Expand All @@ -87,5 +88,5 @@ gem 'js_assets'

group :production do
gem 'puma', '~> 3.7'
gem 'pg', '~> 0.21'
end
gem 'pg'
Loading