Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Changing webutil to always log requests to external servers

    • -2
    • +2
    ./lamsfoundation/lams/util/WebUtil.java
moving/creating post-2.3.1 db modification statements into new patch file

    • -0
    • +55
    ./lamsfoundation/lams/dbupdates/patch0018_updateFrom231.sql
LDEV-2372 moving all Selenium core classes from lams_common/test/java --> lams_common/src/java. as these classes are aimed for importing from other projects

    • -0
    • +592
    ./lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java
    • -0
    • +182
    ./lamsfoundation/lams/selenium/DefaultSeleniumFlex.java
    • -0
    • +69
    ./lamsfoundation/lams/selenium/SeleniumTestSuite.java
    • -0
    • +46
    ./lamsfoundation/lams/selenium/TestFrameworkConstants.java
    • -0
    • +68
    ./lamsfoundation/lams/selenium/TestFrameworkException.java
  1. … 5 more files in changeset.
LDEV-2374: - Vote now accepts nominations created by Teacher as well as ones derived from input. - Teacher can now limit number of Learners contributing to Vote's nomination pool. - Each tool now declares which DataOutputDefinitions it can accept for Data Flow.

    • -15
    • +33
    ./lamsfoundation/lams/tool/OutputFactory.java
  1. … 45 more files in changeset.
file shouldn't have been merged (was deleted on branch)

LDEV-2372 testing framework *there is no more need in removing .hbm.xml files

    • -177
    • +1
    ./lamsfoundation/lams/localCommonContext.xml
LDEV-2380: Added some code comments.

  1. … 1 more file in changeset.
LDEV-2380: Added recently edited LDs list on the first Ped Planner page.

  1. … 6 more files in changeset.
change to ascii

  1. … 47 more files in changeset.
LDEV-2375: Added "Back" button in Planner Template editor.

  1. … 4 more files in changeset.
LDEV-2202: Added a workaround for imported Hibernate collections. The way extra fields in XML document are located was altered - the class name does not have to be a tag name anymore, attribute "class" is also supported now.

LDEV-2374: Fixed a small bug occuring when importing LD.

Recreated/updated several resources removed by previous merge.

  1. … 5 more files in changeset.
LDEV-2372 Lams Testing framework works with JBoss 5 now

    • -44
    • +229
    ./lamsfoundation/lams/localCommonContext.xml
  1. … 1 more file in changeset.
LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

    • -1
    • +7
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +143
    ./lamsfoundation/lams/learningdesign/DataFlowObject.java
    • -0
    • +74
    ./lamsfoundation/lams/learningdesign/DataTransition.java
    • -0
    • +55
    ./lamsfoundation/lams/learningdesign/dao/IDataFlowDAO.java
    • -0
    • +101
    ./lamsfoundation/lams/learningdesign/dto/DataFlowObjectDTO.java
    • -125
    • +85
    ./lamsfoundation/lams/tool/OutputFactory.java
    • -69
    • +80
    ./lamsfoundation/lams/tool/ToolContentManager.java
    • -44
    • +44
    ./lamsfoundation/lams/tool/ToolOutputDefinition.java
  1. … 71 more files in changeset.
more merging lams2_3 into head

    • -0
    • +1
    ./lamsfoundation/lams/beanRefContext.xml
  1. … 30 more files in changeset.
Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

    • -1
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -2
    • +2
    ./lamsfoundation/lams/events/Event.java
    • -0
    • +1
    ./lamsfoundation/lams/lesson/Lesson.java
    • -236
    • +335
    ./lamsfoundation/lams/tool/OutputFactory.java
    • -128
    • +154
    ./lamsfoundation/lams/tool/ToolOutputDefinition.java
    • -0
    • +28
    ./lamsfoundation/lams/util/DateUtil.java
    • -99
    • +104
    ./lamsfoundation/lams/util/WebUtil.java
  1. … 153 more files in changeset.
Merge lams2_3 into head

    • -10
    • +24
    ./lamsfoundation/lams/applicationContext.xml
    • -2
    • +34
    ./lamsfoundation/lams/beanRefContext.xml
    • -176
    • +216
    ./lamsfoundation/lams/cache/CacheManager.java
    • -7
    • +184
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +29
    ./lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
    • -147
    • +124
    ./lamsfoundation/lams/integration/ExtServerOrgMap.java
    • -0
    • +84
    ./lamsfoundation/lams/integration/ExtServerToolAdapterMap.java
  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. … 16 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

  1. … 161 more files in changeset.
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.

    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql
  1. … 6 more files in changeset.
Merging lams_gradebook changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

Merging gradebook lams-common changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

    • -1
    • +2
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +15
    ./lamsfoundation/lams/lesson/Lesson.java
  1. … 3 more files in changeset.
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

    • -0
    • +50
    ./lamsfoundation/lams/util/Base64StringToImageUtil.java
  1. … 50 more files in changeset.
LDEV-2191 Can now remove staff/learners from a started lesson

    • -2
    • +32
    ./lamsfoundation/lams/lesson/LessonClass.java
  1. … 5 more files in changeset.
LDEV-2173 Adding gradebook create table scripts to the dbupdates scripts for .23

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