Activity lams-github/

10:05 am

lfoxton

More
e81fdf5
changed 34 files
v4.7, v4.8

LDEV-2398 Developing the wookie author module

- -20
- +28
/lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/Wookie.hbm.xml
- History
- Source
- Diff
/lams_tool_wookie/conf/.../Wookie.hbm.xml
- -33
- +0
/lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieUser.hbm.xml
- History
- Source
- Diff
/lams_tool_wookie/conf/.../WookieUser.hbm.xml
- -5
- +6
/lams_tool_wookie/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_wookie/.../ApplicationResources.properties
- -125
- +0
/lams_tool_wookie/conf/language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
/lams_tool_wookie/.../ApplicationResources_el_GR.properties
- -4
- +5
/lams_tool_wookie/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_wookie/.../ApplicationResources_en_AU.properties
- -125
- +0
/lams_tool_wookie/conf/language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
/lams_tool_wookie/.../ApplicationResources_es_ES.properties
- -124
- +0
/lams_tool_wookie/conf/language/lams/ApplicationResources_mi_NZ.properties
- History
- Source
- Diff
/lams_tool_wookie/.../ApplicationResources_mi_NZ.properties
- -125
- +0
/lams_tool_wookie/conf/language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
/lams_tool_wookie/.../ApplicationResources_no_NO.properties
- -124
- +0
/lams_tool_wookie/conf/language/lams/ApplicationResources_ru_RU.properties
- History
- Source
- Diff
/lams_tool_wookie/.../ApplicationResources_ru_RU.properties
- -18
- +77
/lams_tool_wookie/db/sql/create_lams_tool_wookie.sql
- History
- Source
- Diff
/lams_tool_wookie/.../create_lams_tool_wookie.sql
- -1
- +1
/lams_tool_wookie/db/sql/tool_insert.sql
- History
- Source
- Diff
/lams_tool_wookie/db/sql/tool_insert.sql
- -0
- +85
/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WidgetData.java
- History
- Source
/lams_tool_wookie/src/java/.../dto/WidgetData.java
- -41
- +8
/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieDTO.java
- History
- Source
- Diff
/lams_tool_wookie/src/.../dto/WookieDTO.java
- -79
- +1
/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/dto/WookieUserDTO.java
- History
- Source
- Diff
/lams_tool_wookie/src/.../WookieUserDTO.java
- -49
- +53
/lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/model/Wookie.java
- History
- Source
- Diff
/lams_tool_wookie/src/.../model/Wookie.java
… 19 more files in changeset.

4:58 am

Andrey Balan

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

LDEV-2396 getting rid of config version

- -10
- +0
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/dto/ConfigDTO.java
- History
- Source
- Diff
/lams_tool_dimdim/src/.../dto/ConfigDTO.java
- -48
- +21
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
- History
- Source
- Diff
/lams_tool_dimdim/src/.../DimdimService.java
- -7
- +1
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/IDimdimService.java
- History
- Source
- Diff
/lams_tool_dimdim/src/.../IDimdimService.java
- -5
- +1
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/Constants.java
- History
- Source
- Diff
/lams_tool_dimdim/src/.../util/Constants.java
- -9
- +10
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/util/DimdimUtil.java
- History
- Source
- Diff
/lams_tool_dimdim/src/.../DimdimUtil.java
- -34
- +10
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AdminAction.java
- History
- Source
- Diff
/lams_tool_dimdim/src/.../AdminAction.java
- -1
- +0
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_dimdim/.../MonitoringAction.java
- -17
- +0
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/forms/AdminForm.java
- History
- Source
- Diff
/lams_tool_dimdim/src/.../AdminForm.java
- -22
- +0
/lams_tool_dimdim/web/pages/admin/edit.jsp
- History
- Source
- Diff
/lams_tool_dimdim/web/.../admin/edit.jsp
- -4
- +0
/lams_tool_dimdim/web/pages/admin/view.jsp
- History
- Source
- Diff
/lams_tool_dimdim/web/.../admin/view.jsp

2:23 am

Andrey Balan

More
958ff33
changed 5 files
v4.7, v4.8

LDEV-2372 modified ant builds to support Selenium tests also added selenium server port property to common.properties

- -1
- +4
/lams_build/common.properties
- History
- Source
- Diff
/lams_build/common.properties
- -3
- +33
/lams_tool_assessment/build.xml
- History
- Source
- Diff
/lams_tool_assessment/build.xml
- -1
- +31
/lams_tool_forum/build.xml
- History
- Source
- Diff
/lams_tool_forum/build.xml
- -2
- +31
/lams_tool_notebook/build.xml
- History
- Source
- Diff
/lams_tool_notebook/build.xml
- -0
- +30
/lams_tool_wiki/build.xml
- History
- Source
- Diff
/lams_tool_wiki/build.xml

10:55 pm

Andrey Balan

More
2b51603
changed 10 files
v4.7, v4.8

LDEV-2372 moving all Selenium core classes from lams_common/test/java --> lams_common/src/java. as these classes are aimed for importing from other projects

- -0
- +592
/lams_common/src/java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java
- History
- Source
/lams_common/src/.../AbstractSeleniumTestCase.java
- -0
- +182
/lams_common/src/java/org/lamsfoundation/lams/selenium/DefaultSeleniumFlex.java
- History
- Source
/lams_common/src/.../DefaultSeleniumFlex.java
- -0
- +69
/lams_common/src/java/org/lamsfoundation/lams/selenium/SeleniumTestSuite.java
- History
- Source
/lams_common/src/.../SeleniumTestSuite.java
- -0
- +46
/lams_common/src/java/org/lamsfoundation/lams/selenium/TestFrameworkConstants.java
- History
- Source
/lams_common/src/.../TestFrameworkConstants.java
- -0
- +68
/lams_common/src/java/org/lamsfoundation/lams/selenium/TestFrameworkException.java
- History
- Source
/lams_common/src/.../TestFrameworkException.java
- -587
- +0
/lams_common/test/java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java
- History
- Source
- Diff
/lams_common/.../AbstractSeleniumTestCase.java
- -182
- +0
/lams_common/test/java/org/lamsfoundation/lams/selenium/DefaultSeleniumFlex.java
- History
- Source
- Diff
/lams_common/.../DefaultSeleniumFlex.java
- -69
- +0
/lams_common/test/java/org/lamsfoundation/lams/selenium/SeleniumTestSuite.java
- History
- Source
- Diff
/lams_common/test/.../SeleniumTestSuite.java
- -46
- +0
/lams_common/test/java/org/lamsfoundation/lams/selenium/TestFrameworkConstants.java
- History
- Source
- Diff
/lams_common/.../TestFrameworkConstants.java
- -68
- +0
/lams_common/test/java/org/lamsfoundation/lams/selenium/TestFrameworkException.java
- History
- Source
- Diff
/lams_common/.../TestFrameworkException.java

5:49 pm

Andrey Balan

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

LDEV-2396 stopped checking the version in learning

- -9
- +0
/lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_dimdim/src/.../LearningAction.java

2:41 pm

erniegx <ernieg@gmail.com>

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

Updating Japanese

- -10
- +10
/lams_gradebook/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_gradebook/.../ApplicationResources_ja_JP.properties
- -73
- +73
/lams_tool_assessment/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_assessment/.../ApplicationResources_ja_JP.properties
- -59
- +59
/lams_tool_images/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_images/.../ApplicationResources_ja_JP.properties
- -30
- +30
/lams_tool_mindmap/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_mindmap/.../ApplicationResources_ja_JP.properties
- -21
- +21
/lams_tool_pixlr/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_pixlr/.../ApplicationResources_ja_JP.properties
- -46
- +46
/lams_tool_videorecorder/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_videorecorder/.../ApplicationResources_ja_JP.properties
- -56
- +56
/lams_tool_wiki/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_wiki/.../ApplicationResources_ja_JP.properties

2:13 pm

erniegx <ernieg@gmail.com>

More
d4760a0
changed 23 files
v4.7, v4.8

Updating Japanese

- -86
- +86
/lams_admin/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_admin/.../ApplicationResources_ja_JP.properties
- -1
- +1
/lams_central/conf/flashxml/lams/authoring/ja_JP_dictionary.xml
- History
- Source
- Diff
/lams_central/conf/.../ja_JP_dictionary.xml
- -1
- +1
/lams_central/conf/flashxml/lams/learner/ja_JP_dictionary.xml
- History
- Source
- Diff
/lams_central/conf/.../ja_JP_dictionary.xml
- -1
- +1
/lams_central/conf/flashxml/lams/monitoring/ja_JP_dictionary.xml
- History
- Source
- Diff
/lams_central/conf/.../ja_JP_dictionary.xml
- -81
- +81
/lams_central/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_ja_JP.properties
- -10
- +10
/lams_common/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_common/.../ApplicationResources_ja_JP.properties
- -22
- +22
/lams_learning/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_learning/.../ApplicationResources_ja_JP.properties
- -27
- +27
/lams_monitoring/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_monitoring/.../ApplicationResources_ja_JP.properties
- -22
- +22
/lams_tool_chat/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_chat/.../ApplicationResources_ja_JP.properties
- -65
- +65
/lams_tool_daco/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_daco/.../ApplicationResources_ja_JP.properties
- -33
- +33
/lams_tool_forum/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_forum/.../ApplicationResources_ja_JP.properties
- -35
- +35
/lams_tool_gmap/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_gmap/.../ApplicationResources_ja_JP.properties
- -39
- +39
/lams_tool_lamc/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_lamc/.../ApplicationResources_ja_JP.properties
- -40
- +40
/lams_tool_laqa/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_laqa/.../ApplicationResources_ja_JP.properties
- -39
- +39
/lams_tool_larsrc/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_tool_larsrc/.../ApplicationResources_ja_JP.properties
… 8 more files in changeset.

2:10 am

Marcin Cieslak

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

LDEV-2397: Fixed a bug in create nomination sequence.

- -2
- +2
/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
- History
- Source
- Diff
/lams_tool_vote/src/.../AuthoringUtil.java
- -10
- +12
/lams_tool_vote/web/authoring/BasicContent.jsp
- History
- Source
- Diff
/lams_tool_vote/web/.../BasicContent.jsp

10:20 pm

Andrey Balan

More
00ae80d
changed 98 files
v4.7, v4.8

LDEV-2387 simplified rendering of FCKEditor

* removed commented JS part from FCKEditor jsp tag

* removed fckeditorheader.jsp

* got rid of any references to fckeditor.js, fckcontroller.js, fckeditor.css

- -23
- +0
/lams_admin/web/WEB-INF/tags/FCKEditor.tag
- History
- Source
- Diff
/lams_admin/web/.../tags/FCKEditor.tag
- -6
- +1
/lams_admin/web/WEB-INF/tags/headItems.tag
- History
- Source
- Diff
/lams_admin/web/.../tags/headItems.tag
- -23
- +0
/lams_central/web/WEB-INF/tags/FCKEditor.tag
- History
- Source
- Diff
/lams_central/web/.../tags/FCKEditor.tag
- -6
- +1
/lams_central/web/WEB-INF/tags/headItems.tag
- History
- Source
- Diff
/lams_central/web/.../tags/headItems.tag
- -23
- +0
/lams_gradebook/web/WEB-INF/tags/FCKEditor.tag
- History
- Source
- Diff
/lams_gradebook/web/.../tags/FCKEditor.tag
- -6
- +1
/lams_gradebook/web/WEB-INF/tags/headItems.tag
- History
- Source
- Diff
/lams_gradebook/web/.../tags/headItems.tag
- -23
- +0
/lams_learning/web/WEB-INF/tags/FCKEditor.tag
- History
- Source
- Diff
/lams_learning/web/.../tags/FCKEditor.tag
- -6
- +1
/lams_learning/web/WEB-INF/tags/headItems.tag
- History
- Source
- Diff
/lams_learning/web/.../tags/headItems.tag
- -23
- +0
/lams_monitoring/web/WEB-INF/tags/FCKEditor.tag
- History
- Source
- Diff
/lams_monitoring/web/.../tags/FCKEditor.tag
- -6
- +1
/lams_monitoring/web/WEB-INF/tags/headItems.tag
- History
- Source
- Diff
/lams_monitoring/web/.../tags/headItems.tag
- -1
- +0
/lams_tool_assessment/web/common/fckeditorheader.jsp
- History
- Source
- Diff
/lams_tool_assessment/.../fckeditorheader.jsp
- -1
- +0
/lams_tool_assessment/web/pages/authoring/authoring.jsp
- History
- Source
- Diff
/lams_tool_assessment/web/.../authoring.jsp
- -1
- +0
/lams_tool_assessment/web/pages/authoring/definelater.jsp
- History
- Source
- Diff
/lams_tool_assessment/web/.../definelater.jsp
- -23
- +0
/lams_tool_chat/web/WEB-INF/tags/FCKEditor.tag
- History
- Source
- Diff
/lams_tool_chat/web/.../tags/FCKEditor.tag
- -6
- +1
/lams_tool_chat/web/WEB-INF/tags/headItems.tag
- History
- Source
- Diff
/lams_tool_chat/web/.../tags/headItems.tag
… 83 more files in changeset.

1:30 pm

lfoxton

More
7c52d11
changed 175 files
v4.7, v4.8

LDEV-2395 First commit for the wookie tool

- -0
- +18
/lams_tool_wookie/.classpath
- History
- Source
/lams_tool_wookie/.classpath
- -0
- +5
/lams_tool_wookie/.cvsignore
- History
- Source
/lams_tool_wookie/.cvsignore
- -0
- +49
/lams_tool_wookie/.project
- History
- Source
/lams_tool_wookie/.project
- -0
- +20
/lams_tool_wookie/build.properties
- History
- Source
/lams_tool_wookie/build.properties
- -0
- +541
/lams_tool_wookie/build.xml
- History
- Source
/lams_tool_wookie/build.xml
- -0
- +13
/lams_tool_wookie/conf/hibernate/mappings/hibernate.cfg.xml
- History
- Source
/lams_tool_wookie/conf/.../hibernate.cfg.xml
- -0
- +232
/lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/Wookie.hbm.xml
- History
- Source
/lams_tool_wookie/conf/.../model/Wookie.hbm.xml
- -0
- +93
/lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieAttachment.hbm.xml
- History
- Source
/lams_tool_wookie/.../WookieAttachment.hbm.xml
- -0
- +57
/lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieConfigItem.hbm.xml
- History
- Source
/lams_tool_wookie/.../WookieConfigItem.hbm.xml
- -0
- +111
/lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieSession.hbm.xml
- History
- Source
/lams_tool_wookie/conf/.../WookieSession.hbm.xml
- -0
- +134
/lams_tool_wookie/conf/hibernate/mappings/org/lamsfoundation/lams/tool/wookie/model/WookieUser.hbm.xml
- History
- Source
/lams_tool_wookie/conf/.../WookieUser.hbm.xml
- -0
- +3
/lams_tool_wookie/conf/jar/META-INF/MANIFEST.MF
- History
- Source
/lams_tool_wookie/conf/.../META-INF/MANIFEST.MF
- -0
- +125
/lams_tool_wookie/conf/language/lams/ApplicationResources.properties
- History
- Source
/lams_tool_wookie/.../ApplicationResources.properties
- -0
- +125
/lams_tool_wookie/conf/language/lams/ApplicationResources_el_GR.properties
- History
- Source
/lams_tool_wookie/.../ApplicationResources_el_GR.properties
- -0
- +125
/lams_tool_wookie/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
/lams_tool_wookie/.../ApplicationResources_en_AU.properties
… 160 more files in changeset.

5:19 am

Andrey Balan

More
202c856
changed 6 files
v4.7, v4.8

LDEV-2372 Testing framework * modifications to tool's Selenium tests due to the changes in core classes * Assessment and Notebook tools: tests moved to the new packages

- -0
- +232
/lams_tool_assessment/test/java/org/lamsfoundation/lams/tool/assessment/selenium/TestAssessment.java
- History
- Source
/lams_tool_assessment/test/.../TestAssessment.java
- -212
- +0
/lams_tool_assessment/test/java/org/lamsfoundation/lams/tool/assessment/tests/TestAssessment.java
- History
- Source
- Diff
/lams_tool_assessment/.../TestAssessment.java
- -25
- +13
/lams_tool_forum/test/java/org/lamsfoundation/lams/tool/forum/selenium/TestForum.java
- History
- Source
- Diff
/lams_tool_forum/test/.../TestForum.java
- -0
- +98
/lams_tool_notebook/test/java/org/lamsfoundation/lams/tool/notebook/selenium/TestNotebook.java
- History
- Source
/lams_tool_notebook/test/.../TestNotebook.java
- -72
- +0
/lams_tool_notebook/test/java/org/lamsfoundation/lams/tool/notebook/testscripts/TestNotebook.java
- History
- Source
- Diff
/lams_tool_notebook/.../TestNotebook.java
- -26
- +12
/lams_tool_wiki/test/java/org/lamsfoundation/lams/tool/wiki/selenium/TestWiki.java
- History
- Source
- Diff
/lams_tool_wiki/test/.../TestWiki.java

4:15 am

LDEV-2372 Testing framework * switched to the approach with several test cases inside one Unit test (using SeleniumSuiteCase) * got rid of the majority of abstract classes so now you're basically free to pick up testing technique that suites you best (either test suites or single tests) * ability to tear down Selenium at the end of any test case * fixed small bug with assertion in createNewLesson()

- -128
- +113
/lams_common/test/java/org/lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java
- History
- Source
- Diff
/lams_common/.../AbstractSeleniumTestCase.java
- -0
- +69
/lams_common/test/java/org/lamsfoundation/lams/selenium/SeleniumTestSuite.java
- History
- Source
/lams_common/test/.../SeleniumTestSuite.java

2:13 am

Marcin Cieslak

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

LDEV-2374: Fixed a bug - maxInputs were not saved into DB.

- -0
- +9
/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
- History
- Source
- Diff
/lams_tool_vote/src/.../AuthoringUtil.java

12:20 pm

lfoxton

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

Merging a small fix for assessment mark export

- -28
- +50
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_assessment/.../MonitoringAction.java

11:13 am

erniegx <ernieg@gmail.com>

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

LDEV-2185: Merging from branch to head

- -1
- +1
/lams_tool_vote/web/learning/RevisitedDisplay.jsp
- History
- Source
- Diff
/lams_tool_vote/web/.../RevisitedDisplay.jsp

6:21 am

Marcin Cieslak

More
1a5446e
changed 50 files
v4.7, v4.8

LDEV-2374: - Vote now accepts nominations created by Teacher as well as ones derived from input. - Teacher can now limit number of Learners contributing to Vote's nomination pool. - Each tool now declares which DataOutputDefinitions it can accept for Data Flow.