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

Streamlined bootstrap portal #376

Merged
merged 535 commits into from
May 11, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
535 commits
Select commit Hold shift + click to select a range
d4aa9ce
unnecessary
Feb 25, 2016
fc708fa
one step closer to proper working again
Feb 26, 2016
993f83f
allow protocol modal on dashboard to have permissions
Feb 26, 2016
f4d2045
Moved instance variable from partial.
Feb 29, 2016
536026b
A lot of specs.
Feb 29, 2016
60193bd
More specs for Dashboard::ProtocolsController.
Mar 1, 2016
3bfaf98
on the way to proper subsidies
Mar 2, 2016
8d4af2e
Merge branch 'streamlined_bootstrap_portal' of github.com:sparc-reque…
Mar 2, 2016
0f82c52
Testing Dashboard::ProtocolsController#create
Mar 2, 2016
f78adeb
Testing Dashboard::ProtocolsController#{edit, create}
Mar 3, 2016
51913b7
Testing little Protocol actions.
Mar 3, 2016
f359af8
Begin separating proper and dashboard calendars.
Mar 3, 2016
0cb6c12
More ProtocolsController specs.
Mar 3, 2016
f116599
yumml
Mar 3, 2016
be2267c
merge conflicts
Mar 3, 2016
0481ac1
Testing Dashboard::ArmsController#{new, create} and Dashboard::Approv…
Mar 4, 2016
42331d5
proper subsidies almost there
Mar 4, 2016
490770e
Merge branch 'streamlined_bootstrap_portal' of github.com:sparc-reque…
Mar 4, 2016
f476050
Finished tests for Dashboard::ArmsController.
Mar 4, 2016
ae9cb34
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
Mar 4, 2016
1b0af76
Tested Dashboard::AssociatedUsers#destroy. Sketched out specs for rem…
Mar 4, 2016
8a7956b
only display ssr-sub if eligible_for_subsidy?
Mar 14, 2016
2f3bf6f
Merge branch 'master' of github.com:sparc-request/sparc-request into …
Mar 14, 2016
7155e66
Filling out Dashboard::AssociatedUsersController specs.
Mar 14, 2016
500c0ad
Testing Dashboard::AssociatedUsersController#edit.
Mar 15, 2016
5edf1b5
some more small things for a merge
Mar 15, 2016
e8b3211
Merge branch 'streamlined_bootstrap_portal' into kg-bootstrap_yumml
Mar 15, 2016
9acc581
spec updates
Mar 15, 2016
cea8f8f
final specs
Mar 15, 2016
950bbc1
added confirm
Mar 15, 2016
ba12d94
a littly subside stylin
Mar 15, 2016
80eef34
Merge branch 'streamlined_bootstrap_portal' of github.com:sparc-reque…
Mar 15, 2016
0ac5c9f
Merge branch 'master' of github.com:sparc-request/sparc-request into …
Mar 15, 2016
6f38bcd
pull master's service calendars folder back in
Mar 15, 2016
8eea325
return helper method to pool
Mar 15, 2016
c21251c
added counter, added changing triggers
Mar 15, 2016
11b0e7a
removed puts
Mar 15, 2016
a53ad96
added new and indexed notifications yml
Mar 15, 2016
51876ca
ezpz
Mar 15, 2016
dbcd6d3
epic box working properly from dashboard for study
jwiel86 Mar 16, 2016
4ed8939
subsidies now make notes logging approvals
Mar 16, 2016
952aab8
subsidy clean up
Mar 16, 2016
73e0e0d
more subsidy cleanup
Mar 16, 2016
a4e9e03
able to display study/project info
jwiel86 Mar 16, 2016
c9d51e6
updating the Messages button counter in Notifications tab and Notific…
Mar 17, 2016
dae5950
spinner and some styling changes on the user's name display
Mar 17, 2016
7a632a5
Merge pull request #317 from sparc-request/kg-bootstrap_notification_…
Mar 17, 2016
3adb77e
core and status are now multiselectable on the protocols index
Mar 17, 2016
2fa3f75
Merge branch 'streamlined_bootstrap_portal' of github.com:sparc-reque…
Mar 17, 2016
c83884c
Update subsidies.js.coffee
Mar 17, 2016
e234250
Merge pull request #315 from sparc-request/kg-bootstrap_subsidy_confirm
Mar 17, 2016
2bb58de
Merge pull request #319 from sparc-request/kg-bootstrap_ssr_show_date…
Mar 17, 2016
f3f354b
Merge pull request #322 from sparc-request/kg-bootstrap_auth_user_stuff
Mar 17, 2016
9449284
fixed merge conflicts
Mar 17, 2016
a8d74ea
Merge branch 'master' of github.com:sparc-request/sparc-request into …
Mar 17, 2016
6cb8ad5
Update multiple_line_items_controller.rb
Mar 17, 2016
5b3a595
a couple small tweaks
Mar 17, 2016
1fdef1d
Merge branch 'kg-bootstrap_yumml' of https://github.com/sparc-request…
Mar 17, 2016
d036946
Merge pull request #314 from sparc-request/kg-bootstrap_yumml
Mar 17, 2016
25ba296
resolving merge conflicts
jwiel86 Mar 18, 2016
2730b10
resolving merge conflicts
jwiel86 Mar 18, 2016
e0fbdf9
subsidies only show up for eligible SubServiceRequests
Mar 18, 2016
8c14ea0
merge conflicts
jwiel86 Mar 18, 2016
406038d
rename modal partial to make more sense
Mar 18, 2016
f24dc4f
Merge branch 'streamlined_bootstrap_portal' of github.com:sparc-reque…
Mar 18, 2016
c93f758
yml fix
Mar 21, 2016
3aaa88c
Calendars in proper seem to be working. It remains to fix dashboard c…
Mar 16, 2016
95778a0
Remove jquery-ui, clinical_fulfillment js, and moved some helpers to …
Mar 18, 2016
becadd4
Fixed js errors. Temporarily disabled breadcrumbs on SSR#show... not …
Mar 18, 2016
7e13eab
Disabled breadcrumbs completely... But no render errors.
Mar 18, 2016
5f2e201
Left and right visit nav buttons work.
Mar 21, 2016
bce96a0
Visit select working.
Mar 21, 2016
e19c472
Checking visits working
Mar 22, 2016
e7504c4
Calendar back to normal
Mar 22, 2016
f6815b3
Proper working again.
Mar 22, 2016
d1de967
Removed git repo I accidently cloned into this one...
Mar 22, 2016
9f32d0b
May have fixed breadcrumbs
Mar 22, 2016
40a444b
yml, set up the print, styling print
Mar 22, 2016
d10be29
merge conflicts
Mar 22, 2016
07d3d89
Fixed View SSR button on dashboard/protocols.
Mar 22, 2016
247a7d8
view consolidated request button working i think
Mar 22, 2016
f1518bb
changes
Mar 22, 2016
bc8fbd5
Merge branch 'streamlined_bootstrap_portal' into kg-bootstrap_compose…
Mar 22, 2016
f4e9391
Show day in visits dropdown.
Mar 22, 2016
51a1173
Fixed edit visit form.
Mar 23, 2016
6e94065
sassylicious.
Mar 23, 2016
df53fd9
Merge branch 'streamlined_bootstrap_portal' of github.com:sparc-reque…
Mar 23, 2016
084e1e0
Validation on editing visit days.
Mar 23, 2016
ecb5613
Clean up
Mar 24, 2016
ea00db2
Fixed some javascript I broke.
Mar 24, 2016
902fbef
fixed javascript
jwiel86 Mar 24, 2016
ab001e3
protocol list now uses protocol model and plurality
Mar 24, 2016
1f5aef6
Merge branch 'kg-bootstrap_print_ssr' of https://github.com/sparc-req…
Mar 24, 2016
b2c4dc6
fix some bugs
Mar 24, 2016
4f46fe8
fix new protocol duplicate PI bug
Mar 24, 2016
6267793
View full calendar actually working.
Mar 24, 2016
3af044d
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
Mar 24, 2016
2dc745c
Merge branch 'streamlined_bootstrap_portal' into kg-bootstrap_print_ssr
Mar 24, 2016
fee9185
Some refactoring in Notifications
Mar 24, 2016
e4733b4
Some code cleanup.
Mar 24, 2016
f21584a
print consolidated, print styling, ymlificationism
Mar 24, 2016
af09766
Merge branch 'streamlined_bootstrap_portal' into kg-bootstrap_print_ssr
Mar 24, 2016
28ce853
merge conflicts
Mar 24, 2016
081aac7
update notes header name
Mar 24, 2016
970179d
removed flash notifications from proper
Mar 24, 2016
660639e
rolling up the sleeves
Mar 24, 2016
527b4b3
changes
Mar 24, 2016
e674bfd
proper notes
Mar 24, 2016
7272aa7
smells notey.
Mar 24, 2016
1a05473
Merge branch 'sassy_cleanup' of github.com:sparc-request/sparc-reques…
Mar 24, 2016
cb72439
Merge pull request #330 from sparc-request/kg-bootstrap_save_admin_tab
Mar 24, 2016
7124e9a
Update notifications_controller.rb
Mar 24, 2016
e4fe0cf
Merge pull request #327 from sparc-request/kg-bootstrap_compose_notif…
Mar 24, 2016
69910e9
Merge branch 'streamlined_bootstrap_portal' into kg-bootstrap_print_ssr
Mar 24, 2016
192390d
moved print to global
Mar 24, 2016
e49763a
Merge pull request #326 from sparc-request/kg-bootstrap_print_ssr
Mar 24, 2016
76261ea
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
Mar 25, 2016
b2d6fbd
review page working
Mar 25, 2016
aa22f9b
fix calendar css issues
Mar 25, 2016
14c4161
remove portal css outdated stuff
Mar 25, 2016
0bfc64d
Merge branch 'master' of github.com:sparc-request/sparc-request into …
Mar 25, 2016
4b2ae54
Merge branch 'master' of github.com:sparc-request/sparc-request into …
Mar 25, 2016
e64aa33
Add notes and reply to messages in the same window as index.
Mar 28, 2016
44a788a
changes
Mar 29, 2016
8736d35
Merge branch 'streamlined_bootstrap_portal' into kg-bootstrap_no_noti…
Mar 29, 2016
84d94e4
Refactored Breadcrumbed. Replaced its feature spec. Added some RSpec …
Mar 29, 2016
d4d3191
ymlizing the protocol forms
Mar 29, 2016
7110b2a
setting up the base modal and route
Mar 29, 2016
45ecddc
merge conflicts
Mar 29, 2016
9213246
Decoupled Lane from filters_spec. Need a better log in helper.
Mar 29, 2016
3f9441b
Beginning to remove wait_for_javascript from specs.
Mar 30, 2016
4fee1dc
filled out the modal
Mar 31, 2016
f5e3725
Merge branch 'streamlined_bootstrap_portal' into kg-bootstrap_view_pr…
Mar 31, 2016
351f092
Completely refactored filters_spec
Mar 31, 2016
ef32a82
some cosmetic changes
Mar 31, 2016
2ed83a4
Update new.js.coffee
Mar 31, 2016
5b8ef84
user doesn't have to be primary pi, added as general access user
Mar 31, 2016
2717bbc
updated quick yml
Mar 31, 2016
f88b501
Refactored per Will's suggestions.
Mar 31, 2016
f8676e4
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
Mar 31, 2016
d3883e8
Merge pull request #335 from sparc-request/kg-bootstrap_view_protocol…
Apr 4, 2016
c165216
Update notifications_controller.rb
Apr 4, 2016
b4b9350
Merge pull request #334 from sparc-request/kg-bootstrap_no_notificati…
Apr 4, 2016
c92d201
Beginning refactor of notifications/index_spec
Apr 4, 2016
d0d5023
Code cleanup.
Apr 4, 2016
a1106e8
Progress commit for notifications/index_spec refactor
Apr 5, 2016
167c472
Validations on add arm form
Apr 5, 2016
3ee9d7d
Edit arm validations.
Apr 5, 2016
3d81832
Fixed visits validations.
Apr 5, 2016
b80d58f
Fixed some more disabled buttons and study schedule tab reloads.
Apr 5, 2016
8d30916
Fixing broken specs.
Apr 6, 2016
b161c95
temp
Apr 7, 2016
cea0c3e
temp
Apr 7, 2016
3ac3995
temp
Apr 7, 2016
c34375f
merge conflicts
Apr 7, 2016
e852737
added back hover on a button
Apr 7, 2016
075d92f
Merge branch 'streamlined_bootstrap_portal' into kg-bootstrap_add_ser…
Apr 7, 2016
f53a035
replaced a user portal link w/ dashboard link
Apr 7, 2016
734d90f
Merge branch 'streamlined_bootstrap_portal' into kg-bootstrap_add_ser…
Apr 7, 2016
90fb592
show service request logic change
Apr 7, 2016
142a569
added permission alert
Apr 7, 2016
ea9ac5f
Fix many broken authorized user specs.
Apr 7, 2016
7c70c8b
Dashboard::SubServiceRequestsController#show spec
Apr 8, 2016
6189a27
Spec fix
Apr 8, 2016
d052cb6
Further spec fixes. All dashboard specs should pass.
Apr 8, 2016
84af6d0
Most view specs for SubServiceRequest show page finished.
Apr 12, 2016
97a285f
If a protocol has a requester_id, and an authorized user's id matches…
Apr 12, 2016
9d0334e
No service requester in notifications dropdown (Protocol show page)
Apr 12, 2016
4f79f5d
minor styling updates in protocol form
Apr 12, 2016
6d18627
some more styling
Apr 12, 2016
748a62c
master -> us
Apr 14, 2016
592ba40
Protocol filters should be able to use multiselects.
Apr 14, 2016
c6dccdb
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
Apr 15, 2016
8c3c1fc
ArmsController refactor
Apr 15, 2016
d8cfe4d
renamed the service calendar, naming caused a file tracking issue
Apr 19, 2016
91b594e
Merge branch 'master' into streamlined_bootstrap_portal
Apr 19, 2016
c8de8f7
Merge pull request #340 from sparc-request/kg-bootstrap_add_services
Apr 19, 2016
c62cb05
Fix ShouldMatchers configuration.
Apr 20, 2016
20ab6a9
More controller specs.
Apr 20, 2016
b73cdac
Progress commit. Reinstalling everything on laptop.
Apr 20, 2016
715a381
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
Apr 20, 2016
51bbdf6
Finished ArmDestroyer helper
Apr 21, 2016
4007375
Merge branch 'jjh-dashboard-handoff' into streamlined_bootstrap_portal
Apr 21, 2016
32109ed
Most of the associated users spec. Beginning to refactor #update and …
Apr 22, 2016
3e327f2
AssociatedUsersController#update refactor and tests.
Apr 26, 2016
5ece069
Finished AssociatedUsersController refactor and specs.
Apr 26, 2016
5f797bb
Specs for Dashboard::DocumentsController
Apr 27, 2016
8f5f934
EpicQueuesController specs
Apr 27, 2016
1deb50f
FulfillmentsController specs.
Apr 27, 2016
e58498f
Lots of specs.
May 2, 2016
d3c9047
Merge branch 'master' into streamlined_bootstrap_portal
May 2, 2016
163a164
amend previous commit
May 2, 2016
03dfd55
removing print button from show ssr modal
May 2, 2016
866ec36
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
May 2, 2016
9bd6b4f
Lib class did not match name of file.
May 2, 2016
a9be152
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
May 2, 2016
630a084
added javascript for popup ability when changing protocol type and ad…
jwiel86 May 3, 2016
efe036c
More specs for LineItemsController. Removed a couple of unused LI rou…
May 3, 2016
be2d36c
fixing validations and adding readonly partial
jwiel86 May 3, 2016
160a9d3
removed old errors
jwiel86 May 3, 2016
f2f1eac
merr
jwiel86 May 3, 2016
b6408a1
can change study type
jwiel86 May 3, 2016
8ed4c01
showing the requests notifications select, fixing permission settings…
May 3, 2016
f810722
View spec fixes.
May 3, 2016
250ecff
adding local admin variable to partials
jwiel86 May 3, 2016
73626c4
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
May 3, 2016
86373a5
Reverted some changes. Why is LineItem associated with ServiceRequest…
May 3, 2016
ca7b1a5
refactored admin view for study info
jwiel86 May 3, 2016
b4b6b46
specs
May 3, 2016
71175a8
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
May 3, 2016
0d391a5
study type questions now appearing
jwiel86 May 3, 2016
ce742fd
Specs for MessagesController
May 3, 2016
120ee9a
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
May 3, 2016
db3530f
NotesController specs.
May 3, 2016
364e5a2
fixed stale js variables and fixed study type answer validations
jwiel86 May 3, 2016
ca650f8
made type a accessible attr need to clean up protocol_form.js
jwiel86 May 3, 2016
ab7a676
Refactor of NotificationsController#index
May 4, 2016
7f4d13b
changed jquery elements to strings, so that we don't have the stale v…
jwiel86 May 4, 2016
31a49e1
Removed a config file that was accidentally added to version control.
May 4, 2016
8cb3438
fixed validations
jwiel86 May 4, 2016
e1441f8
Revert routes change
May 4, 2016
9905d5d
fixing the permissions, adding controller authorizations
May 4, 2016
501ae8a
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
May 4, 2016
d688e72
fixed service request authorization, specs
May 4, 2016
4768d8f
Refactored some Notifications scopes. Fixed possible bug in Notificat…
May 4, 2016
c5c05f8
cleaning up modal errors
jwiel86 May 4, 2016
9ead588
Merge branch 'streamlined_bootstrap_portal' into jw_bootstrap
jwiel86 May 4, 2016
45b7ac5
Distinguishing between enabled and disabled authorized user buttons o…
May 4, 2016
13bc3ac
fixed bug in authorizing service requests
May 4, 2016
02bbd32
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
jwiel86 May 4, 2016
9ca3b31
Merge branch 'master' into streamlined_bootstrap_portal
May 5, 2016
2f659c8
html and JS updates to protocol form
May 5, 2016
a3e067d
fixed view details bug, validations flash update in edit protocol
May 6, 2016
4ba4595
Re-organized controller specs.
May 6, 2016
42a673e
Merge branch 'master' into streamlined_bootstrap_portal
Stuart-Johnson May 6, 2016
804046f
temp - documents on protocol, waiting for service request consolidation
May 6, 2016
d434443
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
May 9, 2016
70a49ec
when filtering admin orgs, display requests works properly, changed a…
May 9, 2016
47c6fee
undoing accidentally-committed documents edits
May 9, 2016
6b5fc77
made 'NO PPPV' message under Admin Study Schedule tab a red alert
May 9, 2016
81ed7e3
Style changes to specs.
May 9, 2016
1045d24
fixed validation...again
jwiel86 May 9, 2016
937474b
updating protocol edit to pass permission to edit for admin users on …
May 9, 2016
e5be30f
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
May 9, 2016
dede305
active/inactive val
jwiel86 May 9, 2016
00d9c4f
Merge branch 'jw_epic_val_bootstrap' into streamlined_bootstrap_portal
jwiel86 May 9, 2016
33a47b7
Merge branch 'streamlined_bootstrap_portal' of github.com:sparc-reque…
Stuart-Johnson May 10, 2016
c2530fe
small fix to hollings report
Stuart-Johnson May 10, 2016
8fc3cd4
Unnecessary method in spec
May 10, 2016
c1a7d77
Spec cleanup and fixes. Some refactoring on the Identity model regard…
May 11, 2016
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions .rvmrc.example

This file was deleted.

23 changes: 18 additions & 5 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ gem 'audited-activerecord'
gem 'axlsx'
gem 'axlsx_rails'
gem 'bluecloth'
gem 'rails-html-sanitizer'
gem 'bootstrap-sass', '~> 3.2.0'
gem 'bootstrap-select-rails'
gem 'bootstrap3-datetimepicker-rails'
gem 'capistrano'
gem 'capistrano-ext'
gem 'coffee-rails'
Expand All @@ -17,23 +19,26 @@ gem 'devise', '~> 3.5.1'
gem 'dynamic_form'
gem 'execjs'
gem 'exception_notification'
gem 'filterrific'
gem 'grape', '0.7.0'
gem 'grape-entity', '~> 0.4.4'
gem 'grouped_validations', :git => 'https://github.com/jleonardw9/grouped_validations.git', branch: 'master'
#gem 'grouped_validations', github: 'jleonardw9/grouped_validations', branch: 'master'
gem 'gyoku'
gem 'haml'
gem 'icalendar'
gem 'inflection-js-rails'
gem 'jquery_datepicker'
gem 'jquery-rails'
gem 'jbuilder', '~> 2.0'
gem 'json'
gem 'letter_opener'
gem 'momentjs-rails', '>= 2.8.1'
gem 'mysql2', '~> 0.3.18'
gem 'nested_form'
gem 'newrelic_rpm'
gem 'nokogiri'
gem 'nori'
gem 'nprogress-rails'
gem 'obis-net-ldap'
gem 'omniauth'
gem 'omniauth-shibboleth'
Expand All @@ -42,7 +47,9 @@ gem 'pdfkit'
gem 'prawn', '0.12.0'
gem 'protected_attributes'
gem 'rails', '4.2.4'
gem 'rails-html-sanitizer'
gem 'redcarpet'
gem 'remotipart'
gem 'rest-client'
gem 'rvm-capistrano', require: false
gem 'sass'
Expand All @@ -52,8 +59,11 @@ gem 'simplecov', require: false, group: :test
gem 'sinatra'
gem 'surveyor', :git => 'https://github.com/sparc-request/surveyor.git', branch: 'rails4'
gem 'therubyracer', '0.10.2', :platforms => :ruby
gem 'twitter-typeahead-rails'
gem 'uglifier', '>= 1.0.3'
gem 'will_paginate'
gem 'will_paginate-bootstrap'
gem 'x-editable-rails'

group :development, :test, :profile do
gem 'addressable', '~> 2.3.6'
Expand All @@ -74,11 +84,12 @@ group :development, :test do
end

group :development do
gem 'traceroute'
gem 'sqlite3'
gem 'highline'
gem 'spring'
gem 'spring-commands-rspec'
gem 'spring'
gem 'sqlite3'
gem 'traceroute'
gem 'parallel_tests', group: :development
end

group :test do
Expand All @@ -87,8 +98,10 @@ group :test do
gem 'email_spec'
gem 'factory_girl_rails'
gem 'rspec-activemodel-mocks'
gem 'rspec-html-matchers'
gem 'shoulda-matchers', require: false
gem 'shoulda-callback-matchers'
gem 'site_prism'
gem 'webmock'
end

Expand Down