Activity lams-github/

12:35 pm

lfoxton

More
23d3a9e
changed 16 files
v4.7, v4.8

LDEV-1956 Do reflection for wiki

Reflection done in monitor and learner

- -2
- +6
/lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_wiki/.../ApplicationResources_en_AU.properties
- -1
- +13
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiSessionDTO.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../WikiSessionDTO.java
- -16
- +18
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiUserDTO.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../dto/WikiUserDTO.java
- -8
- +5
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../IWikiService.java
- -6
- +15
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../WikiService.java
- -0
- +1
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../WikiConstants.java
- -1
- +68
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../LearningAction.java
- -30
- +18
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../MonitoringAction.java
- -3
- +5
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../ExportServlet.java
- -0
- +4
/lams_tool_wiki/web/WEB-INF/struts/tiles-defs.xml
- History
- Source
- Diff
/lams_tool_wiki/web/.../struts/tiles-defs.xml
- -0
- +1
/lams_tool_wiki/web/common/taglibs.jsp
- History
- Source
- Diff
/lams_tool_wiki/web/common/taglibs.jsp
- -0
- +33
/lams_tool_wiki/web/pages/learning/notebook.jsp
- History
- Source
/lams_tool_wiki/web/.../learning/notebook.jsp
- -0
- +67
/lams_tool_wiki/web/pages/learning/parts/finishButton.jsp
- History
- Source
/lams_tool_wiki/web/.../parts/finishButton.jsp
- -0
- +13
/lams_tool_wiki/web/pages/learning/wiki.jsp
- History
- Source
- Diff
/lams_tool_wiki/web/.../learning/wiki.jsp
- -20
- +39
/lams_tool_wiki/web/pages/monitoring/summary.jsp
- History
- Source
- Diff
/lams_tool_wiki/web/.../summary.jsp
- -187
- +196
/lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
- History
- Source
- Diff
/lams_tool_wiki/web/.../wikiDisplay.jsp

9:18 am

lfoxton

More
16b6786
changed 24 files
v4.7, v4.8

LDEV-1611 and LDEV-1953 Monitor and learner modules completed for wiki tool, apart from reflection, see LDEV-1954

- -13
- +22
/lams_tool_wiki/conf/language/rams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_wiki/.../ApplicationResources_en_AU.properties
- -2
- +3
/lams_tool_wiki/db/sql/create_lams_tool_wiki.sql
- History
- Source
- Diff
/lams_tool_wiki/.../create_lams_tool_wiki.sql
- -15
- +1
/lams_tool_wiki/db/sql/table-schema.sql
- History
- Source
- Diff
/lams_tool_wiki/db/sql/table-schema.sql
- -0
- +15
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiSession.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../WikiSession.java
- -1
- +17
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiUser.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../model/WikiUser.java
- -1
- +3
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../IWikiService.java
- -5
- +24
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../WikiService.java
- -0
- +9
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/util/WikiConstants.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../WikiConstants.java
- -2
- +3
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../AuthoringAction.java
- -45
- +0
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/IWikiPageAction.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../IWikiPageAction.java
- -23
- +25
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../LearningAction.java
- -34
- +104
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../MonitoringAction.java
- -14
- +65
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../WikiPageAction.java
- -2
- +8
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/MonitoringForm.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../MonitoringForm.java
- -9
- +9
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPageForm.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../WikiPageForm.java
… 9 more files in changeset.

8:37 am

Marcin Cieslak

More
ef24176
changed 21 files
v4.7, v4.8

LDEV-1891: Added code that sends notifications to all monitoring teachers, not only those who started monitoring the chosen tool.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -0
- +20
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../lesson/Lesson.hbm.xml
- -42
- +75
/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
- History
- Source
- Diff
/lams_common/src/java/.../dao/ILessonDAO.java
- -244
- +223
/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
- History
- Source
- Diff
/lams_common/src/.../hibernate/LessonDAO.java
- -248
- +305
/lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
- History
- Source
- Diff
/lams_common/src/.../ILessonService.java
- -656
- +707
/lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
- History
- Source
- Diff
/lams_common/src/.../LessonService.java
- -0
- +3
/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
- History
- Source
- Diff
/lams_tool_larsrc/.../rsrcApplicationContext.xml
- -223
- +260
/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
- History
- Source
- Diff
/lams_tool_larsrc/.../IResourceService.java
- -1121
- +1132
/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
- History
- Source
- Diff
/lams_tool_larsrc/.../ResourceServiceImpl.java
- -572
- +590
/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
- History
- Source
- Diff
/lams_tool_larsrc/src/.../LearningAction.java
- -163
- +146
/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_larsrc/.../MonitoringAction.java
- -219
- +242
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
- History
- Source
- Diff
/lams_tool_sbmt/.../ISubmitFilesService.java
- -969
- +992
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesService.java
- -0
- +1
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml
- History
- Source
- Diff
/lams_tool_sbmt/.../submitFilesApplicationContext.xml
- -316
- +319
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
- History
- Source
- Diff
/lams_tool_sbmt/src/.../LearnerAction.java
… 6 more files in changeset.

2:17 pm

Marcin Cieslak

More
1f29a11
changed 1 file
v4.7, v4.8

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

- -0
- +3
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
/lams_learning/src/.../LearnerService.java

1:55 pm

lfoxton

More
f3a88ad
changed 1 file
v4.7, v4.8

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(',');

- -24
- +6
/lams_central/web/fckeditor/editor/plugins/wikilink/fck_wikilink.jsp
- History
- Source
- Diff
/lams_central/web/.../fck_wikilink.jsp

2:06 pm

dcarlier

More
502e886
changed 5 files
v4.7, v4.8

LDEV-1925 Added support for complex conditions

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- -4
- +4
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as
- History
- Source
- Diff
/lams_flash/src/.../ToolOutputCondition.as
- -0
- +6
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputDefinition.as
- History
- Source
- Diff
/lams_flash/src/.../ToolOutputDefinition.as
- -4
- +29
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
- History
- Source
- Diff
/lams_flash/.../ToolOutputConditionsDialog.as

2:02 pm

asukkar

More
848dda4
changed 4 files
v4.7, v4.8

LDEV-1941

Fixed maxAttendeeMikes

- -4
- +5
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
- History
- Source
- Diff
/lams_tool_dimdim/src/.../DimdimService.java
- -1
- +3
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
- History
- Source
- Diff
/lams_tool_dimdim/src/.../IDimdimService.java
- -1
- +2
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_dimdim/src/.../LearningAction.java
- -1
- +1
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_dimdim/.../MonitoringAction.java

1:33 pm

lfoxton

More
1082bdc
changed 164 files
v4.7, v4.8

First commit for new wiki tool

Progress: Author finished

Learner begun

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

11:36 am

erniegx <ernieg@gmail.com>

More
f9a79db
changed 1 file
v4.7, v4.8

Changing dimdim to be a collaborative activity

- -1
- +1
/lams_tool_dimdim/db/sql/activity_insert.sql
- History
- Source
- Diff
/lams_tool_dimdim/db/.../activity_insert.sql

11:07 am

Marcin Cieslak

More
86bb08d
changed 1 file
v4.7, v4.8

Fixed a small bug in Daco project description file.

- -8
- +1
/lams_tool_daco/.project
- History
- Source
- Diff
/lams_tool_daco/.project

10:26 am

asukkar

More
7e3ed7a
changed 2 files
v4.7, v4.8

LDEV-1857

Added label to text area

- -3
- +2
/lams_tool_survey/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_survey/.../ApplicationResources.properties
- -3
- +8
/lams_tool_survey/web/pages/learning/question.jsp
- History
- Source
- Diff
/lams_tool_survey/web/.../question.jsp

8:14 am

dcarlier

More
712d6bf
changed 7 files
v4.7, v4.8

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

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- -2
- +2
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceContainer.as
- History
- Source
- Diff
/lams_flash/src/.../CompetenceContainer.as
- -2
- +2
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceDefinitionDialog.as
- History
- Source
- Diff
/lams_flash/.../CompetenceDefinitionDialog.as
- -1
- +1
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cmpt/CompetenceEditorDialog.as
- History
- Source
- Diff
/lams_flash/src/.../CompetenceEditorDialog.as
- binary
/lams_monitoring/web/lams_monitoring.swf
- History
- Source
- Diff
/lams_monitoring/web/lams_monitoring.swf
- binary
/lams_monitoring/web/lams_monitoring_library.swf
- History
- Source
- Diff
/lams_monitoring/.../lams_monitoring_library.swf

2:29 pm

Marcin Cieslak

More
01cc950
changed 3 files
v4.7, v4.8

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.