lams_common

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge lams2_3 into head

    • -1
    • +16
    ./db/sql/create_integration_tables.sql
    • -7
    • +7
    ./db/sql/insert_lams_unix_config_data.sql
    • -6
    • +6
    ./db/sql/insert_lams_windows_config_data.sql
    • -1
    • +1
    ./db/sql/insert_rams_unix_config_data.sql
    • -1
    • +1
    ./db/sql/insert_rams_windows_config_data.sql
  1. … 111 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch). Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

  1. … 14 more files in changeset.
LDEV-2254 Safari and VR Author fixed

LDEV-2286

VR tool now deployed as archived .war

LDEV-2281

Lessons with VR tool activities are now exported correctly

Author recordings are held locally on LAMS server

LDEV-2289

Popup now shown if EITHER media server settings are blank (both required for VR to work)

LDEV-2005

Export for learner/teacher working

Conditions tab removed

Author recordings added to FCK content folder

Preview images uploaded to own content folder for each VR session

    • -2
    • +11
    ./db/sql/create_presence_chat_tables.sql
    • -2
    • +2
    ./db/sql/insert_lams_unix_config_data.sql
    • -2
    • +2
    ./db/sql/insert_lams_windows_config_data.sql
  1. … 158 more files in changeset.
update patch level

LDEV-2125: If user's time zone is not set, it defaults to server's time zone (if in the list of supported time zones) or GMT (if not in the list).

LDEV-2149 Competence mappings now imported properly

LDEV-2125: User profile has now an option to choose a time zone. This choice is later used in LocaleFilter and allows JSP pages to adjust displayed dates accordingly.

  1. … 4 more files in changeset.
Merging lams_gradebook changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

LDEV-2244: Increase pop-up screensize to 1024x768 by default

    • -4
    • +4
    ./db/sql/insert_lams_unix_config_data.sql
    • -4
    • +4
    ./db/sql/insert_lams_windows_config_data.sql
    • -4
    • +4
    ./db/sql/insert_rams_unix_config_data.sql
    • -4
    • +4
    ./db/sql/insert_rams_windows_config_data.sql
Merging gradebook lams-common changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

LDEV-2005 = VideoRecorder tool and FCKEditor video recorder updated - export portfolio fixed - export fck recordings fixed - conditions added - preview images are now produced and displayed - more feedback for rating - instructions highlighted - clicking delete button does not trigger viewing of recording - timer display corrected - prompt validation - misc bugs

LDEV-2197 = Presence Chat updated

- no longer stacking in ie7

- scrolling improved

- logged conversations are fetched on open new tab

- status messages no longer shown in chat boxes, user icons change instead

- minimize/maximize button shown on presence tab

iFrame fixed for ie6

  1. … 50 more files in changeset.
LDEV-2239: Upgrading mysql connector

  1. … 19 more files in changeset.
LDEV-2191 Can now remove staff/learners from a started lesson

  1. … 5 more files in changeset.
LDEV-2173 Adding gradebook create table scripts to the dbupdates scripts for .23

Update to Version 2.3

    • -5
    • +5
    ./db/sql/insert_lams_unix_config_data.sql
    • -5
    • +5
    ./db/sql/insert_lams_windows_config_data.sql
LDEV-2164 add try/catch block inside processing loop in order to continue processing on error.

LDEV-2159 fix missing apostrophe introduced in earlier commit; remove some string concatenators that became unnecessary after auto-formatting

LDEV-2123 escape search strings used in admin

LDEV-2030 update workspace name when user's name/s are changed; LDEV-2196 ensure user workspaces are created with utf8 strings when user is created

  1. … 1 more file in changeset.
LDEV-2173 - Putting most of gradebook into its own project for easier maintainence

Database persistence beans and DAO are staying in lams_common

  1. … 32 more files in changeset.
LDEV-2205 Didnt commit all the required files for the group admin view

  1. … 4 more files in changeset.
LDEV-2205 Adding in course-level admin to enable/disable gradebook for a course

  1. … 5 more files in changeset.
Fixing up accidental commit

    • -2
    • +2
    ./db/sql/insert_lams_unix_config_data.sql
LDEV-2204 Adding learner views for gradebook

  1. … 7 more files in changeset.
LDEV-2173 Using an enum type to identify the view for gradebook so it is more re-usable

  1. … 10 more files in changeset.
LDEV-2080: For all remaining tools - changed the way Hibernate properties are declared. Even for tools that did not need it the file was changed, so usage is the same everywhere.

    • -0
    • +50
    ./conf/hibernate/mappings/hibernate.cfg.xml
  1. … 55 more files in changeset.
LDEV-2187 LDEV-2115 Updated DTO to include new start time for completed activity (record).

LDEV-2173 Adding in an averageTime and an averageMark parameter to the abstract GradeBookGridRow class as it makes sense for all views to have these parameters

  1. … 5 more files in changeset.
LDEV-2187 Put time taken for activities and lessons in gradebook.

Adding in averaget time for activities for activity view in gradebook lesson monitor

  1. … 2 more files in changeset.
LDEV-2187 Put time taken for activities and lessons in gradebook.

Fixing up LearnerProgress.java so it stores both finish time and start time for all completed activities