Activity lams-github/lams_tool

8:23 pm

Ernie Ghiglione

More
662ae6c
changed 23 files
v4.7, v4.8

LDEV-4769 Updating Spanish

Also removing a deprecated label

- -1
- +1
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
… 22 more files in changeset.

1:30 pm

Ernie Ghiglione

More
4409f4b
changed 172 files
v4.7, v4.8

LDEV-4769 Updating English, Spanish, French, Greek and Norwegian for all active projects

From this commit onwards, we no longer will use the LAMS Community i18n to manage and handle translations.

Instead, we have now migrated to Lokalise (https://lokalise.com/) for managing all i18n projects and translations.

Many thanks Lokalise for your support!!

- -71
- +59
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -70
- +59
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
- -70
- +59
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -70
- +59
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
- -0
- +51
./language/lams/ApplicationResources_fr_FR.properties
- History
- Source
./language/.../ApplicationResources_fr_FR.properties
- -70
- +59
./language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
./language/.../ApplicationResources_no_NO.properties
… 166 more files in changeset.

8:44 pm

Andrey Balan

More
47f01da
changed 36 files
v4.7, v4.8

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

# lams_monitoring/conf/language/lams/ApplicationResources.properties

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_chat/conf/language/lams/ApplicationResources.properties

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_daco/conf/language/lams/ApplicationResources.properties

# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_forum/conf/language/lams/ApplicationResources.properties

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_images/conf/language/lams/ApplicationResources.properties

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_leader/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_preview/conf/language/lams/ApplicationResources.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

- -2
- +2
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 35 more files in changeset.

2:06 pm

Ernie Ghiglione

More
b784c09
changed 123 files
v4.7, v4.8

LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

- -2
- +3
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -2
- +3
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
- -2
- +3
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -2
- +3
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
- -2
- +8
./language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
./language/.../ApplicationResources_no_NO.properties
… 118 more files in changeset.

12:18 pm

Marcin Cieslak

More
298ac30
changed 88 files
v4.7, v4.8

LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

- -0
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -0
- +1
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
… 86 more files in changeset.

3:41 pm

Marcin Cieslak

More
d2c76e5
changed 64 files
v4.7, v4.8

LDEV-4786 Allow creating learning outcomes on the fly

- -0
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 63 more files in changeset.

4:30 pm

Ernie Ghiglione <ernieg@gmail.com>

More
7cd1ef5
changed 4 files
v4.7, v4.8

LDEV-4730 Updating labels for Leader selection

Updating Greek, English and Spanish

- -1
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -2
- +7
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
- -1
- +1
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -2
- +2
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties

7:50 am

Marcin Cieslak

More
e7ba02f
changed 15 files
v4.7, v4.8

Merge remote-tracking branch 'origin/master' into lams31

- -6
- +8
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -2
- +7
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -2
- +7
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
… 12 more files in changeset.

6:40 am

Ernie Ghiglione <ernieg@gmail.com>

More
acc0bf9
changed 3 files
v4.7, v4.8

LDEV-4644: Adding labels for learning outcomes.

- -6
- +8
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -2
- +7
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -2
- +7
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties

12:15 pm

Marcin Cieslak

More
7768a54
deleted 9 files
v4.7, v4.8

LDEV-4696 Delete obsolete Hibernate .hbm.xml files

- -126
- +0
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.hbm.xml
- History
- Source
- Diff
./hibernate/.../Leaderselection.hbm.xml
- -125
- +0
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.hbm.xml
- History
- Source
- Diff
./hibernate/.../LeaderselectionSession.hbm.xml
- -94
- +0
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionUser.hbm.xml
- History
- Source
- Diff
./hibernate/.../LeaderselectionUser.hbm.xml
… 6 more files in changeset.

7:22 am

Marcin Cieslak

More
62aaf16
changed 649 files
v4.7, v4.8

Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration

Conflicts:

lams_admin/.classpath

lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java

lams_admin/web/WEB-INF/struts-config.xml

lams_admin/web/WEB-INF/tiles-defs.xml

lams_admin/web/config/items.jsp

lams_admin/web/css/admin.scss

lams_admin/web/organisation/courseAdminEdit.jsp

lams_admin/web/organisation/createOrEdit.jsp

lams_admin/web/organisation/list.jsp

lams_admin/web/servermaintain.jsp

lams_admin/web/signupmanagement/add.jsp

lams_admin/web/signupmanagement/list.jsp

lams_admin/web/timezoneServerManagement.jsp

lams_admin/web/user.jsp

lams_admin/web/usersearchlist.jsp

lams_build/lib/lams/lams-admin.jar

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_build/lib/lams/lams-monitoring.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java

lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/TextSearchActionForm.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java

lams_central/web/WEB-INF/struts-config.xml

lams_central/web/editprofile.jsp

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_central/web/lessons.jsp

lams_central/web/main.jsp

lams_central/web/portrait.jsp

lams_central/web/profile.jsp

lams_central/web/signup/singupTab.jsp

lams_central/web/tutorialVideo.jsp

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql

lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java

lams_monitoring/web/gate/scheduleGateContent.jsp

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.java

lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java

lams_tool_daco/.classpath

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_dimdim/.classpath

lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java

lams_tool_forum/web/jsps/learning/viewtopic.jsp

lams_tool_forum/web/jsps/monitoring/summary.jsp

lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java

lams_tool_lamc/web/authoring/AdvancedContent.jsp

lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningStarterAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/ClearSessionAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java

lams_tool_mindmap/web/pages/authoring/authoring.jsp

lams_tool_mindmap/web/pages/learning/mindmap.jsp

lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/ClearSessionAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java

lams_tool_pixlr/.classpath

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java

lams_tool_preview/.classpath

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java

lams_tool_sbmt/web/authoring/advance.jsp

lams_tool_sbmt/web/monitoring/mark/mark.jsp

lams_tool_sbmt/web/monitoring/parts/summary.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/ClearSessionAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java

lams_tool_scribe/.classpath

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/ClearSessionAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ClearSessionAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ClearSessionAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java

lams_tool_videorecorder/.classpath

lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java

lams_tool_vote/.classpath

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java

lams_tool_wookie/.classpath

lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java

- -1
- +4
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 648 more files in changeset.

4:49 pm

Marcin Cieslak

More
b67bc25
changed 119 files
v4.7, v4.8

LDEV-4644 Add outcomes in authoring in all tools

- -1
- +4
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 118 more files in changeset.

1:03 pm

Ernie Ghiglione <ernieg@gmail.com>

More
70c36dd
changed 39 files
v4.7, v4.8

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

- -2
- +2
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
… 38 more files in changeset.

3:41 pm

Marcin Cieslak

More
b278d62
changed 98 files

LDEV-4411 Add collections 2nd level cache

- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.hbm.xml
- History
- Source
- Diff
./hibernate/.../Leaderselection.hbm.xml
- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.hbm.xml
- History
- Source
- Diff
./hibernate/.../LeaderselectionSession.hbm.xml
… 96 more files in changeset.

7:19 pm

Marcin Cieslak

More
64b01b1
changed 238 files

LDEV-4411 Mark entities as cacheable

usage="read-only" seems to do nothing at the moment, but it may be a

guidance for future optimisations.

- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.hbm.xml
- History
- Source
- Diff
./hibernate/.../Leaderselection.hbm.xml
- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.hbm.xml
- History
- Source
- Diff
./hibernate/.../LeaderselectionSession.hbm.xml
- -0
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionUser.hbm.xml
- History
- Source
- Diff
./hibernate/.../LeaderselectionUser.hbm.xml
… 235 more files in changeset.

6:45 am

Ernie Ghiglione <ernieg@gmail.com>

More
0f99980
changed 5 files
v4.7, v4.8

LDEV-4054: Updating translations

Updating English, Greek and Norwegian

- -1
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -3
- +4
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
- -1
- +1
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -3
- +3
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
- -3
- +4
./language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
./language/.../ApplicationResources_no_NO.properties

7:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
839af8b
changed 89 files
v4.7, v4.8

LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

- -1
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -1
- +1
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
- -1
- +1
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -1
- +1
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
- -1
- +1
./language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
./language/.../ApplicationResources_no_NO.properties
- -1
- +1
./language/lams/ApplicationResources_pt_BR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_pt_BR.properties
… 83 more files in changeset.

8:50 am

Ernie Ghiglione <ernieg@gmail.com>

More
e8e64d9
changed 3 files
v4.7, v4.8

LDEV-4384: Updating labels

Add 2 remove 1

- -3
- +4
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -4
- +4
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -3
- +4
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties

7:28 am

Ernie Ghiglione <ernieg@gmail.com>

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

LDEV-4384: emphasise leader selection message to learners

If leader has not yet been selected, display the message in bold letters so action by the leader can be taken.

- -1
- +2
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
… 1 more file in changeset.

5:36 am

Ernie Ghiglione <ernieg@gmail.com>

More
271d374
changed 53 files
v4.7, v4.8

LDEV-4054: Updating labels i18n

Mainly Norwegian, Greek and English

- -0
- +63
./language/lams/ApplicationResources_no_NO.properties
- History
- Source
./language/.../ApplicationResources_no_NO.properties
… 52 more files in changeset.

7:03 am

erniegx <ernieg@gmail.com>

More
c232638
added 1 file
v4.7, v4.8

LDEV-4054: Adding Greek

- -0
- +63
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
./language/.../ApplicationResources_el_GR.properties

2:57 am

erniegx <ernieg@gmail.com>

More
0cddf54
changed 4 files
v4.7, v4.8

LDEV-4282 slight display changes

- -3
- +3
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -3
- +3
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -3
- +3
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
… 1 more file in changeset.

7:07 am

Marcin Cieslak

More
8620cb3
changed 142 files
v4.7, v4.8

LDEV-4184: "outer-join" attribute in hbm.xml files is deprecated and produces warnings on server start up. Remove entries with "auto" value. Entries with value "true" become fetch=join.

- -2
- +2
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.hbm.xml
- History
- Source
- Diff
./hibernate/.../LeaderselectionSession.hbm.xml
- -1
- +1
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionUser.hbm.xml
- History
- Source
- Diff
./hibernate/.../LeaderselectionUser.hbm.xml
… 140 more files in changeset.

11:08 am

erniegx <ernieg@gmail.com>

More
b75faef
changed 4 files
v4.7, v4.8

LDEV-4054 updating English, Greek, Spanish, French, Norwegian, Portuguese

- -5
- +4
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -6
- +4
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -4
- +2
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
- -4
- +2
./language/lams/ApplicationResources_pt_BR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_pt_BR.properties

9:54 am

Marcin Cieslak

More
26ea61e
changed 1030 files

LDEV-3776: Remove $Id CVS keyword.

- -1
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -1
- +1
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_el_GR.properties
- -1
- +1
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -1
- +1
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
- -1
- +1
./language/lams/ApplicationResources_fr_FR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_fr_FR.properties
- -1
- +1
./language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
./language/.../ApplicationResources_no_NO.properties
- -1
- +1
./language/lams/ApplicationResources_pt_BR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_pt_BR.properties
- -1
- +1
./xdoclet/web-settings.xml
- History
- Source
- Diff
./xdoclet/web-settings.xml
… 1022 more files in changeset.

9:38 am

Marcin Cieslak

More
2f725f8
changed 1280 files
v4.7, v4.8

LDEV-3776: Remove $Id CVS keyword.

- -1
- +1
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
- -1
- +1
./language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./language/.../ApplicationResources_en_AU.properties
- -1
- +1
./language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./language/.../ApplicationResources_es_ES.properties
- -1
- +1
./language/lams/ApplicationResources_pt_BR.properties
- History
- Source
- Diff
./language/.../ApplicationResources_pt_BR.properties
… 1276 more files in changeset.

3:23 pm

Marcin Cieslak

More
65efb0a
changed 404 files
v4.7, v4.8

LDEV-3768: Remove XDoclet library and corresponding Ant tasks. Generate and use static configuration files instead.

- -0
- +126
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/Leaderselection.hbm.xml
- History
- Source
./hibernate/mappings/.../Leaderselection.hbm.xml
- -0
- +125
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionSession.hbm.xml
- History
- Source
./hibernate/.../LeaderselectionSession.hbm.xml
- -0
- +94
./hibernate/mappings/org/lamsfoundation/lams/tool/leaderselection/model/LeaderselectionUser.hbm.xml
- History
- Source
./hibernate/.../LeaderselectionUser.hbm.xml
- -3
- +0
./xdoclet/global-forwards.xml
- History
- Source
- Diff
./xdoclet/global-forwards.xml
- -0
- +0
./xdoclet/struts-actions.xml
- History
- Source
- Diff
./xdoclet/struts-actions.xml
- -0
- +0
./xdoclet/struts-forms.xml
- History
- Source
- Diff
./xdoclet/struts-forms.xml
- -1
- +0
./xdoclet/struts-message-resources.xml
- History
- Source
- Diff
./xdoclet/struts-message-resources.xml
- -9
- +0
./xdoclet/struts-plugins.xml
- History
- Source
- Diff
./xdoclet/struts-plugins.xml
… 396 more files in changeset.

1:36 pm

Marcin Cieslak

More
5e63656
changed 372 files
v4.7, v4.8

LDEV-3660: Remove export potfolio resources: Java classes, JPS, DB entries and labels. Remove localLinkPath attribute from CSS tag as it was only used for export portfolio.

- -1
- +0
./language/lams/ApplicationResources.properties
- History
- Source
- Diff
./language/.../ApplicationResources.properties
… 371 more files in changeset.

1:02 pm

erniegx <ernieg@gmail.com>

More
167ff0a
added 3 files

LDEV-2975: Adding Norwegian, Greek and French

- -0
- +65
./language/lams/ApplicationResources_el_GR.properties
- History
- Source
./language/.../ApplicationResources_el_GR.properties
- -0
- +65
./language/lams/ApplicationResources_fr_FR.properties
- History
- Source
./language/.../ApplicationResources_fr_FR.properties
- -0
- +65
./language/lams/ApplicationResources_no_NO.properties
- History
- Source
./language/.../ApplicationResources_no_NO.properties

3:52 pm

Marcin Cieslak

More
30f5e74
deleted 28 files
v4.7, v4.8

LDEV-3340: Remove hibernate.cfg.xml files. Most probably they were used to create DB schema from .hbm.xml files using Ant. They are obsolete now.

- -12
- +0
./hibernate/mappings/hibernate.cfg.xml
- History
- Source
- Diff
./hibernate/mappings/hibernate.cfg.xml
… 27 more files in changeset.

conf

Stats

Commits this week: 1

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

Ernie Ghiglione

Ernie Ghiglione

Andrey Balan

Ernie Ghiglione

Marcin Cieslak

Marcin Cieslak

Ernie Ghiglione <ernieg@gmail.com>

Marcin Cieslak

Ernie Ghiglione <ernieg@gmail.com>

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Ernie Ghiglione <ernieg@gmail.com>

Marcin Cieslak

Marcin Cieslak

Ernie Ghiglione <ernieg@gmail.com>

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Ernie Ghiglione <ernieg@gmail.com>

Ernie Ghiglione <ernieg@gmail.com>

Ernie Ghiglione <ernieg@gmail.com>

erniegx <ernieg@gmail.com>

erniegx <ernieg@gmail.com>

Marcin Cieslak

erniegx <ernieg@gmail.com>

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

erniegx <ernieg@gmail.com>

Marcin Cieslak