Skip to content
This repository was archived by the owner on Oct 2, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
169 commits
Select commit Hold shift + click to select a range
d0cca97
Branch to remove old design
Oct 4, 2016
27b74e5
Merge branch 'master' of github.com:18F/C2 into remove_old_design
Oct 18, 2016
cd27d3b
Merge branch 'master' of github.com:18F/C2 into remove_old_design
Oct 19, 2016
020b588
Removed old reports modal
Oct 19, 2016
6ecc6db
create spec fix
Oct 25, 2016
0b289da
Merge branch 'master' into remove_old_design
Oct 25, 2016
c0a054d
Merge branch 'master' into remove_old_design
Oct 26, 2016
44887dd
fixing create spec
Oct 26, 2016
83a9b90
Merge branch 'master' into remove_old_design
Oct 26, 2016
3035f39
Fixed NCR create_spec 33
Oct 26, 2016
59d9ace
Fixed NCR create:3
Oct 26, 2016
3cdac1a
Fixed create_spec:75
Oct 26, 2016
9139009
Fixed user_timezone_spec:31
Oct 26, 2016
5a51905
Fixed user_timezone_spec:13
Oct 26, 2016
5540c3f
Merge branch 'master' into remove_old_design
Oct 26, 2016
e4bd064
Fix create_with_different_expense_types_spec.rb:2
Oct 26, 2016
94dff91
Merge branch 'master' into remove_old_design
Oct 26, 2016
d526e87
fix create_with_different_expense_types_spec.rb
Oct 26, 2016
0e2793a
Fixed return_to_spec
Oct 27, 2016
ce405f0
fix show_spec.rb:17
Oct 27, 2016
d3a17f0
fixed show_spec.rb:10
Oct 27, 2016
ec36159
fix show_spec.rb
Oct 28, 2016
944c918
Fixed cancel_spec
Oct 28, 2016
39df150
Merge branch 'master' into remove_old_design
Oct 28, 2016
cfeacf1
Merge branch 'completed_at_error_handling' into remove_old_design
Oct 28, 2016
e036ec9
fixed edit_spec.rb
Oct 31, 2016
759bc16
Merge branch 'master' into remove_old_design
Oct 31, 2016
5736235
fixed observer spec, removed sort_index spec as we no longer use that…
Nov 1, 2016
e4e1f81
Fixing attachment and comment spec
Nov 2, 2016
04d224c
Merge branch 'master' into remove_old_design
Nov 18, 2016
2b7da35
Merge branch 'master' into remove_old_design
Nov 21, 2016
141af4f
Merge branch 'fix_redesign_log_in_links' into remove_old_design
Nov 21, 2016
d225ddc
More fixes
Nov 22, 2016
4c1395b
fixing edit spec
Nov 22, 2016
3c5f6b6
Merge branch 'fix/css_load_home_redesign' into remove_old_design
Nov 22, 2016
f22e2de
show warnings
Nov 22, 2016
5b02ec1
fixed create_spec
Nov 22, 2016
0b91fea
fixed create spec
Nov 22, 2016
1304263
Merge branch 'update_form_labels_procurment_new' into remove_old_design
Nov 22, 2016
10fd4d7
more test fixes
Nov 23, 2016
eeaaac7
update history spec
Nov 23, 2016
7e29edf
add id to header nav
Nov 24, 2016
7191426
fixing specs
Nov 28, 2016
ad96be0
fixed proposal_submitted_at time formatting
Nov 28, 2016
654bd2a
Remove the archive_link spec
rememberlenny Nov 28, 2016
ec6000d
Add js to version check
rememberlenny Nov 28, 2016
de0e3de
Updated listing spec, updated client_slug spec
Nov 28, 2016
115f43f
Fixed client slut authz spec
Nov 29, 2016
9b77845
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
Nov 29, 2016
5334404
fixed client _slug_authz
Nov 29, 2016
28de4cd
Fixed client slug observer test
Nov 29, 2016
45eb6b6
fixed attachment spec
Nov 29, 2016
fb7ca67
Add JS parameter to each of the request_edit_spec
rememberlenny Nov 29, 2016
9b1a9c8
Remove the preserves previously selected values in dropdowns and add …
rememberlenny Nov 29, 2016
944a541
Merge branch 'master' of github.com:18F/C2 into remove_old_design
rememberlenny Nov 29, 2016
77e2819
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
rememberlenny Nov 29, 2016
d260982
Remove the comment spec because its already being covered and locks db
rememberlenny Nov 29, 2016
85a9a6d
Update
rememberlenny Nov 29, 2016
d7abf65
Remove the spec for notifies observers of changes and transition over
rememberlenny Nov 29, 2016
6910881
Save the changes to spec 'does not resave unchanged requests'
rememberlenny Nov 29, 2016
ab6ad96
Create a proper proposal based on scratch
rememberlenny Nov 30, 2016
00b7109
Remove the screenshot
rememberlenny Nov 30, 2016
6fe4a54
Update the spec: 'allows requester to change the approving official'
rememberlenny Nov 30, 2016
ac01528
fixed attachment spec 20
Nov 30, 2016
bc4ab6c
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
Nov 30, 2016
6db5026
Remove edit
rememberlenny Nov 30, 2016
59c3e62
Remove all routes except for the :new
rememberlenny Nov 30, 2016
8c1e719
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
rememberlenny Nov 30, 2016
4908188
fix attachment_spec
Nov 30, 2016
8adfe90
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
Nov 30, 2016
a70a93a
Readd update
rememberlenny Nov 30, 2016
cd37221
update routes
Nov 30, 2016
b90d308
Readd create
rememberlenny Nov 30, 2016
96a9986
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
Nov 30, 2016
f895a0f
Remove unused specs for design
rememberlenny Nov 30, 2016
ddab3af
Initial update for proposals index spec
phirefly Nov 30, 2016
c9f1f2e
Removed irrelevant specs 1) Needs Review and 2) Beta flag
phirefly Nov 30, 2016
66ac919
Incremental spec fixes
phirefly Nov 30, 2016
00efb78
Incremental spec fixes
phirefly Nov 30, 2016
15423e3
Incremental spec fixes
phirefly Dec 1, 2016
7460655
Incremental spec updates
phirefly Dec 1, 2016
9645e0a
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
rememberlenny Dec 1, 2016
1d1e835
Merge pull request #1628 from 18F/remove_old_design_rv
Dec 1, 2016
9ed915b
Add helper
rememberlenny Dec 1, 2016
732bcaf
Replace the edit spec
rememberlenny Dec 1, 2016
a962491
update time zone spec
Dec 1, 2016
ccc3ba3
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
Dec 1, 2016
b4be7f8
Updating complete spec
Dec 1, 2016
766157e
fixed complete spec
Dec 1, 2016
6b4e681
Not relevant
rememberlenny Dec 1, 2016
85cb4b1
Catch up spec for 'allows the requester to edit the budget-related fi…
rememberlenny Dec 1, 2016
ff33b33
Create a spec for 'can be edited if completed'
rememberlenny Dec 1, 2016
ad43539
Add spec for 'can update other fields if first approval is done'
rememberlenny Dec 1, 2016
9ad4cfd
Remove unapplicable tests
rememberlenny Dec 1, 2016
b95579b
Create save_update helper
rememberlenny Dec 1, 2016
4f382d2
Reformat tests to dry up
rememberlenny Dec 1, 2016
f78ede2
Remove unused tests
rememberlenny Dec 1, 2016
27006d6
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
rememberlenny Dec 1, 2016
6272fcd
Updates to the Post Approval Modification specs
phirefly Dec 1, 2016
1bd728e
Incremental post approval modification specs updated
phirefly Dec 2, 2016
f90a2bb
Merge branch 'remove_old_design' into remove_old_design_rv
phirefly Dec 2, 2016
82acfe0
Merge pull request #1630 from 18F/remove_old_design_rv
Dec 2, 2016
6fa91bd
Merge branch 'master' into remove_old_design
Dec 2, 2016
5e5a3cb
Add phantom in gems
rememberlenny Dec 2, 2016
d5bedcb
Merge pull request #1632 from 18F/gems/phantomjs
rememberlenny Dec 2, 2016
aa0874d
Fix the history spec
rememberlenny Dec 2, 2016
d5431a4
Update gems
rememberlenny Dec 2, 2016
c361bfc
Fix up the controller specs
rememberlenny Dec 2, 2016
4b1f56f
Correct the edit controller
rememberlenny Dec 2, 2016
abacc9d
Fixes for 18F procurement specs
phirefly Dec 2, 2016
4f6a9b0
Fixed phantomjs spec
Dec 2, 2016
b42c1cd
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
Dec 2, 2016
1494ee5
fixed client helper spec tests
Dec 2, 2016
c93da48
Remove the history spec
rememberlenny Dec 2, 2016
b469028
Remove more unrelated history spec stuff
rememberlenny Dec 2, 2016
1d347dd
Make the warning confirmation spec
rememberlenny Dec 2, 2016
1990c80
Merge branch 'remove_old_design' of https://github.com/18F/C2 into re…
rememberlenny Dec 2, 2016
c5dfcf3
Update the controllers
rememberlenny Dec 2, 2016
6090230
Update the controller specs
rememberlenny Dec 2, 2016
4047390
Added fixes for cancel spec
phirefly Dec 2, 2016
acefd11
Merge branch 'remove_old_design' into remove_old_design_rv
phirefly Dec 2, 2016
277b865
Remove the unused edit specs
rememberlenny Dec 2, 2016
1204d02
fixed approver edit spec
Dec 2, 2016
8bff876
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
Dec 2, 2016
9e49022
Save the codeclimate fix
rememberlenny Dec 2, 2016
72e9b15
Set proposal id on return to spec
Dec 2, 2016
5dddf13
fixed linear approvals spec
Dec 2, 2016
81a6cd8
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
Dec 2, 2016
4f2bcc6
fix attachment spec
Dec 2, 2016
83d8053
Save the tooltip and updated test
rememberlenny Dec 3, 2016
4fccee7
Fix the tooltip contrent
rememberlenny Dec 3, 2016
92e3b18
Make the test work with stub
rememberlenny Dec 4, 2016
f8c7032
Merge branch 'remove_old_design' of https://github.com/18F/C2 into re…
rememberlenny Dec 4, 2016
dfa562f
fixing attachment_spec
Dec 5, 2016
2bc3ccb
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
Dec 5, 2016
9843c36
attempt to fix attachment spec
Dec 5, 2016
7feacad
Added mouseover tooltip for Direct Pay
phirefly Dec 5, 2016
98024d8
Direct Pay tooltip wip
phirefly Dec 5, 2016
f54fa3c
Removed tooltip test until we find a solution that support poltergeis…
phirefly Dec 5, 2016
7816c31
added notification to proposal page
Dec 5, 2016
bd4d97c
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
Dec 5, 2016
83976da
Added a todo comment for previously deleted spec
phirefly Dec 5, 2016
a215bb2
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
phirefly Dec 5, 2016
b9e74f9
Fixed attachment params filter
Dec 5, 2016
cc90d69
Merge branch 'remove_old_design' of github.com:18F/C2 into remove_old…
Dec 5, 2016
0c687ca
removed if loop, using &. instead
Dec 5, 2016
efe1c0d
changed param type
Dec 5, 2016
02bf668
Update the check condition around the canceled proposals
rememberlenny Dec 5, 2016
c23169c
Remove the save and open screen
rememberlenny Dec 5, 2016
dbc0782
Merge branch 'remove_old_design' of https://github.com/18F/C2 into re…
rememberlenny Dec 5, 2016
577da1d
Fixed Login spec
phirefly Dec 6, 2016
57983f8
Update gems
rememberlenny Dec 6, 2016
758f121
jquery cookies
rememberlenny Dec 6, 2016
7333a80
Remove cookies
rememberlenny Dec 6, 2016
08f53d9
Save the jquery cookie gem
rememberlenny Dec 6, 2016
441768f
Fixed cookie
rememberlenny Dec 6, 2016
eab30c7
Test
rememberlenny Dec 6, 2016
00b1d34
Update the gemfiles
rememberlenny Dec 6, 2016
0d66bea
saved
rememberlenny Dec 7, 2016
ad1971e
Update the unique spec
rememberlenny Dec 7, 2016
fa1b6fd
Merge pull request #1556 from 18F/remove_old_design
rememberlenny Dec 7, 2016
379abff
Save the changes to the poltergist driver
rememberlenny Dec 7, 2016
a80d08c
Add phantom
rememberlenny Dec 7, 2016
505e187
Add phantom in the specs
rememberlenny Dec 7, 2016
7a4cbd0
change the test process method
rememberlenny Dec 7, 2016
9499d06
Remove the alphabetical
rememberlenny Dec 7, 2016
631259c
Correct conflict
rememberlenny Dec 7, 2016
cdb37cd
Merge branch 'master' into develop
rememberlenny Dec 7, 2016
7b5fc47
Merge branch 'master' into develop
rememberlenny Dec 9, 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 Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ gem "haml"
gem "hashdiff"
gem "html_pipeline_rails"
gem "jquery-rails"
gem "js_cookie_rails"
gem "kaminari"
gem "kaminari-bootstrap", "~> 3.0.1"
gem "mandrill-rails"
Expand Down Expand Up @@ -95,6 +96,7 @@ group :test do
gem "fivemat"
gem "fuubar"
gem "poltergeist", "~> 1.11.0"
gem "phantomjs", require: "phantomjs/poltergeist"
gem "rspec_junit_formatter"
gem "shoulda-matchers"
gem "site_prism"
Expand Down
Loading