Clone Tools
  • last updated a few minutes ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
SAK-31129 : Home tool (site info display) does not respect frame height selection for RTE content (#4630)

  1. … 2 more files in changeset.
SAK-32735 use appropriate isNotBlank or isBlank method (#4642)

* SAK-32735 use appropriate isNotBlank or isBlank method

* SAK-32735 one more unnecessary null

  1. … 10 more files in changeset.
SAK-32698 - Add user-agent to HEAD request (#4600)

SAK-32689 - Add user-agent to HEAD request (#4600)

(cherry picked from commit d97b5e8e5660fb8719a46d722df07ca6d870baab)

SAK-31931 Make URLs relative in Overview (Site Information Display) (#3572)

* SAK-31931 Removed hostname from web-content urls while storing in the DB.

This means that the same database can be used on test servers which are accessible under different hostnames. This means that links point to the current server instead of a specific server.

* SAK-31931 Add server name aliases to config.

This allows the administrator to specify aliases for the current server in the configuration.

* SAK-31931 Fix mock in sitestats that broke tests.

* SAK-31931 Fix imports.

  1. … 5 more files in changeset.
SAK-31664 update velocity framework to use SLF4JLogChute (#3177)

  1. … 48 more files in changeset.
SAK-30828 Normalize logging for 11.x (#3346)

* SAK-30828 Normalize sakai logging

- remove commons-logging (jcl)

- add logging to those projects where it was removed

- convert System.out to log messages in many projects

- add jcl-over-slf4j lib

- update many dependencies to inherit from master

- update logging for tests

- add lombok to global dependency (@Slf4j)

Conflicts:

basiclti/tsugi-util/pom-tsugi.xml

content-review/impl/dao/pom.xml

content-review/impl/turnitin/pom.xml

content-review/pom.xml

entitybroker/utils/pom.xml

gradebookng/tool/src/java/org/sakaiproject/gradebookng/business/util/Temp.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/pages/BasePage.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/CreateGradeItemStep.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportConfirmationStep.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeImportUploadStep.java

gradebookng/tool/src/java/org/sakaiproject/gradebookng/tool/panels/importExport/GradeItemImportSelectionStep.java

* SAK-30828 switch log4j logging to slf4j

* SAK-30828 switch jcl logging to slf4j

Conflicts:

assignment/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/BaseAssignmentService.java

assignment/assignment-impl/impl/src/java/org/sakaiproject/assignment/impl/DbAssignmentService.java

basiclti/basiclti-impl/src/java/org/sakaiproject/lti/impl/LTIReportingJob.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/util/TurnitinAPIUtil.java

kernel/kernel-impl/src/main/java/org/sakaiproject/event/impl/BaseLearningResourceStoreService.java

lessonbuilder/tool/src/java/org/sakaiproject/lessonbuildertool/tool/beans/SimplePageBean.java

portal/portal-impl/impl/src/java/org/sakaiproject/portal/charon/handlers/GenerateBugReportHandler.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/evaluation/QuestionScoreListener.java

samigo/samigo-app/src/java/org/sakaiproject/tool/assessment/ui/listener/questionpool/PoolSaveListener.java

signup/impl/src/java/org/sakaiproject/signup/logic/SignupMeetingServiceImpl.java

syllabus/syllabus-impl/src/java/org/sakaiproject/component/app/syllabus/SyllabusServiceImpl.java

* SAK-30828 slf4j-log4j12 binding should be provided

* SAK-30828 Lombok @CommonsLog migrated to @Slf4j

Conflicts:

content-review/impl/dao/src/test/java/org/sakaiproject/contentreview/dao/ContentReviewDaoImplTest.java

content-review/impl/service/src/main/java/org/sakaiproject/contentreview/service/ContentReviewFederatedServiceImpl.java

content-review/impl/service/src/main/java/org/sakaiproject/contentreview/service/ContentReviewQueueServiceImpl.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinAccountConnection.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinContentValidator.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinReviewServiceImpl.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/TurnitinSessionFuncs.java

content-review/impl/turnitin/src/main/java/org/sakaiproject/contentreview/turnitin/util/TurnitinAPIUtil.java

content-review/impl/vericite/src/main/java/org/sakaiproject/contentreview/vericite/ContentReviewServiceVeriCite.java

* SAK-30828 content-review slf4j conversion

* SAK-31420 Issue with import from site not working due to logger serialization (#3169)

  1. … 1944 more files in changeset.
SAK-30828 switch jcl logging to slf4j

  1. … 1491 more files in changeset.
  1. … 3 more files in changeset.
  1. … 3 more files in changeset.
SAK-30097 Removed hostname(server-url) from site-info url while storing in the DB.

Prepend the server url back to the site-info on the edit screen of home

page.

Merge pull request #995 from danielmerino/SAK-29301

SAK-29301 - Custom title applied on a per tool basis on Home pages in…

SAK-29301 - Custom title applied on a per tool basis on Home pages instead of customTitle page property.

Merge pull request #964 from buckett/KNL-1375

KNL-1375 Remove AuthzGroupService cover and refactor code to use ComponentManager

  1. … 6 more files in changeset.
SAK-29770 - Popup if tool description saved on home with html content

  1. … 1 more file in changeset.
KNL-1375 Remove uses of AuthzGroupService cover.

This removes all use the AuthzGroupService cover so we only have one API to maintain, for services it also makes testing easier as you can inject a test copy of the service.

  1. … 56 more files in changeset.
KNL-1375 Remove uses of AuthzGroupService cover.

This removes all use the AuthzGroupService cover so we only have one API to maintain, for services it also makes testing easier as you can inject a test copy of the service.

  1. … 56 more files in changeset.
SAK-29626 - Fix a missing former valye for the chosen icon.

SAK-29625 - Implement an icon picker in the LTI tools and Web Content Tool

Also makes progress on

SAK-29626 - Build a reusable icon picker

SAK-29646 - Add the ability to pick icons to the Web Content cool

  1. … 18 more files in changeset.
SAK-25883 Get the real path to the current root.

Then walk back up the tree and into the library folder. This is because

in Tomcat 8 the getRealPath is more strict and returns null when you

attempt to access another context.

In the long run this isn’t a good solution as we should be enabling people

to run without having to unpack webapps but it gets things working.

I haven’t added a null check in here as otherwise when we start looking

at running without unpacked WARs we’ll just lose the i18n.

SAK-27774

Teach the iframe portlet to be responsible for its own jQuery in case it

encounters morpheus.

git-svn-id: https://source.sakaiproject.org/svn/web/trunk@311739 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 4 more files in changeset.
SAK-25357 - Web content cannot display html pages with spaces

git-svn-id: https://source.sakaiproject.org/svn/web/trunk@307705 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-23914 change default to current site for attachments to Home web content

git-svn-id: https://source.sakaiproject.org/svn/web/trunk@307037 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 1 more file in changeset.
SAK-25704 - More additional/specific tracking for web portlet

git-svn-id: https://source.sakaiproject.org/svn/web/trunk@134345 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 1 more file in changeset.
SAK-24208

Make it so that popups happen as a result of a side effect of a user-click action

whenever possible so we do not see the "Allow popups" dialogs on the various

browsers.

This was trickier than it seemed, touching /direct/site, three tools, the

main portal, and PDA portal.

These modifications need to be committed or backported together as they have cross

dependencies.

git-svn-id: https://source.sakaiproject.org/svn/web/trunk@132825 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 1 more file in changeset.
SAK-24335 - Home (My Workspace Site Info) text processing inconsistent with site Info tool description

git-svn-id: https://source.sakaiproject.org/svn/web/trunk@129944 66ffb92e-73f9-0310-93c1-f5514f145a0a

SAK-23875

Add the validation and sanitization code from KNL-1105 into the web content tool

to ease back-porting in case folks need the new features in a hurry.

git-svn-id: https://source.sakaiproject.org/svn/web/trunk@128949 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 1 more file in changeset.
SAK-23841

PortletIFrame.popupXFrame() method generates high database CPU load

This patch addresses a number of issues relating to when to and

not to do a popup.

- Change the default timeout to 6 hours.

- If a web site sends us an x-frame-options header - auto-tick the popup so there is no further checking (assume sites don't go backwards)

- Suppress checking if the prefix of the url matches the server url or the access url

- Add a new property iframe.xframe.popup=regex where if the regex matches the URL, the content is always done in a popup and the x-frame-options check is never done

- Add a new property iframe.xframe.inline=regex where if the regex matches, the content is always inlined and the x-frame-options check is never done

- Force popup if the server is https and the content is not https

- Change the Home variant of the tool to display the site title or site description inline without an iframe.

git-svn-id: https://source.sakaiproject.org/svn/web/trunk@128908 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 1 more file in changeset.
SAK-23834

Custom Height Does not Work in iFrame (Web Content) Portlet

git-svn-id: https://source.sakaiproject.org/svn/web/trunk@128099 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 1 more file in changeset.
SAK-23230

Use commons-httpclient to encode URIs

git-svn-id: https://source.sakaiproject.org/svn/web/trunk@128098 66ffb92e-73f9-0310-93c1-f5514f145a0a

  1. … 2 more files in changeset.