lams-github / lams_common / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 32
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Monday 06 Jul 2009
10:15 pm

Marcin Cieslak

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.

Options
    • -118
    • +131
    ./lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
10:14 pm

Marcin Cieslak

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

Options
    • -2
    • +4
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
7:04 pm

Marcin Cieslak

Recreated/updated several resources removed by previous merge.

Options
    • -0
    • +11
    ./lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
  2. … 5 more files in changeset.
Friday 03 Jul 2009
9:17 am

Andrey Balan

LDEV-2372 Lams Testing framework works with JBoss 5 now

Options
    • -44
    • +229
    ./lamsfoundation/lams/localCommonContext.xml
  2. … 1 more file in changeset.
Thursday 02 Jul 2009
9:06 pm

Marcin Cieslak

LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

Options
    • -1
    • +7
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +143
    ./lamsfoundation/lams/learningdesign/DataFlowObject.java
    • -0
    • +42
    ./lamsfoundation/lams/learningdesign/DataFlowObjectComparator.java
    • -0
    • +74
    ./lamsfoundation/lams/learningdesign/DataTransition.java
    • -233
    • +257
    ./lamsfoundation/lams/learningdesign/Transition.java
    • -0
    • +55
    ./lamsfoundation/lams/learningdesign/dao/IDataFlowDAO.java
    • -0
    • +73
    ./lamsfoundation/lams/learningdesign/dao/hibernate/DataFlowDAO.java
    • -0
    • +101
    ./lamsfoundation/lams/learningdesign/dto/DataFlowObjectDTO.java
    • -164
    • +235
    ./lamsfoundation/lams/learningdesign/dto/TransitionDTO.java
    • -56
    • +89
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -125
    • +85
    ./lamsfoundation/lams/tool/OutputFactory.java
    • -69
    • +80
    ./lamsfoundation/lams/tool/ToolContentManager.java
    • -44
    • +44
    ./lamsfoundation/lams/tool/ToolOutputDefinition.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/service/ILamsCoreToolService.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/service/LamsCoreToolService.java
  16. … 71 more files in changeset.
5:59 pm

jliew

more merging lams2_3 into head

Options
    • -0
    • +1
    ./lamsfoundation/lams/beanRefContext.xml
    • -1
    • +1
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -0
    • +16
    ./lamsfoundation/lams/gradebook/GradebookUserActivity.java
  4. … 30 more files in changeset.
4:19 pm

jliew

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)

Options
    • -1
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -2
    • +20
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +2
    ./lamsfoundation/lams/events/Event.java
    • -9
    • +0
    ./lamsfoundation/lams/learningdesign/TextSearchCondition.java
    • -0
    • +1
    ./lamsfoundation/lams/lesson/Lesson.java
    • -4
    • +6
    ./lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -0
    • +10
    ./lamsfoundation/lams/notebook/model/NotebookEntry.java
    • -0
    • +34
    ./lamsfoundation/lams/notebook/service/CoreNotebookService.java
    • -0
    • +3
    ./lamsfoundation/lams/notebook/service/ICoreNotebookService.java
    • -236
    • +335
    ./lamsfoundation/lams/tool/OutputFactory.java
    • -128
    • +154
    ./lamsfoundation/lams/tool/ToolOutputDefinition.java
    • -29
    • +52
    ./lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
    • -0
    • +28
    ./lamsfoundation/lams/util/DateUtil.java
    • -99
    • +104
    ./lamsfoundation/lams/util/WebUtil.java
    • -36
    • +42
    ./lamsfoundation/lams/web/action/LamsDispatchAction.java
  16. … 153 more files in changeset.
Wednesday 01 Jul 2009
10:48 am

jliew

Merge lams2_3 into head

Options
    • -10
    • +24
    ./lamsfoundation/lams/applicationContext.xml
    • -2
    • +34
    ./lamsfoundation/lams/beanRefContext.xml
    • -42
    • +69
    ./lamsfoundation/lams/cache/CacheDebugListener.java
    • -176
    • +216
    ./lamsfoundation/lams/cache/CacheManager.java
    • -7
    • +184
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +29
    ./lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
    • -26
    • +26
    ./lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java
    • -147
    • +124
    ./lamsfoundation/lams/integration/ExtServerOrgMap.java
    • -0
    • +84
    ./lamsfoundation/lams/integration/ExtServerToolAdapterMap.java
    • -0
    • +9
    ./lamsfoundation/lams/integration/service/IIntegrationService.java
    • -312
    • +319
    ./lamsfoundation/lams/integration/service/IntegrationService.java
    • -11
    • +13
    ./lamsfoundation/lams/learningdesign/GroupUser.java
    • -95
    • +98
    ./lamsfoundation/lams/learningdesign/LearningDesignProcessor.java
    • -1
    • +24
    ./lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
    • -426
    • +438
    ./lamsfoundation/lams/learningdesign/service/LearningDesignValidator.java
  16. … 111 more files in changeset.
Friday 19 Jun 2009
6:54 pm

Marcin Cieslak

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.

Options
    • -4
    • +53
    ./lamsfoundation/lams/usermanagement/User.java
    • -22
    • +54
    ./lamsfoundation/lams/usermanagement/dto/UserDTO.java
    • -1
    • +6
    ./lamsfoundation/lams/web/util/AttributeNames.java
  4. … 16 more files in changeset.
Thursday 07 May 2009
2:15 pm

paulg

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

Options
    • -0
    • +18
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +4
    ./lamsfoundation/lams/util/Base64StringToImageUtil.java
  3. … 161 more files in changeset.
Tuesday 28 Apr 2009
4:57 pm

Marcin Cieslak

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).

Options
    • -4
    • +27
    ./lamsfoundation/lams/usermanagement/User.java
1:19 pm

dcarlier

LDEV-2149 Competence mappings now imported properly

Options
    • -44
    • +26
    ./lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
3:37 am

Marcin Cieslak

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.

Options
    • -0
    • +15
    ./lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql
    • -68
    • +90
    ./lamsfoundation/lams/usermanagement/User.java
    • -1
    • +1
    ./lamsfoundation/lams/usermanagement/dto/UserDTO.java
    • -89
    • +91
    ./lamsfoundation/lams/web/filter/LocaleFilter.java
  5. … 6 more files in changeset.
Tuesday 21 Apr 2009
7:42 am

lfoxton

Merging lams_gradebook changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

Options
    • -0
    • +68
    ./lamsfoundation/lams/learningdesign/GroupUser.java
Monday 20 Apr 2009
8:10 am

lfoxton

Merging gradebook lams-common changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

Options
    • -1
    • +2
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +3
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -0
    • +4
    ./lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -2
    • +53
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -0
    • +15
    ./lamsfoundation/lams/lesson/Lesson.java
  6. … 3 more files in changeset.
Friday 17 Apr 2009
3:10 pm

paulg

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

Options
    • -1
    • +1
    ./lamsfoundation/lams/presence/dao/IPresenceChatMessageDAO.java
    • -9
    • +8
    ./lamsfoundation/lams/presence/dao/hibernate/PresenceChatMessageDAO.java
    • -0
    • +4
    ./lamsfoundation/lams/presence/model/PresenceChatMessage.java
    • -2
    • +2
    ./lamsfoundation/lams/presence/service/IPresenceChatLoggerService.java
    • -2
    • +2
    ./lamsfoundation/lams/presence/service/PresenceChatLoggerService.java
    • -0
    • +50
    ./lamsfoundation/lams/util/Base64StringToImageUtil.java
  7. … 50 more files in changeset.
Thursday 16 Apr 2009
2:42 pm

dcarlier

LDEV-2191 Can now remove staff/learners from a started lesson

Options
    • -2
    • +32
    ./lamsfoundation/lams/lesson/LessonClass.java
    • -1
    • +23
    ./lamsfoundation/lams/lesson/service/ILessonService.java
    • -0
    • +37
    ./lamsfoundation/lams/lesson/service/LessonService.java
  4. … 5 more files in changeset.
Tuesday 14 Apr 2009
2:49 pm

lfoxton

LDEV-2173 Adding gradebook create table scripts to the dbupdates scripts for .23

Options
    • -0
    • +29
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
Saturday 11 Apr 2009
1:24 am

jliew

LDEV-2164 add try/catch block inside processing loop in order to continue processing on error.

Options
    • -29
    • +39
    ./lamsfoundation/lams/usermanagement/service/LdapService.java
Friday 10 Apr 2009
10:42 pm

jliew

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

Options
    • -21
    • +21
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
10:24 pm

jliew

LDEV-2123 escape search strings used in admin

Options
    • -1
    • +5
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
9:28 pm

jliew

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

Options
    • -5
    • +32
    ./lamsfoundation/lams/usermanagement/service/UserManagementService.java
  2. … 1 more file in changeset.
Thursday 09 Apr 2009
1:05 pm

lfoxton

LDEV-2173 - Putting most of gradebook into its own project for easier maintainence

Database persistence beans and DAO are staying in lams_common

Options
    • -1
    • +0
    ./lamsfoundation/lams/beanRefContext.xml
    • -4
    • +4
    ./lamsfoundation/lams/commonContext.xml
    • -108
    • +0
    ./lamsfoundation/lams/gradebook/GradeBookUserActivity.java
    • -107
    • +0
    ./lamsfoundation/lams/gradebook/GradeBookUserLesson.java
    • -0
    • +108
    ./lamsfoundation/lams/gradebook/GradebookUserActivity.java
    • -0
    • +107
    ./lamsfoundation/lams/gradebook/GradebookUserLesson.java
    • -51
    • +0
    ./lamsfoundation/lams/gradebook/dao/IGradeBookDAO.java
    • -0
    • +51
    ./lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -199
    • +0
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java
    • -0
    • +199
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -143
    • +0
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -154
    • +0
    ./lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -114
    • +0
    ./lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -138
    • +0
    ./lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
    • -47
    • +0
    ./lamsfoundation/lams/gradebook/dto/comparators/GBAverageMarkComparator.java
  16. … 32 more files in changeset.
8:13 am

lfoxton

LDEV-2205 Didnt commit all the required files for the group admin view

Options
    • -17
    • +17
    ./lamsfoundation/lams/usermanagement/Organisation.java
  2. … 5 more files in changeset.
Tuesday 07 Apr 2009
1:24 pm

lfoxton

LDEV-2205 Adding in course-level admin to enable/disable gradebook for a course

Options
    • -0
    • +4
    ./lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -1
    • +43
    ./lamsfoundation/lams/usermanagement/Organisation.java
  3. … 7 more files in changeset.
10:35 am

lfoxton

LDEV-2204 Adding learner views for gradebook

Options
    • -0
    • +8
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -14
    • +19
    ./lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -0
    • +4
    ./lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
    • -1
    • +2
    ./lamsfoundation/lams/gradebook/util/GBGridView.java
  5. … 7 more files in changeset.
8:09 am

lfoxton

LDEV-2173 Using an enum type to identify the view for gradebook so it is more re-usable

Options
    • -0
    • +2
    ./lamsfoundation/lams/gradebook/dao/IGradeBookDAO.java
    • -4
    • +21
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java
    • -28
    • +12
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -22
    • +31
    ./lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -32
    • +17
    ./lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -1
    • +5
    ./lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
    • -0
    • +31
    ./lamsfoundation/lams/gradebook/util/GBGridView.java
  8. … 10 more files in changeset.
Monday 06 Apr 2009
2:14 pm

mseaton

LDEV-2187 LDEV-2115 Updated DTO to include new start time for completed activity (record).

Options
    • -25
    • +7
    ./lamsfoundation/lams/lesson/LearnerProgress.java
    • -1
    • +11
    ./lamsfoundation/lams/lesson/dto/CompletedActivityDTO.java
2:14 pm

lfoxton

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

Options
    • -4
    • +4
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -4
    • +4
    ./lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -1
    • +24
    ./lamsfoundation/lams/gradebook/dto/GradeBookGridRowDTO.java
    • -0
    • +47
    ./lamsfoundation/lams/gradebook/dto/comparators/GBAverageMarkComparator.java
    • -0
    • +47
    ./lamsfoundation/lams/gradebook/dto/comparators/GBAverageTimeTakenComparator.java
  6. … 5 more files in changeset.
Friday 03 Apr 2009
2:08 pm

lfoxton

LDEV-2187 Put time taken for activities and lessons in gradebook.

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

Options
    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +2
    ./lamsfoundation/lams/gradebook/dao/IGradeBookDAO.java
    • -1
    • +36
    ./lamsfoundation/lams/gradebook/dao/hibernate/GradeBookDAO.java
    • -0
    • +6
    ./lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -0
    • +6
    ./lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
  6. … 3 more files in changeset.