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.

Sign up for GitHub

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

Jump to bottom

Streamlined bootstrap portal #376

Merged
merged 535 commits into from May 11, 2016
Merged

Streamlined bootstrap portal #376

merged 535 commits into from May 11, 2016

Conversation

jayhardee9
Copy link
Contributor

No description provided.

Charlie Thiry and others added 30 commits February 25, 2016 15:58
unnecessary
d4aa9ce
one step closer to proper working again
fc708fa
allow protocol modal on dashboard to have permissions
993f83f
Moved instance variable from partial.
f4d2045
A lot of specs.
536026b
More specs for Dashboard::ProtocolsController.
60193bd
on the way to proper subsidies
3bfaf98
Merge branch 'streamlined_bootstrap_portal' of github.com:sparc-reque…
8d4af2e 
…st/sparc-request into streamlined_bootstrap_portal
Testing Dashboard::ProtocolsController#create
0f82c52
Testing Dashboard::ProtocolsController#{edit, create}
f78adeb
Testing little Protocol actions.
51913b7
Begin separating proper and dashboard calendars.
f359af8
More ProtocolsController specs.
0cb6c12
yumml
f116599
merge conflicts
be2267c
Testing Dashboard::ArmsController#{new, create} and Dashboard::Approv…
0481ac1 
…alsController#{new, create}
proper subsidies almost there
42331d5
Merge branch 'streamlined_bootstrap_portal' of github.com:sparc-reque…
490770e 
…st/sparc-request into streamlined_bootstrap_portal
Finished tests for Dashboard::ArmsController.
f476050
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
ae9cb34 
…rc-request/sparc-request into streamlined_bootstrap_portal
Tested Dashboard::AssociatedUsers#destroy. Sketched out specs for rem…
1b0af76 
…aining methods.
only display ssr-sub if eligible_for_subsidy?
8a7956b
Merge branch 'master' of github.com:sparc-request/sparc-request into …
2f3bf6f 
…bs_dashboard_service_calendars
Filling out Dashboard::AssociatedUsersController specs.
7155e66
Testing Dashboard::AssociatedUsersController#edit.
500c0ad
some more small things for a merge
5edf1b5
Merge branch 'streamlined_bootstrap_portal' into kg-bootstrap_yumml
e8b3211
spec updates
9acc581
final specs
cea8f8f
added confirm
950bbc1
Jerry Hardee and others added 26 commits May 4, 2016 14:19
Refactored some Notifications scopes. Fixed possible bug in Notificat…
4768d8f 
…ionsController#new and spec'd it out.
@jwiel86
cleaning up modal errors
c5c05f8
@jwiel86
Merge branch 'streamlined_bootstrap_portal' into jw_bootstrap
9ead588
Distinguishing between enabled and disabled authorized user buttons o…
45b7ac5 
…n Protocol show in corresponding page object.
fixed bug in authorizing service requests
13bc3ac
@jwiel86
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
02bbd32 
…rc-request/sparc-request into streamlined_bootstrap_portal
Merge branch 'master' into streamlined_bootstrap_portal
9ca3b31
html and JS updates to protocol form
2f659c8
fixed view details bug, validations flash update in edit protocol
a3e067d
Re-organized controller specs.
4ba4595
@Stuart-Johnson
Merge branch 'master' into streamlined_bootstrap_portal
42a673e
temp - documents on protocol, waiting for service request consolidation
804046f
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
d434443 
…rc-request/sparc-request into streamlined_bootstrap_portal
when filtering admin orgs, display requests works properly, changed a…
70a49ec 
…dd service button to service requests present, not ssrs present
undoing accidentally-committed documents edits
47c6fee
made 'NO PPPV' message under Admin Study Schedule tab a red alert
6b5fc77
Style changes to specs.
81ed7e3
@jwiel86
fixed validation...again
1045d24
updating protocol edit to pass permission to edit for admin users on …
937474b 
…epic buttons
Merge branch 'streamlined_bootstrap_portal' of https://github.com/spa…
e5be30f 
…rc-request/sparc-request into streamlined_bootstrap_portal
@jwiel86
active/inactive val
dede305
@jwiel86
Merge branch 'jw_epic_val_bootstrap' into streamlined_bootstrap_portal
00d9c4f
@Stuart-Johnson
Merge branch 'streamlined_bootstrap_portal' of github.com:sparc-reque…
33a47b7 
…st/sparc-request into streamlined_bootstrap_portal
@Stuart-Johnson
small fix to hollings report
c2530fe
Unnecessary method in spec
8fc3cd4
Spec cleanup and fixes. Some refactoring on the Identity model regard…
c1a7d77 
…ing notification counts.
@jleonardw9 jleonardw9 merged commit d5fb138 into master May 11, 2016
@kayla-glick kayla-glick deleted the streamlined_bootstrap_portal branch May 26, 2016 18:55
@kayla-glick kayla-glick restored the streamlined_bootstrap_portal branch May 26, 2016 18:55
@Stuart-Johnson Stuart-Johnson deleted the streamlined_bootstrap_portal branch June 9, 2016 13:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@jayhardee9 @jleonardw9 @jwiel86 @Stuart-Johnson