Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merging 2.3 changes with head

LDEV-2216 Changing handling of markerinfo and marker title to not use the javascript ecape() function as it was screwing up non ASCII (greek) characters

LDEV2232 setting gmap marker gmapSession to null on export content to prevent potential errors on import

  1. … 5 more files in changeset.
merging improvements from lams2_3_spring_jboss_tune branch

  1. … 118 more files in changeset.
Added repositoryService via spring

Removed calls to RepositoryProxy class.

LDEV-2171

  1. … 17 more files in changeset.
fixing up some formatted files in gmap project

  1. … 1 more file in changeset.
LDEV-1850 - Fixing a problem that makes the GoogleMaps API check appear in the reflection page for monitoring and learning

  1. … 5 more files in changeset.
LDEV-1916 adding autopatch to tools, including db_version_insert.sql script to tool deployer

  1. … 71 more files in changeset.
LDEV-1911 Making Gmap tool have its own config page for the gmap API key, istead of putting it in the general lams configuration page.

This is the backend stuff to make the config model possible

    • -0
    • +34
    ./java/org/lamsfoundation/lams/tool/gmap/web/forms/AdminForm.java
LDEV-1850 - Doing reflection for Gmap, export portfolio

  1. … 1 more file in changeset.
LDEV-1850 - Doing reflection for Gmap, Learner, monitor done. Just need to do export portfolio

  1. … 9 more files in changeset.
For LDEV-1850

Adding in reflection, finished for learner and author.

Monitor and export portfolio still unfinished

  1. … 13 more files in changeset.
For LDEV-1851

Adding the saveMarkers action to monitor so the teacher can save/update/remove markers

  1. … 3 more files in changeset.
For LDEV-1851

the isAuthored property of the marker should not be updated, only saved on the first time, otherwise any markers edited in monitor come unter the Authored user

LDEV-1662 Putting in advanced options summary into monitoring summary page for every tool.

Gmap

  1. … 1 more file in changeset.
Removed import for the gmap image bundler class

LDEV-1847 - Fixed export portfolio so custom images for gmap are bundled with the export.

Now the class is centralised in learner so this can be used in future for other tools.

Fixed up export portfolio so that images are included in the export.

That way the activity still displays correctly even when the lams server is down

  1. … 1 more file in changeset.
Code cleanup for java source

Code cleanup for java source

code cleanup - removing any remaining occurences of notebook code

  1. … 5 more files in changeset.
Putting updateMarkersXML in gmapService and removing from author and learner actions

Added save action and button in the learning inteface so users can save markers without going to the next activity

  1. … 1 more file in changeset.
Learner export completed, export portfolio functionality completed

  1. … 1 more file in changeset.
Fixing up export servlet for learner export portfolio

Fixed problem preventing the current user from being diplayed in the sidebar unless they have saved a marker

Fixed up a problem with export/import tool content that was throwing an error when the user saves an imported gmap

  1. … 3 more files in changeset.
Added changes in to implement code and interfaces for grouping, this was previously un-implemented n monitor and learner

  1. … 22 more files in changeset.
Implementing export sevlet

  1. … 1 more file in changeset.
Fixed up GmapService for exporting the learning design activity correctly:

Previousl, the export xml was a bit wrong because a gmap has marker(s) and a marker has a gmap, so it got a bit ugly with nesting, nulling the marker's gmap object (as was done in forum) fixed the problem before the export

learner and monitor draft versions are done

  1. … 14 more files in changeset.
Fixed a problem with removing markers, that was causing the rest of the markers to not be updated after the first was removed

Also, fixed a problem that was creating a new gmapUser each time the sequence was saved and not using the existing one