lams / lams_common / src / java / org

lamsfoundation

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 22
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 81,741
Net change in LoC this week: 0

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:19 pm

Marcin Cieslak

LDEV-2375: Added "Back" button in Planner Template editor.

Options
    • -1
    • +10
    ./lams/planner/dto/PedagogicalPlannerTemplateDTO.java
  2. … 4 more files in changeset.
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
    • -122
    • +135
    ./lams/learningdesign/service/ToolContentVersionFilter.java
10:14 pm

Marcin Cieslak

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

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

Marcin Cieslak

Recreated/updated several resources removed by previous merge.

Options
    • -0
    • +11
    ./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
    ./lams/localCommonContext.xml
  2. … 1 more file in changeset.
Thursday 02 Jul 2009
8:59 pm

Marcin Cieslak

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

Options
    • -1
    • +7
    ./lams/commonContext.xml
    • -0
    • +143
    ./lams/learningdesign/DataFlowObject.java
    • -0
    • +42
    ./lams/learningdesign/DataFlowObjectComparator.java
    • -0
    • +74
    ./lams/learningdesign/DataTransition.java
    • -235
    • +259
    ./lams/learningdesign/Transition.java
    • -0
    • +55
    ./lams/learningdesign/dao/IDataFlowDAO.java
    • -0
    • +73
    ./lams/learningdesign/dao/hibernate/DataFlowDAO.java
    • -0
    • +101
    ./lams/learningdesign/dto/DataFlowObjectDTO.java
    • -175
    • +246
    ./lams/learningdesign/dto/TransitionDTO.java
    • -56
    • +89
    ./lams/learningdesign/service/ExportToolContentService.java
    • -126
    • +86
    ./lams/tool/OutputFactory.java
    • -88
    • +99
    ./lams/tool/ToolContentManager.java
    • -45
    • +45
    ./lams/tool/ToolOutputDefinition.java
    • -2
    • +2
    ./lams/tool/service/ILamsCoreToolService.java
    • -3
    • +3
    ./lams/tool/service/LamsCoreToolService.java
  16. … 71 more files in changeset.
5:54 pm

jliew

more merging lams2_3 into head

Options
    • -0
    • +1
    ./lams/beanRefContext.xml
    • -1
    • +1
    ./lams/dbupdates/patch0015_updateFrom22.sql
    • -1
    • +17
    ./lams/gradebook/GradebookUserActivity.java
  4. … 37 more files in changeset.
4:18 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
    ./lams/commonContext.xml
    • -2
    • +20
    ./lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +2
    ./lams/events/Event.java
    • -10
    • +1
    ./lams/learningdesign/TextSearchCondition.java
    • -1
    • +2
    ./lams/lesson/Lesson.java
    • -5
    • +7
    ./lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -0
    • +10
    ./lams/notebook/model/NotebookEntry.java
    • -0
    • +34
    ./lams/notebook/service/CoreNotebookService.java
    • -0
    • +3
    ./lams/notebook/service/ICoreNotebookService.java
    • -256
    • +355
    ./lams/tool/OutputFactory.java
    • -130
    • +156
    ./lams/tool/ToolOutputDefinition.java
    • -31
    • +54
    ./lams/tool/dto/ToolOutputDefinitionDTO.java
    • -1
    • +29
    ./lams/util/DateUtil.java
    • -99
    • +104
    ./lams/util/WebUtil.java
    • -38
    • +44
    ./lams/web/action/LamsDispatchAction.java
  16. … 200 more files in changeset.
Wednesday 01 Jul 2009
10:39 am

jliew

Merge lams2_3 into head

Options
    • -10
    • +24
    ./lams/applicationContext.xml
    • -2
    • +34
    ./lams/beanRefContext.xml
    • -7
    • +184
    ./lams/commonContext.xml
    • -0
    • +462
    ./lams/localCommonContext.xml
    • -3
    • +4
    ./lams/toolApplicationContext.xml
    • -43
    • +70
    ./lams/cache/CacheDebugListener.java
    • -197
    • +237
    ./lams/cache/CacheManager.java
    • -0
    • +29
    ./lams/dbupdates/patch0017_updateFrom23-231.sql
    • -24
    • +24
    ./lams/events/dao/hibernate/EventDAOHibernate.java
    • -149
    • +126
    ./lams/integration/ExtServerOrgMap.java
    • -0
    • +84
    ./lams/integration/ExtServerToolAdapterMap.java
    • -0
    • +9
    ./lams/integration/service/IIntegrationService.java
    • -330
    • +337
    ./lams/integration/service/IntegrationService.java
    • -12
    • +14
    ./lams/learningdesign/GroupUser.java
    • -100
    • +103
    ./lams/learningdesign/LearningDesignProcessor.java
  16. … 148 more files in changeset.
Tuesday 30 Jun 2009
10:53 am

jliew

Resolve conflicts from previous merge

Options
    • -387
    • +4
    ./lams/learningdesign/service/LearningDesignValidator.java
  2. … 1 more file in changeset.
10:30 am

jliew

Merge lams2_3_jboss5 changes into lams2_3

Options
    • -10
    • +24
    ./lams/applicationContext.xml
    • -2
    • +34
    ./lams/beanRefContext.xml
    • -37
    • +212
    ./lams/commonContext.xml
    • -3
    • +4
    ./lams/toolApplicationContext.xml
    • -43
    • +70
    ./lams/cache/CacheDebugListener.java
    • -197
    • +237
    ./lams/cache/CacheManager.java
    • -24
    • +24
    ./lams/events/dao/hibernate/EventDAOHibernate.java
    • -15
    • +17
    ./lams/learningdesign/GroupUser.java
    • -100
    • +103
    ./lams/learningdesign/LearningDesignProcessor.java
    • -1
    • +384
    ./lams/learningdesign/service/LearningDesignValidator.java
    • -16
    • +5
    ./lams/tool/service/LamsCoreToolService.java
    • -59
    • +76
    ./lams/usermanagement/service/UserManagementService.java
    • -421
    • +465
    ./lams/web/session/SessionManager.java
    • -35
    • +33
    ./lams/web/session/SystemSessionFilter.java
  15. … 86 more files in changeset.
Monday 29 Jun 2009
11:17 am

Andrey Balan

LDEV-2372 Testing framework for LAMS

First draft of testing framework.

includes testcases for all phases(authoring, learning, monitor)

except for the one that creates new lessons (cloudWizzard.swf)

Options
    • -0
    • +462
    ./lams/localCommonContext.xml
11:17 am

Andrey Balan

file localCommonContext.xml was initially added on branch lams2_3.

Options
    • -0
    • +0
    ./lams/localCommonContext.xml
Thursday 25 Jun 2009
11:12 am

lfoxton

Undo-ing some changes to return to 2.3 branch

Options
    • -12
    • +14
    ./lams/dbupdates/patch0017_updateFrom23-231.sql
  2. … 8 more files in changeset.
Friday 19 Jun 2009
6:50 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
    • -1
    • +13
    ./lams/dbupdates/patch0017_updateFrom23-231.sql
  2. … 8 more files in changeset.
6:50 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
    • -5
    • +54
    ./lams/usermanagement/User.java
    • -23
    • +55
    ./lams/usermanagement/dto/UserDTO.java
    • -2
    • +7
    ./lams/web/util/AttributeNames.java
  4. … 16 more files in changeset.
12:32 pm

lfoxton

Undoing some changes not meant for 2.3.1 particularly for LDEV-2389

Options
    • -27
    • +0
    ./lams/dbupdates/Patch0017_updateFrom23-231.sql
    • -0
    • +15
    ./lams/dbupdates/patch0017_updateFrom23-231.sql
    • -52
    • +4
    ./lams/usermanagement/User.java
    • -54
    • +22
    ./lams/usermanagement/dto/UserDTO.java
    • -6
    • +1
    ./lams/web/util/AttributeNames.java
  6. … 12 more files in changeset.
12:32 pm

lfoxton

file patch0017_updateFrom23-231.sql was initially added on branch lams2_3.

Options
    • -0
    • +0
    ./lams/dbupdates/patch0017_updateFrom23-231.sql
3:43 am

Marcin Cieslak

LDEV-2369: Added further tutorial video functionality: user can disable single video, or all of them in his profile. Also, a dialog after first login is displayed.

Additionally, a small bug preventing Ped Planner to be properly deployed during whole LAMS build was fixed.

Options
    • -1
    • +13
    ./lams/dbupdates/Patch0017_updateFrom23-231.sql
    • -5
    • +53
    ./lams/usermanagement/User.java
    • -23
    • +55
    ./lams/usermanagement/dto/UserDTO.java
    • -2
    • +7
    ./lams/web/util/AttributeNames.java
  5. … 12 more files in changeset.
Tuesday 09 Jun 2009
1:40 pm

lfoxton

Removing unneccessary debug string

Options
    • -1
    • +0
    ./lams/dao/hibernate/BaseDAO.java
Wednesday 03 Jun 2009
2:36 pm

lfoxton

file ExtServerToolAdapterMap.java was initially added on branch lams2_3.

Options
    • -0
    • +0
    ./lams/integration/ExtServerToolAdapterMap.java
2:36 pm

lfoxton

file Patch0017_updateFrom23-231.sql was initially added on branch lams2_3.

Options
    • -0
    • +0
    ./lams/dbupdates/Patch0017_updateFrom23-231.sql
2:36 pm

lfoxton

LDEV-2366 Tool adapters to allow multiple integrated servers to user them

Committing core changes for this JIRA

Options
    • -0
    • +1
    ./lams/commonContext.xml
    • -0
    • +1
    ./lams/dao/hibernate/BaseDAO.java
    • -0
    • +15
    ./lams/dbupdates/Patch0017_updateFrom23-231.sql
    • -149
    • +126
    ./lams/integration/ExtServerOrgMap.java
    • -0
    • +84
    ./lams/integration/ExtServerToolAdapterMap.java
    • -0
    • +9
    ./lams/integration/service/IIntegrationService.java
    • -330
    • +337
    ./lams/integration/service/IntegrationService.java
    • -2
    • +25
    ./lams/learningdesign/dto/LibraryActivityDTO.java
    • -1
    • +15
    ./lams/tool/Tool.java
    • -0
    • +2
    ./lams/tool/ToolAdapterContentManager.java
  11. … 11 more files in changeset.
9:33 am

asukkar

LDEV-2364

Modified the createId method to return the jabberID instead of null when a 409 error code is returned from the xmpp server. A 409 error code indicates that the user has already been created with this ID

Options
    • -6
    • +7
    ./lams/util/XMPPUtil.java
Tuesday 26 May 2009
11:02 pm

Marcin Cieslak

LDEV-2071: Corrected several Application Context files. Did minor changes to prepare LAMS for JBoss 5.1.0.GA. Added retry mechanism in deadlock spot.

Options
    • -7
    • +5
    ./lams/applicationContext.xml
    • -3
    • +4
    ./lams/toolApplicationContext.xml
  3. … 9 more files in changeset.
2:16 am

Marcin Cieslak

LDEV-2071, LDEV-2201, LDEV-57: Changed the Transaction Manager to Hibernate instead of JTA. Synchronized code in 2 more spots as deadlock exceptions had been thrown.

Options
    • -1
    • +6
    ./lams/applicationContext.xml
  2. … 6 more files in changeset.
Friday 22 May 2009
8:56 pm

Marcin Cieslak

LDEV-1998: Additional clean up.

Options
    • -10
    • +1
    ./lams/learningdesign/TextSearchCondition.java
8:41 pm

Marcin Cieslak

LDEV-2074: Fixed a bug in Floating Activity validation preventing Learnind Designs to be imported correctly.

Options
    • -466
    • +476
    ./lams/learningdesign/service/LearningDesignValidator.java
7:57 pm

Marcin Cieslak

LDEV-2071: Removed Quartz distribution from deployment - version from JBoss is now in use. Fixed a bug in Floating Activities.

Options
    • -465
    • +473
    ./lams/learningdesign/service/LearningDesignValidator.java
  2. … 6 more files in changeset.
1:14 pm

mseaton

LDEV-2074 missing dbupdate insert

Options
    • -0
    • +1
    ./lams/dbupdates/patch0015_updateFrom22.sql