lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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
Thursday 09 Oct 2008
2:17 pm

Marcin Cieslak

LDEV-1950: Learner can no longer choose two groups using browser navigation.

Options
    • -0
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
1:55 pm

lfoxton

LDEV-1657 - Updating the wiki link plugin for the fckeditor.

To attempt to resolve issues with certain browsers, I removed any ajax calls to get the list of wiki links. Instead, they are retrieved from the opening page. ie a javascript array of wikilinks is created on the page where the fckeditor is, then it is retrieved by the plugin with the following command:

wikiArray = window.top.opener.top.document.getElementById("wikiLinks").value.split(',');

Options
    • -24
    • +6
    /lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp
Wednesday 08 Oct 2008
2:06 pm

dcarlier

LDEV-1925 Added support for complex conditions

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -4
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as
    • -0
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as
    • -4
    • +29
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
2:02 pm

asukkar

LDEV-1941

Fixed maxAttendeeMikes

Options
    • -4
    • +5
    /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
    • -1
    • +3
    /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
    • -1
    • +2
    /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
    • -1
    • +1
    /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
1:33 pm

lfoxton

First commit for new wiki tool

Progress: Author finished

Learner begun

Options
    • -0
    • +15
    /lams_tool_wiki/.classpath
    • -0
    • +4
    /lams_tool_wiki/.cvsignore
    • -0
    • +12
    /lams_tool_wiki/.project
    • -0
    • +3
    /lams_tool_wiki/.settings/com.genuitec.eclipse.j2eedt.core.prefs
    • -0
    • +4
    /lams_tool_wiki/.settings/org.eclipse.core.resources.prefs
    • -0
    • +12
    /lams_tool_wiki/.settings/org.eclipse.jdt.core.prefs
    • -0
    • +3
    /lams_tool_wiki/.settings/org.eclipse.jdt.ui.prefs
    • -0
    • +20
    /lams_tool_wiki/build.properties
    • -0
    • +532
    /lams_tool_wiki/build.xml
    • -0
    • +7
    /lams_tool_wiki/conf/hibernate/mappings/hibernate.properties
    • -0
    • +274
    /lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/Wiki.hbm.xml
    • -0
    • +93
    /lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiAttachment.hbm.xml
    • -0
    • +110
    /lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPage.hbm.xml
    • -0
    • +87
    /lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiPageContent.hbm.xml
    • -0
    • +131
    /lams_tool_wiki/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wiki/model/WikiSession.hbm.xml
  16. … 149 more files in changeset.
11:36 am

erniegx <ernieg@gmail.com>

Changing dimdim to be a collaborative activity

Options
    • -1
    • +1
    /lams_tool_dimdim/db/sql/activity_insert.sql
11:07 am

Marcin Cieslak

Fixed a small bug in Daco project description file.

Options
    • -8
    • +1
    /lams_tool_daco/.project
10:26 am

asukkar

LDEV-1857

Added label to text area

Options
    • -3
    • +2
    /lams_tool_survey/conf/language/lams/ApplicationResources.properties
    • -3
    • +8
    /lams_tool_survey/web/pages/learning/question.jsp
8:14 am

dcarlier

LDEV-1930 Minor fixes for some labels not appearing properly in competence editor

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -2
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as
    • -2
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceDefinitionDialog.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as
    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf
Tuesday 07 Oct 2008
2:29 pm

Marcin Cieslak

LDEV-1825: Change in order: activities from DTO are parsed first. This way we can check for the activities with unwanted elements (groupings, branching mappings). These elements are then removed from DTO so they don't get into XML.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -3
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -7
    • +48
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
2:18 pm

dcarlier

LDEV-1934 Made "View Competences Dialog" 100px wider by default

Options
    • binary
    /lams_flash/src/central/flash/lams_monitoring_v1.fla
    • -6
    • +7
    /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewCompetencesDialog.as
    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf
2:14 pm

dcarlier

LDEV-1934 Made "View Competences Dialog" 100px wider by default

Options
    • binary
    /lams_flash/src/central/flash/lams_monitoring_v1.fla
2:01 pm

dcarlier

LDEV-1933 Fixed resizing not maintaining layout for all competence editor dialogs

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -7
    • +35
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as
    • -4
    • +20
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as
    • -0
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingDialog.as
    • -4
    • +8
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceMappingItem.as
    • -2
    • +9
    /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewCompetencesDialog.as
    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf
1:33 pm

asukkar

LDEV-1928

Fixed return url

Options
    • -0
    • +2
    /lams_tool_dimdim/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_dimdim/conf/xdoclet/struts-actions.xml
    • -3
    • +4
    /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
    • -1
    • +1
    /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
    • -0
    • +20
    /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java
    • -1
    • +0
    /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java
    • -1
    • +2
    /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
    • -1
    • +4
    /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
    • -8
    • +6
    /lams_tool_dimdim/web/WEB-INF/struts/tiles-defs.xml
    • -0
    • +15
    /lams_tool_dimdim/web/pages/dimdim/end_meeting.jsp
1:27 pm

Marcin Cieslak

LDEV-1825: Committing Java file formatted with the new convention.

Options
    • -1039
    • +1222
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
1:16 pm

Marcin Cieslak

LDEV-1825: Committing Java file formatted with the new convention.

Options
    • -2202
    • +2201
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
1:01 pm

erniegx <ernieg@gmail.com>

LDEV-1943: Gmap to be a collaborative activity

Options
    • -1
    • +1
    /lams_tool_gmap/db/sql/activity_insert.sql
Saturday 04 Oct 2008
11:37 am

Marcin Cieslak

LDEV-1416: Sysadmin can now change user's authentication method in admin control panel.

Options
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_admin/conf/xdoclet/struts-forms.xml
    • -252
    • +248
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserAction.java
    • -126
    • +127
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/UserSaveAction.java
    • -0
    • +12
    /lams_admin/web/user.jsp
    • binary
    /lams_build/lib/lams/lams-admin.jar
10:47 am

Marcin Cieslak

LDEV-1926: Added most of the logic for text based conditions.

Options
    • -1
    • +1
    /lams_tool_notebook/build.properties
    • -0
    • +18
    /lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/Notebook.hbm.xml
    • -0
    • +14
    /lams_tool_notebook/conf/hibernate/mappings/org/lamsfoundation/lams/tool/notebook/model/NotebookCondition.hbm.xml
    • -0
    • +25
    /lams_tool_notebook/conf/language/lams/ApplicationResources.properties
    • -0
    • +26
    /lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +40
    /lams_tool_notebook/conf/xdoclet/struts-actions.xml
    • -170
    • +218
    /lams_tool_notebook/db/model/notebook_tool.clay
    • -0
    • +11
    /lams_tool_notebook/db/sql/create_lams_tool_notebook.sql
    • -0
    • +1
    /lams_tool_notebook/db/sql/drop_lams_tool_notebook.sql
    • -2
    • +4
    /lams_tool_notebook/db/sql/tool_insert.sql
    • -7
    • +9
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookDAO.java
    • -30
    • +32
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookDAO.java
    • -0
    • +10
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20080929_updateFrom21.sql
    • -336
    • +362
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/Notebook.java
    • -0
    • +22
    /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/model/NotebookCondition.java
  16. … 23 more files in changeset.
10:45 am

Marcin Cieslak

LDEV-1918: Changes after testing with Flash.

Options
    • -0
    • +1
    /lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaCondition.hbm.xml
    • -0
    • +19
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java
    • -67
    • +56
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java
    • -292
    • +259
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java
    • -3
    • +7
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaOutputFactory.java
    • -3
    • +5
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAuthoringConditionAction.java
    • -0
    • +9
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaConditionForm.java
    • -271
    • +146
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaStarterAction.java
10:44 am

Marcin Cieslak

LDEV-1606: Several minor changes in the base files.

Options
    • -0
    • +2
    /lams_central/.classpath
    • -160
    • +164
    /lams_central/web/WEB-INF/struts/struts-config.xml
    • -9
    • +31
    /lams_central/web/WEB-INF/web.xml
    • -0
    • +5
    /lams_common/.classpath
    • -1
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml
    • -2
    • +2
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchCondition.hbm.xml
    • -6
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java
    • -49
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/BranchConditionDTO.java
10:33 am

Marcin Cieslak

LDEV-1940: Fixed incorrect entries for existing tools.

Options
    • -21
    • +21
    /lams_tool_daco/web/WEB-INF/web.xml
    • -21
    • +21
    /lams_tool_spreadsheet/web/WEB-INF/web.xml
    • -21
    • +21
    /lams_tool_task/web/WEB-INF/web.xml
Friday 03 Oct 2008
3:02 pm

asukkar

LDEV-1941

Set maximum number of mics to 3

Options
    • -2
    • +0
    /lams_tool_dimdim/web/pages/authoring/basic.jsp
8:18 am

dcarlier

LDEV-1933 Fixed component resizing problem in competence definition dialog. Window now resizes properly

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -7
    • +20
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceDefinitionDialog.as
7:44 am

erniegx <ernieg@gmail.com>

Updating Korean and French

Options
    • -44
    • +50
    /lams_tool_chat/conf/language/lams/ApplicationResources_fr_FR.properties
    • -3
    • +11
    /lams_tool_chat/conf/language/lams/ApplicationResources_ko_KR.properties
    • -28
    • +31
    /lams_tool_notebook/conf/language/lams/ApplicationResources_fr_FR.properties
    • -2
    • +7
    /lams_tool_notebook/conf/language/lams/ApplicationResources_ko_KR.properties
    • -93
    • +98
    /lams_tool_vote/conf/language/lams/ApplicationResources_fr_FR.properties
    • -24
    • +37
    /lams_tool_vote/conf/language/lams/ApplicationResources_ko_KR.properties
7:41 am

erniegx <ernieg@gmail.com>

Updating English, Spanish, Norwegian

Options
    • -2
    • +4
    /lams_common/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_common/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +7
    /lams_common/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +4
    /lams_common/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +4
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +7
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +4
    /lams_learning/conf/language/lams/ApplicationResources_no_NO.properties
    • -11
    • +5
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -11
    • +5
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +3
    /lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
7:39 am

erniegx <ernieg@gmail.com>

Updating Greek, Korean, Norwegian

Options
    • -2
    • +2
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +27
    /lams_central/conf/language/lams/ApplicationResources_ko_KR.properties
    • -2
    • +2
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
7:36 am

erniegx <ernieg@gmail.com>

Updating Greek, English, Spanish, French, Norwegian

Options
    • -5
    • +5
    /lams_tool_larsrc/conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    /lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties
    • -5
    • +5
    /lams_tool_larsrc/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +5
    /lams_tool_larsrc/conf/language/lams/ApplicationResources_es_ES.properties
    • -102
    • +110
    /lams_tool_larsrc/conf/language/lams/ApplicationResources_fr_FR.properties
    • -2
    • +5
    /lams_tool_larsrc/conf/language/lams/ApplicationResources_no_NO.properties
7:34 am

erniegx <ernieg@gmail.com>

Updating Greek, English, Spanish, french, Norwegian

Options
    • -10
    • +9
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties
    • -10
    • +9
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +9
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties
    • -72
    • +85
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_fr_FR.properties
    • -2
    • +9
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_no_NO.properties
7:33 am

erniegx <ernieg@gmail.com>

Updating French and Korean

Options
    • -100
    • +105
    /lams_tool_laqa/conf/language/lams/ApplicationResources_fr_FR.properties
    • -2
    • +7
    /lams_tool_laqa/conf/language/lams/ApplicationResources_ko_KR.properties
    • -21
    • +26
    /lams_tool_nb/conf/language/lams/ApplicationResources_fr_FR.properties
    • -2
    • +7
    /lams_tool_nb/conf/language/lams/ApplicationResources_ko_KR.properties