lams-github

lams_common

Clone Tools

Stats

Commits this week: 1
Total Committers: 37
Last Commit:
Commits this week: 1

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
Tuesday 14 Jul 2009
8:23 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -10
    • +10
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 14 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
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
    • -0
    • +1
    ./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
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/planner/dao/hibernate/PedagogicalPlannerDAOHibernate.java
    • -0
    • +18
    ./src/java/org/lamsfoundation/lams/planner/dto/PedagogicalPlannerSequenceNodeDTO.java
    • -0
    • +18
    ./src/java/org/lamsfoundation/lams/usermanagement/User.java
  7. … 4 more files in changeset.
Tuesday 07 Jul 2009
8:52 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. … 47 more files in changeset.
Monday 06 Jul 2009
10:20 pm

Marcin Cieslak

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

Options
    • -0
    • +9
    ./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
    • -118
    • +131
    ./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:21 pm

erniegx <ernieg@gmail.com>

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
1:02 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
9:06 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
    • -233
    • +257
    ./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
    • -164
    • +235
    ./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:59 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
    • -0
    • +16
    ./src/java/org/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
    • -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
    • -9
    • +0
    ./src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/lesson/Lesson.java
    • -4
    • +6
    ./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
    • -236
    • +335
    ./src/java/org/lamsfoundation/lams/tool/OutputFactory.java
    • -128
    • +154
    ./src/java/org/lamsfoundation/lams/tool/ToolOutputDefinition.java
    • -29
    • +52
    ./src/java/org/lamsfoundation/lams/tool/dto/ToolOutputDefinitionDTO.java
    • -0
    • +28
    ./src/java/org/lamsfoundation/lams/util/DateUtil.java
    • -99
    • +104
    ./src/java/org/lamsfoundation/lams/util/WebUtil.java
  16. … 153 more files in changeset.
Wednesday 01 Jul 2009
10:48 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
    • -1
    • +1
    ./db/sql/insert_types_data.sql
    • -10
    • +24
    ./src/java/org/lamsfoundation/lams/applicationContext.xml
    • -2
    • +34
    ./src/java/org/lamsfoundation/lams/beanRefContext.xml
    • -42
    • +69
    ./src/java/org/lamsfoundation/lams/cache/CacheDebugListener.java
    • -176
    • +216
    ./src/java/org/lamsfoundation/lams/cache/CacheManager.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
    • -0
    • +30
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
    • -0
    • +9
    ./db/sql/create_lams_11_tables.sql
    • -4
    • +53
    ./src/java/org/lamsfoundation/lams/usermanagement/User.java
    • -22
    • +54
    ./src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
  6. … 14 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
    • -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
    • -0
    • +18
    ./src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/util/Base64StringToImageUtil.java
  6. … 158 more files in changeset.
Wednesday 29 Apr 2009
8:50 pm

jliew

update patch level

Options
    • -1
    • +1
    ./db/sql/insert_types_data.sql
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
    ./src/java/org/lamsfoundation/lams/usermanagement/User.java
1:19 pm

dcarlier

LDEV-2149 Competence mappings now imported properly

Options
    • -44
    • +26
    ./src/java/org/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
    • +12
    ./conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
    • -0
    • +1
    ./db/sql/create_lams_11_tables.sql
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/dbupdates/patch0017_updateFrom23.sql
    • -68
    • +90
    ./src/java/org/lamsfoundation/lams/usermanagement/User.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
    • -89
    • +91
    ./src/java/org/lamsfoundation/lams/web/filter/LocaleFilter.java
  7. … 4 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
    ./src/java/org/lamsfoundation/lams/learningdesign/GroupUser.java
Monday 20 Apr 2009
8:32 am

erniegx <ernieg@gmail.com>

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

Options
    • -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
8:10 am

lfoxton

Merging gradebook lams-common changes with head

LDEV-2213

LDEV-2214

LDEV-2212

LDEV-2207

Options
    • -0
    • +17
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/GroupUser.hbm.xml
    • -0
    • +3
    ./conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
    • -0
    • +1
    ./db/sql/create_lams_11_tables.sql
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/commonContext.xml
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java
    • -2
    • +53
    ./src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/lesson/Lesson.java
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
    ./src/java/org/lamsfoundation/lams/presence/dao/IPresenceChatMessageDAO.java
    • -9
    • +8
    ./src/java/org/lamsfoundation/lams/presence/dao/hibernate/PresenceChatMessageDAO.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/presence/model/PresenceChatMessage.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/presence/service/IPresenceChatLoggerService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/presence/service/PresenceChatLoggerService.java
    • -0
    • +50
    ./src/java/org/lamsfoundation/lams/util/Base64StringToImageUtil.java
  7. … 50 more files in changeset.
Thursday 16 Apr 2009
4:02 pm

erniegx <ernieg@gmail.com>

LDEV-2239: Upgrading mysql connector

Options
    • -1
    • +1
    ./db/sql/updatescripts/Alter21Integration.java
  2. … 19 more files in changeset.