lams

lams_common

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 27
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 98,785
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 20 Jul 2009
7:55 am

lfoxton

updating selenium some changes made by andrey in the notebook module - mergin with lams_common

Options
    • -25
    • +28
    ./test/java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java
    • -2
    • +2
    ./test/java/org/lamsfoundation/lams/selenium/TestFrameworkConstants.java
Thursday 16 Jul 2009
1:59 pm

lfoxton

LDEV-2372 Small changes to the comon abstact selenium test to allow for seperated tests

Options
    • -4
    • +4
    ./test/java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java
Tuesday 14 Jul 2009
8:09 pm

Ernie Ghiglione

Updating Japanese

Options
    • -10
    • +10
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 12 more files in changeset.
Monday 13 Jul 2009
12:38 pm

lfoxton

LDEV-2372 Adding the core selenium testing clasess to lams_common instead of notebook tool

Options
    • -0
    • +597
    ./test/java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java
    • -0
    • +182
    ./test/java/org/lamsfoundation/lams/selenium/DefaultSeleniumFlex.java
    • -0
    • +46
    ./test/java/org/lamsfoundation/lams/selenium/TestFrameworkConstants.java
    • -0
    • +68
    ./test/java/org/lamsfoundation/lams/selenium/TestFrameworkException.java
Friday 10 Jul 2009
11:41 am

jliew

file shouldn't have been merged (was deleted on branch)

Options
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql
6:15 am

Andrey Balan

LDEV-2372 testing framework

*there is no more need in removing .hbm.xml files

Options
    • -177
    • +1
    ./src/java/org/lamsfoundation/lams/localCommonContext.xml
Wednesday 08 Jul 2009
2:55 pm

Marcin Cieslak

LDEV-2380: Added some code comments.

Options
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/usermanagement/User.java
  3. … 1 more file in changeset.
2:24 pm

Marcin Cieslak

LDEV-2380: Added recently edited LDs list on the first Ped Planner page.

Options
    • -0
    • +16
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
    • -0
    • +11
    ./db/sql/create_lams_11_tables.sql
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
    • -2
    • +8
    ./src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java
    • -1
    • +19
    ./src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
    • -1
    • +19
    ./src/java/org/lamsfoundation/lams/usermanagement/User.java
  7. … 4 more files in changeset.
Tuesday 07 Jul 2009
8:42 am

jliew

change to ascii

Options
    • -156
    • +156
    ./src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -39
    • +39
    ./src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
    • -14
    • +14
    ./src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql
  4. … 22 more files in changeset.
Monday 06 Jul 2009
10:19 pm

Marcin Cieslak

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

Options
    • -1
    • +10
    ./src/java/org/lamsfoundation/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
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
10:14 pm

Marcin Cieslak

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

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

Marcin Cieslak

Recreated/updated several resources removed by previous merge.

Options
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql
  2. … 5 more files in changeset.
7:07 am

Marcin Cieslak

Fixed some merging bugs preventing preview to start correctly.

Options
    • -0
    • +1
    ./db/sql/create_lams_11_tables.sql
  2. … 1 more file in changeset.
Sunday 05 Jul 2009
9:18 pm

Ernie Ghiglione

Updating Greek, English, Spanish, Japanese, Norwegian

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -13
    • +13
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_no_NO.properties
  8. … 18 more files in changeset.
Friday 03 Jul 2009
12:57 pm

jliew

Merge lams2_3 to head (continuing...)

Options
    • -0
    • +9
    ./conf/hibernate/mappings/org/lamsfoundation/lams/gradebook/GradebookUserActivity.hbm.xml
  2. … 50 more files in changeset.
9:17 am

Andrey Balan

LDEV-2372 Lams Testing framework works with JBoss 5 now

Options
    • -44
    • +229
    ./src/java/org/lamsfoundation/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
    • -0
    • +2
    ./build.xml
    • -4
    • +11
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +85
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/DataFlowObject.hbm.xml
    • -9
    • +23
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml
    • -2
    • +21
    ./db/sql/create_lams_11_tables.sql
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +143
    ./src/java/org/lamsfoundation/lams/learningdesign/DataFlowObject.java
    • -0
    • +42
    ./src/java/org/lamsfoundation/lams/learningdesign/DataFlowObjectComparator.java
    • -0
    • +74
    ./src/java/org/lamsfoundation/lams/learningdesign/DataTransition.java
    • -235
    • +259
    ./src/java/org/lamsfoundation/lams/learningdesign/Transition.java
    • -0
    • +55
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/IDataFlowDAO.java
    • -0
    • +73
    ./src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/DataFlowDAO.java
    • -0
    • +101
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/DataFlowObjectDTO.java
    • -175
    • +246
    ./src/java/org/lamsfoundation/lams/learningdesign/dto/TransitionDTO.java
    • -56
    • +89
    ./src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
  16. … 71 more files in changeset.
5:54 pm

jliew

more merging lams2_3 into head

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

jliew

Merge lams2_3 into head

Options
    • -4
    • +11
    ./.classpath
    • -0
    • +14
    ./conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
    • -0
    • +65
    ./conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml
    • -0
    • +11
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
    • -6
    • +15
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -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
    • -2
    • +2
    ./db/sql/insert_types_data.sql
    • -10
    • +24
    ./src/java/org/lamsfoundation/lams/applicationContext.xml
    • -2
    • +34
    ./src/java/org/lamsfoundation/lams/beanRefContext.xml
    • -7
    • +184
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +462
    ./src/java/org/lamsfoundation/lams/localCommonContext.xml
  16. … 148 more files in changeset.
Tuesday 30 Jun 2009
10:53 am

jliew

Resolve conflicts from previous merge

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

jliew

Merge lams2_3_jboss5 changes into lams2_3

Options
    • -4
    • +11
    ./.classpath
    • -1
    • +1
    ./db/sql/insert_lams_unix_config_data.sql
    • -1
    • +1
    ./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
    • -10
    • +24
    ./src/java/org/lamsfoundation/lams/applicationContext.xml
    • -2
    • +34
    ./src/java/org/lamsfoundation/lams/beanRefContext.xml
    • -37
    • +212
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/toolApplicationContext.xml
    • -43
    • +70
    ./src/java/org/lamsfoundation/lams/cache/CacheDebugListener.java
    • -197
    • +237
    ./src/java/org/lamsfoundation/lams/cache/CacheManager.java
    • -24
    • +24
    ./src/java/org/lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java
    • -15
    • +17
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupUser.java
    • -100
    • +103
    ./src/java/org/lamsfoundation/lams/learningdesign/LearningDesignProcessor.java
    • -1
    • +384
    ./src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignValidator.java
  16. … 85 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
    ./src/java/org/lamsfoundation/lams/localCommonContext.xml
11:17 am

Andrey Balan

file localCommonContext.xml was initially added on branch lams2_3.

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

lfoxton

Undo-ing some changes to return to 2.3 branch

Options
    • -12
    • +14
    ./src/java/org/lamsfoundation/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
    ./src/java/org/lamsfoundation/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
    • -0
    • +30
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
    • -0
    • +9
    ./db/sql/create_lams_11_tables.sql
    • -5
    • +54
    ./src/java/org/lamsfoundation/lams/usermanagement/User.java
    • -23
    • +55
    ./src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
    • -2
    • +7
    ./src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
  6. … 14 more files in changeset.
2:41 pm

mseaton

fixed patch level for core and assessment tool

Options
    • -2
    • +2
    ./db/sql/insert_types_data.sql
  2. … 1 more file in changeset.
12:32 pm

lfoxton

fixing some sql and update scripts for 2.3.1

Options
    • -1
    • +1
    ./db/sql/create_integration_tables.sql
  2. … 3 more files in changeset.