Activity lams-github/

9:28 pm

Marcin Cieslak

More
0aae420
changed 43 files
v4.7, v4.8

LDEV-3561: Initial implemntation of re-setting read-only flag of Activities on force uncomplete. Each Tools' service has a method to report whether there is significant users' content left it the Activity. If so, it reports the Activity as read-only. Otherwise the flag can be re-set. Grouping, Gate and Complex activities also have their way of checking their immutability.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -2
- +4
/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
- History
- Source
- Diff
/lams_central/src/.../AuthoringService.java
- -167
- +185
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
- History
- Source
- Diff
/lams_common/src/.../Grouper.java
- -17
- +22
/lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java
- History
- Source
- Diff
/lams_common/src/.../ToolContentManager.java
- -64
- +63
/lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java
- History
- Source
- Diff
/lams_common/.../ILamsCoreToolService.java
- -54
- +120
/lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
- History
- Source
- Diff
/lams_common/src/.../LamsCoreToolService.java
- -0
- +3
/lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
- History
- Source
- Diff
/lams_common/.../toolApplicationContext.xml
- -136
- +171
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
/lams_monitoring/.../MonitoringService.java
- -0
- +9
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
- History
- Source
- Diff
/lams_tool_assessment/.../AssessmentServiceImpl.java
- -115
- +151
/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/service/BbbService.java
- History
- Source
- Diff
/lams_tool_bbb/src/.../BbbService.java
- -40
- +100
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
- History
- Source
- Diff
/lams_tool_chat/src/.../ChatService.java
- -34
- +61
/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
- History
- Source
- Diff
/lams_tool_daco/src/.../DacoServiceImpl.java
- -441
- +503
/lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
- History
- Source
- Diff
/lams_tool_eadventure/.../EadventureServiceImpl.java
- -116
- +160
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumService.java
- -28
- +75
/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
- History
- Source
- Diff
/lams_tool_gmap/src/.../GmapService.java
… 28 more files in changeset.

9:22 pm

Marcin Cieslak

More
3fe7b36
changed 2 files
v4.7, v4.8

LDEV-3490: When performing force complete, check if target activity is before current activity using back-end instead of front-end SVG parsing. Branching is difficult to process.

- -15
- +66
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
- History
- Source
- Diff
/lams_monitoring/.../MonitoringAction.java
- -25
- +21
/lams_monitoring/web/includes/javascript/monitorLesson.js
- History
- Source
- Diff
/lams_monitoring/web/.../monitorLesson.js

7:29 am

Andrey Balan

More
3d350cc
changed 1 file
v4.7, v4.8

LDEV-3546 Sort groups alphabetically (taking into account numbers) on monitoring pages

- -9
- +10
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentSessionComparator.java
- History
- Source
- Diff
/lams_tool_assessment/.../AssessmentSessionComparator.java

7:27 am

Andrey Balan

More
aa0b459
changed 1 file

LDEV-3546 Sort groups alphabetically (taking into account numbers) on monitoring pages

- -9
- +10
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentSessionComparator.java
- History
- Source
- Diff
/lams_tool_assessment/.../AssessmentSessionComparator.java

12:49 am

Andrey Balan

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

LDEV-3548 Prevent Scratchie tool from storing duplicate scratches done by the same user

- -0
- +14
/lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20150903.sql
- History
- Source
/lams_tool_scratchie/src/.../patch20150903.sql

12:36 am

Andrey Balan

More
3b2ee7c
changed 103 files
v4.7, v4.8

LDEV-3559 Introducing new CKEditor plugin jlatexmath

- -0
- +1
/lams_build/3rdParty.userlibraries
- History
- Source
- Diff
/lams_build/3rdParty.userlibraries
- -0
- +10
/lams_build/build.xml
- History
- Source
- Diff
/lams_build/build.xml
- binary
/lams_build/lib/jlatexmath/jlatexmath-1.0.3.jar
- History
- Source
/lams_build/lib/.../jlatexmath-1.0.3.jar
- -0
- +29
/lams_build/lib/jlatexmath/jlatexmath.module.xml
- History
- Source
/lams_build/lib/.../jlatexmath.module.xml
- -0
- +2
/lams_build/liblist.txt
- History
- Source
- Diff
/lams_build/liblist.txt
- -0
- +94
/lams_central/src/java/org/lamsfoundation/lams/web/JlatexmathServlet.java
- History
- Source
/lams_central/src/.../web/JlatexmathServlet.java
- -1
- +1
/lams_central/web/ckeditor/ckeditor.js
- History
- Source
- Diff
/lams_central/web/ckeditor/ckeditor.js
- binary
/lams_central/web/ckeditor/plugins/jlatexmath/icons/mathjax.png
- History
- Source
/lams_central/web/ckeditor/.../icons/mathjax.png
- -0
- +1
/lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp
- History
- Source
/lams_central/web/.../jlatexmath/jlatexmath.jsp
- -0
- +3
/lams_central/web/ckeditor/plugins/jlatexmath/lang/en.js
- History
- Source
/lams_central/web/ckeditor/.../lang/en.js
- -0
- +34
/lams_central/web/ckeditor/plugins/jlatexmath/plugin.js
- History
- Source
/lams_central/web/.../jlatexmath/plugin.js
- -1013
- +0
/lams_central/web/ckeditor/plugins/lineutils/plugin.js
- History
- Source
- Diff
/lams_central/web/.../lineutils/plugin.js
- -78
- +0
/lams_central/web/ckeditor/plugins/mathjax/dialogs/mathjax.js
- History
- Source
- Diff
/lams_central/web/.../dialogs/mathjax.js
- binary
/lams_central/web/ckeditor/plugins/mathjax/icons/hidpi/mathjax.png
- History
- Source
- Diff
/lams_central/web/.../hidpi/mathjax.png
- binary
/lams_central/web/ckeditor/plugins/mathjax/icons/mathjax.png
- History
- Source
- Diff
/lams_central/web/.../icons/mathjax.png
… 88 more files in changeset.

10:22 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
3bad029
changed 2 files
v4.7, v4.8

LDEV-3523: Design type added to export/import

- -0
- +13
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
- History
- Source
- Diff
/lams_common/src/.../LearningDesignDTO.java
- -0
- +2
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
/lams_common/.../ExportToolContentService.java

9:54 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
0e3e19d
changed 2 files

LDEV-3523: Design type added to export/import

- -0
- +13
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
- History
- Source
- Diff
/lams_common/src/.../LearningDesignDTO.java
- -0
- +2
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
- History
- Source
- Diff
/lams_common/.../ExportToolContentService.java

6:02 am

Andrey Balan

More
3ee4c7e
changed 1 file

LDEV-3501 Fixed "Cannot read property 'msie' of undefined" JS error * removed debug info

- -1
- +0
/lams_admin/web/usersearchlist.jsp
- History
- Source
- Diff
/lams_admin/web/usersearchlist.jsp

12:42 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

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

LDEV-3523: When returning a JSON list of learning designs set design type to "default" if no type exists. Also search on default for designs without a type.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -5
- +0
/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
- History
- Source
- Diff
/lams_central/.../LearningDesignRepositoryServlet.java
- -1
- +8
/lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
- History
- Source
- Diff
/lams_central/.../WorkspaceManagementService.java
- -0
- +4
/lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java
- History
- Source
- Diff
/lams_common/src/.../FolderContentDTO.java

4:47 am

Andrey Balan

More
8dea324
changed 5 files

LDEV-3559 Replaces equation editor in CKEditor with JLatexMath plugin * refresh formula on cut event * image transparency * ability to open and edit existing formulas

- -9
- +16
/lams_central/src/java/org/lamsfoundation/lams/web/JlatexmathServlet.java
- History
- Source
- Diff
/lams_central/src/.../JlatexmathServlet.java
- -1
- +1
/lams_central/web/ckeditor/ckeditor.js
- History
- Source
- Diff
/lams_central/web/ckeditor/ckeditor.js
- -1
- +1
/lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp
- History
- Source
- Diff
/lams_central/web/.../jlatexmath.jsp
- -3
- +3
/lams_central/web/ckeditor/plugins/jlatexmath/lang/en.js
- History
- Source
- Diff
/lams_central/web/ckeditor/.../lang/en.js
- -1
- +22
/lams_central/web/ckeditor/plugins/jlatexmath/plugin.js
- History
- Source
- Diff
/lams_central/web/.../jlatexmath/plugin.js

1:41 am

Marcin Cieslak

More
2fbbee8
changed 1 file
v4.7, v4.8

LDEV-3480: Comments field may not be included in the JSON response, even if comments are enabled.

- -0
- +2
/lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
- History
- Source
- Diff
/lams_tool_laqa/.../MonitoringMaincontent.jsp

1:39 am

Marcin Cieslak

More
5f23218
changed 1 file

LDEV-3480: Comments field may not be included in the JSON response, even if comments are enabled.

- -0
- +2
/lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
- History
- Source
- Diff
/lams_tool_laqa/.../MonitoringMaincontent.jsp

7:45 am

Andrey Balan

More
bf53c8a
changed 4 files

LDEV-3559 Introducing new CKEditor plugin jlatexmath

- -0
- +1
/lams_build/3rdParty.userlibraries
- History
- Source
- Diff
/lams_build/3rdParty.userlibraries
- -0
- +1
/lams_build/build.xml
- History
- Source
- Diff
/lams_build/build.xml
- binary
/lams_build/lib/jlatexmath/jlatexmath-1.0.3.jar
- History
- Source
/lams_build/lib/.../jlatexmath-1.0.3.jar
- -0
- +2
/lams_build/liblist.txt
- History
- Source
- Diff
/lams_build/liblist.txt

7:26 am

Andrey Balan

More
72eb0ba
changed 98 files

LDEV-3559 Introducing new CKEditor plugin jlatexmath

- -0
- +87
/lams_central/src/java/org/lamsfoundation/lams/web/JlatexmathServlet.java
- History
- Source
/lams_central/src/.../web/JlatexmathServlet.java
- binary
/lams_central/web/ckeditor/plugins/jlatexmath/icons/mathjax.png
- History
- Source
/lams_central/web/ckeditor/.../icons/mathjax.png
- -0
- +1
/lams_central/web/ckeditor/plugins/jlatexmath/jlatexmath.jsp
- History
- Source
/lams_central/web/.../jlatexmath/jlatexmath.jsp
- -0
- +3
/lams_central/web/ckeditor/plugins/jlatexmath/lang/en.js
- History
- Source
/lams_central/web/ckeditor/.../lang/en.js
- -0
- +13
/lams_central/web/ckeditor/plugins/jlatexmath/plugin.js
- History
- Source
/lams_central/web/.../jlatexmath/plugin.js
- -1013
- +0
/lams_central/web/ckeditor/plugins/lineutils/plugin.js
- History
- Source
- Diff
/lams_central/web/.../lineutils/plugin.js
- -78
- +0
/lams_central/web/ckeditor/plugins/mathjax/dialogs/mathjax.js
- History
- Source
- Diff
/lams_central/web/.../dialogs/mathjax.js
- binary
/lams_central/web/ckeditor/plugins/mathjax/icons/hidpi/mathjax.png
- History
- Source
- Diff
/lams_central/web/.../hidpi/mathjax.png
- binary
/lams_central/web/ckeditor/plugins/mathjax/icons/mathjax.png
- History
- Source
- Diff
/lams_central/web/.../icons/mathjax.png
- binary
/lams_central/web/ckeditor/plugins/mathjax/images/loader.gif
- History
- Source
- Diff
/lams_central/web/.../images/loader.gif
- -13
- +0
/lams_central/web/ckeditor/plugins/mathjax/lang/af.js
- History
- Source
- Diff
/lams_central/web/ckeditor/.../lang/af.js
- -13
- +0
/lams_central/web/ckeditor/plugins/mathjax/lang/ar.js
- History
- Source
- Diff
/lams_central/web/ckeditor/.../lang/ar.js
- -13
- +0
/lams_central/web/ckeditor/plugins/mathjax/lang/ca.js
- History
- Source
- Diff
/lams_central/web/ckeditor/.../lang/ca.js
- -13
- +0
/lams_central/web/ckeditor/plugins/mathjax/lang/cs.js
- History
- Source
- Diff
/lams_central/web/ckeditor/.../lang/cs.js
- -13
- +0
/lams_central/web/ckeditor/plugins/mathjax/lang/cy.js
- History
- Source
- Diff
/lams_central/web/ckeditor/.../lang/cy.js
… 83 more files in changeset.

8:50 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
dffa454
changed 4 files

LDEV-3523: When returning a JSON list of learning designs set design type to "default" if no type exists. Also search on default for designs without a type.