Activity lams-github/

9:17 pm

Marcin Cieslak

More
2b350be
changed 60 files
v4.7, v4.8

LDEV-3070: Use window.parent if required in Tools. Make single activity lesson wizard optional, set in sysadmin menu.

- -1
- +1
/lams_admin/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_admin/.../ApplicationResources.properties
- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -0
- +4
/lams_central/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources.properties
- -0
- +2
/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
- History
- Source
- Diff
/lams_central/src/.../DisplayGroupAction.java
- -0
- +130
/lams_central/web/css/index.css
- History
- Source
/lams_central/web/css/index.css
- -2
- +2
/lams_central/web/includes/javascript/groupDisplay.js
- History
- Source
- Diff
/lams_central/web/.../groupDisplay.js
- -104
- +23
/lams_central/web/main2.jsp
- History
- Source
- Diff
/lams_central/web/main2.jsp
- -0
- +13
/lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040017.sql
- History
- Source
/lams_common/src/.../dbupdates/patch02040017.sql
- -0
- +3
/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
- History
- Source
- Diff
/lams_common/src/.../ConfigurationKeys.java
- -1
- +1
/lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp
- History
- Source
- Diff
/lams_tool_assessment/.../overallfeedbacklist.jsp
- -1
- +15
/lams_tool_chat/web/pages/authoring/addCondition.jsp
- History
- Source
- Diff
/lams_tool_chat/web/.../addCondition.jsp
- -6
- +11
/lams_tool_chat/web/pages/authoring/conditionList.jsp
- History
- Source
- Diff
/lams_tool_chat/web/.../conditionList.jsp
- -4
- +7
/lams_tool_daco/web/includes/javascript/dacoAuthoring.js
- History
- Source
- Diff
/lams_tool_daco/web/.../dacoAuthoring.js
- -5
- +10
/lams_tool_daco/web/pages/authoring/parts/questionlist.jsp
- History
- Source
- Diff
/lams_tool_daco/web/.../questionlist.jsp
- -6
- +12
/lams_tool_eadventure/web/includes/javascript/eadventureitem.js
- History
- Source
- Diff
/lams_tool_eadventure/.../eadventureitem.js
… 45 more files in changeset.

8:36 pm

Andrey Balan

More
494a9dd
changed 4 files
v4.7, v4.8

LDEV-3079 fixed small bugs

- -0
- +1
/lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_lamc/.../ApplicationResources_en_AU.properties
- -0
- +13
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20130726.sql
- History
- Source
/lams_tool_lamc/src/.../patch20130726.sql
- -1
- +1
/lams_tool_lamc/web/learning/ViewAnswers.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../ViewAnswers.jsp
- -1
- +1
/lams_tool_lamc/web/learning/mobile/ViewAnswers.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../ViewAnswers.jsp

11:31 pm

Andrey Balan

More
58154c6
changed 4 files
v4.7, v4.8

LDEV-3079 radio buttons should be displayed in front of answer options

- -11
- +21
/lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
- History
- Source
- Diff
/lams_tool_lamc/.../CombinedAnswersContent.jsp
- -24
- +24
/lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
- History
- Source
- Diff
/lams_tool_lamc/.../SingleQuestionAnswersContent.jsp
- -7
- +3
/lams_tool_lamc/web/learning/ViewAnswers.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../ViewAnswers.jsp
- -10
- +5
/lams_tool_lamc/web/learning/mobile/SingleQuestionAnswersContent.jsp
- History
- Source
- Diff
/lams_tool_lamc/.../SingleQuestionAnswersContent.jsp

2:12 pm

Marcin Cieslak

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

LDEV-3080: Escape quotes in instructions in Share Resources.

- -2
- +2
/lams_tool_larsrc/web/pages/authoring/parts/instructions.jsp
- History
- Source
- Diff
/lams_tool_larsrc/web/.../instructions.jsp

1:58 pm

Andrey Balan

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

LDEV-3079 update jquery form plugin

- -1101
- +5
/lams_central/web/includes/javascript/jquery.form.js
- History
- Source
- Diff
/lams_central/web/.../jquery.form.js

1:56 pm

LDEV-3070: Fix few minor errors in Tools. Pass notifyCloseURL to proper authoring page in some Tools. Make generation of Tool content a non read-only operation as it starts a database transaction which is later used for writing.

- binary
/lams_build/lib/lams/lams-central.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams-central.jar
- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -4
- +4
/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
- History
- Source
- Diff
/lams_central/src/.../AuthoringService.java
- -2
- +2
/lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
- History
- Source
- Diff
/lams_central/src/.../IAuthoringService.java
- -2
- +2
/lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
- History
- Source
- Diff
/lams_central/src/.../AuthoringAction.java
- -4
- +4
/lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
- History
- Source
- Diff
/lams_central/.../LamsAuthoringFinishAction.java
- -2
- +2
/lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
- History
- Source
- Diff
/lams_central/src/.../web/HomeAction.java
- -5
- +4
/lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
- History
- Source
- Diff
/lams_central/.../PedagogicalPlannerAction.java
- -164
- +163
/lams_central/src/java/org/lamsfoundation/lams/web/tag/HelpTag.java
- History
- Source
- Diff
/lams_central/src/java/.../tag/HelpTag.java
- -1
- +1
/lams_central/web/authoringConfirm.jsp
- History
- Source
- Diff
/lams_central/web/authoringConfirm.jsp
- -0
- +10
/lams_central/web/dialogCloser.jsp
- History
- Source
/lams_central/web/dialogCloser.jsp
- -4
- +3
/lams_common/src/java/org/lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
- History
- Source
- Diff
/lams_common/.../LoginRequestDispatcher.java
- -1
- +1
/lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
- History
- Source
- Diff
/lams_common/.../toolApplicationContext.xml
- -0
- +1
/lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
- History
- Source
- Diff
/lams_common/src/.../util/AttributeNames.java
- -2
- +5
/lams_tool_assessment/web/pages/authoring/parts/overallfeedbacklist.jsp
- History
- Source
- Diff
/lams_tool_assessment/.../overallfeedbacklist.jsp
… 8 more files in changeset.

2:29 am

Andrey Balan

More
87ff0b3
changed 19 files
v4.7, v4.8

LDEV-3079 * use thickbox pages and ajax calls * Use CKEditors as MCQ answers tags

- -3
- +2
/lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_lamc/.../ApplicationResources_en_AU.properties
- -23
- +0
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/AuthoringUtil.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../AuthoringUtil.java
- -456
- +137
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McAction.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../web/McAction.java
- -13
- +0
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
- History
- Source
- Diff
/lams_tool_lamc/.../McMonitoringAction.java
- -1
- +24
/lams_tool_lamc/web/WEB-INF/struts-config.xml
- History
- Source
- Diff
/lams_tool_lamc/web/.../struts-config.xml
- -20
- +0
/lams_tool_lamc/web/authoring/AdvancedContent.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../AdvancedContent.jsp
- -45
- +25
/lams_tool_lamc/web/authoring/AuthoringTabsHolder.jsp
- History
- Source
- Diff
/lams_tool_lamc/.../AuthoringTabsHolder.jsp
- -89
- +49
/lams_tool_lamc/web/authoring/BasicContent.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../BasicContent.jsp
- -35
- +2
/lams_tool_lamc/web/authoring/BasicContentViewOnly.jsp
- History
- Source
- Diff
/lams_tool_lamc/.../BasicContentViewOnly.jsp
- -22
- +0
/lams_tool_lamc/web/authoring/InstructionsContent.jsp
- History
- Source
- Diff
/lams_tool_lamc/.../InstructionsContent.jsp
- -53
- +37
/lams_tool_lamc/web/authoring/candidateAnswersAddList.jsp
- History
- Source
- Diff
/lams_tool_lamc/.../candidateAnswersAddList.jsp
- -51
- +49
/lams_tool_lamc/web/authoring/candidateAnswersList.jsp
- History
- Source
- Diff
/lams_tool_lamc/.../candidateAnswersList.jsp
- -113
- +81
/lams_tool_lamc/web/authoring/editQuestionBox.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../editQuestionBox.jsp
- -44
- +15
/lams_tool_lamc/web/authoring/itemlist.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../itemlist.jsp
- -21
- +0
/lams_tool_lamc/web/authoring/itemlistViewOnly.jsp
- History
- Source
- Diff
/lams_tool_lamc/web/.../itemlistViewOnly.jsp
… 4 more files in changeset.

2:20 am

Marcin Cieslak

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

LDEV-3070: Reintroduce "index" attribute of textarea tag as a file in Task Tool requires it.

- -0
- +5
/lams_central/web/WEB-INF/tlds/lams/lams.tld
- History
- Source
- Diff
/lams_central/web/WEB-INF/.../lams/lams.tld
- -0
- +5
/lams_tool_task/web/WEB-INF/tlds/lams/lams.tld
- History
- Source
- Diff
/lams_tool_task/web/WEB-INF/.../lams/lams.tld

1:54 am

Marcin Cieslak

More
29fac4b
changed 124 files
v4.7, v4.8

LDEV-3070: Add single activity lessons wizard, first implementation iteration. Some changes were not committed as they interfere with old index page design.

- -1
- +1
/lams_admin/web/WEB-INF/tags/AuthoringButton.tag
- History
- Source
- Diff
/lams_admin/web/.../tags/AuthoringButton.tag
- -44
- +48
/lams_admin/web/WEB-INF/tlds/lams/lams.tld
- History
- Source
- Diff
/lams_admin/web/WEB-INF/.../lams/lams.tld
- binary
/lams_build/lib/lams/lams-central.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams-central.jar
- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -1
- +1
/lams_central/.classpath
- History
- Source
- Diff
/lams_central/.classpath
- -0
- +55
/lams_central/src/java/org/lamsfoundation/lams/authoring/dto/ToolDTO.java
- History
- Source
/lams_central/src/java/.../dto/ToolDTO.java
- -1910
- +1817
/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
- History
- Source
- Diff
/lams_central/src/.../AuthoringService.java
- -48
- +57
/lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
- History
- Source
- Diff
/lams_central/src/.../IAuthoringService.java
- -9
- +111
/lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
- History
- Source
- Diff
/lams_central/src/.../AuthoringAction.java
- -53
- +77
/lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
- History
- Source
- Diff
/lams_central/src/.../DisplayGroupAction.java
- -1
- +1
/lams_central/web/WEB-INF/tags/AuthoringButton.tag
- History
- Source
- Diff
/lams_central/web/.../AuthoringButton.tag
- -95
- +177
/lams_central/web/includes/javascript/groupDisplay.js
- History
- Source
- Diff
/lams_central/web/.../groupDisplay.js
- -0
- +3
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
- History
- Source
- Diff
/lams_common/.../UserManagementService.java
- -0
- +36
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/util/CollapsedOrgDTOComparator.java
- History
- Source
/lams_common/.../CollapsedOrgDTOComparator.java
- -0
- +1
/lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
- History
- Source
- Diff
/lams_common/src/.../util/AttributeNames.java
… 109 more files in changeset.

3:49 am

erniegx <ernieg@gmail.com>

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

LDEV-3083: update executable script extensions

- -1
- +1
/lams_common/db/sql/insert_lams_unix_config_data.sql
- History
- Source
- Diff
/lams_common/.../insert_lams_unix_config_data.sql
- -1
- +1
/lams_common/db/sql/insert_lams_windows_config_data.sql
- History
- Source
- Diff
/lams_common/.../insert_lams_windows_config_data.sql

10:33 pm

Andrey Balan

More
0c8690c
changed 3 files
v4.7, v4.8

LDEV-3081 assign correct user roles in integrations

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -22
- +3
/lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
- History
- Source
- Diff
/lams_central/.../LoginRequestServlet.java
- -33
- +39
/lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
- History
- Source
- Diff
/lams_common/src/.../IntegrationService.java

4:45 pm

Andrey Balan

More
b19488e
changed 10 files
v4.7, v4.8

LDEV-3078 start uploading images to www/secure/runtime/ instead of using 32-character contentFolderId

- -12
- +0
/lams_tool_wiki/.settings/org.eclipse.jdt.core.prefs
- History
- Source
- Diff
/lams_tool_wiki/.../org.eclipse.jdt.core.prefs
- -0
- +17
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dbupdates/patch20130716.sql
- History
- Source
/lams_tool_wiki/src/.../patch20130716.sql
- -11
- +0
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/dto/WikiSessionDTO.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../WikiSessionDTO.java
- -17
- +1
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/model/WikiSession.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../WikiSession.java
- -0
- +10
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/IWikiService.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../IWikiService.java
- -3
- +6
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../WikiService.java
- -1
- +2
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../LearningAction.java
- -3
- +0
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../MonitoringAction.java
- -19
- +19
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/WikiPageAction.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../WikiPageAction.java
- -43
- +0
/lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/servlets/ExportServlet.java
- History
- Source
- Diff
/lams_tool_wiki/src/.../ExportServlet.java

9:22 pm

Andrey Balan

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

LDEV-3016 Escapes answer descriptions for displaying them in jqGrid

- -3
- +3
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_scratchie/.../MonitoringAction.java

8:59 pm

Andrey Balan

More
093c79d
changed 2 files
v4.7, v4.8

LDEV-3077 Escapes user answers for displaying them in jqGrid (particularly escapes all quotes)

- -3
- +4
/lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
- History
- Source
- Diff
/lams_learning/src/.../MainExportServlet.java
- -4
- +13
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
- History
- Source
- Diff
/lams_tool_assessment/.../AssessmentServiceImpl.java

7:13 pm

Marcin Cieslak

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

LDEV-3070: Make course name wrap in tabs. More space for action buttons. Load tab contents when course name clicked, not on page load. Code formatting.