SAK-22444 merge r110969 from trunk


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@110999 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22457 merge r111099 from trunk


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@111178 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-20801 merge in r110277 into 2.9.x

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@111448 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22079 Delegated Access Sakai patches
resizing frame when DA content loads


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@111559 66ffb92e-73f9-0310-93c1-f5514f145a0a
merged r111276 of SAK-22253 into 2.9.x branch

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@111582 66ffb92e-73f9-0310-93c1-f5514f145a0a
DAC-30 Shopping Admins should be able to remove auth or anon options for instructor settings in site info 


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@111954 66ffb92e-73f9-0310-93c1-f5514f145a0a
DAC-30 Shopping Admins should be able to remove auth or anon options for instructor settings in site info 


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@111957 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22194 merge r108519 from trunk


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@111997 66ffb92e-73f9-0310-93c1-f5514f145a0a
merge r112129 of SAK-20801 into 2.9.x

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@112130 66ffb92e-73f9-0310-93c1-f5514f145a0a
DAC-33 Allow admins and instructors to have an interface so that they set tools that can be available to logged in but not to public


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@112249 66ffb92e-73f9-0310-93c1-f5514f145a0a
DAC-34 Don't show role option if there is only one role option for instructors shopping period settings 


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@112304 66ffb92e-73f9-0310-93c1-f5514f145a0a
DAC-34 Don't show role option if there is only one role option for instructors shopping period settings


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@112400 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22014 - 2.9.x merge

svn merge -c110681 https://source.sakaiproject.org/svn/config/trunk/
Conflict discovered in 'configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: r
--- Merging r110681 into '.':
U    configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties

svn merge -c111980 https://source.sakaiproject.org/svn/config/trunk/
Conflict discovered in 'configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties'.
Select: (p) postpone, (df) diff-full, (e) edit,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: e
Select: (p) postpone, (df) diff-full, (e) edit, (r) resolved,
        (mc) mine-conflict, (tc) theirs-conflict,
        (s) show all options: r
--- Merging r111980 into '.':
G    configuration/bundles/src/bundle/org/sakaiproject/config/bundle/default.sakai.properties

svn merge -c111980 https://source.sakaiproject.org/svn/reset-pass/trunk/
--- Merging r111980 into '.':
U    reset-pass/src/java/org/sakaiproject/tool/resetpass/ConfirmProducer.java
U    reset-pass/src/java/org/sakaiproject/tool/resetpass/FormHandler.java

in-uits-gjthomas:site-manage gjthomas$ svn merge -c111980 https://source.sakaiproject.org/svn/site-manage/trunk/
--- Merging r111980 into '.':
U    site-manage-participant-helper/src/java/org/sakaiproject/site/tool/helper/participant/impl/SiteAddParticipantHandler.java


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@113234 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-18721 merge r111671 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@113307 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21677 merge r108820,r113145 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@113309 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21707 merge r106695,r113311 from trunk


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@113312 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21797 merge r113073 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@113313 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21804 merge r113070 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@113314 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22060 merge r107975 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@113315 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22379 merge r110405 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@113326 66ffb92e-73f9-0310-93c1-f5514f145a0a