lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Saturday 20 Nov 2010
3:08 am

Andrey Balan

LDEV-2608 fixed Adding new topics in monitor doesn't affects the topics in learner

Options
    • -0
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -0
    • +2
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
    • -1
    • +16
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
Thursday 18 Nov 2010
11:34 pm

Andrey Balan

LDEV-2609 fixed error on replying to a message in learner

Options
    • -0
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
9:20 pm

Andrey Balan

LDEV-2545 updating summary page in monitoring

*merge from lams2_3_release

Options
    • -0
    • +34
    /lams_tool_forum/web/jsps/monitoring/summary.jsp
6:44 am

Marcin Cieslak

LDEV-2601: An attempt to fix Chrome ignoring CSS width.

Options
    • -1
    • +3
    /lams_tool_nb/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_tool_notebook/web/WEB-INF/tags/CKEditor.tag
6:28 am

Marcin Cieslak

LDEV-2595: As CSS parameter "display: none" does not work in IE, the initial textarea for CKEditor has height = 0px which does the trick instead.

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_gradebook/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_learning/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_monitoring/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_openid/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_tool_images/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
    • -1
    • +1
    /lams_tool_laqa/web/WEB-INF/tags/CKEditor.tag
  16. … 13 more files in changeset.
4:22 am

Andrey Balan

LDEV-2603 fixed Exporting sequences error due to PNG creation

*merge from lams2_3_release

Options
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGConstants.java
    • -97
    • +126
    /lams_common/src/java/org/lamsfoundation/lams/util/svg/SVGGenerator.java
3:45 am

Andrey Balan

LDEV-2603 adding tool's images that will be used for SVG creation

*merging from lams2_3_release

Options
    • binary
    /lams_central/web/images/svg/icon_assessment.png
    • binary
    /lams_central/web/images/svg/icon_branching.png
    • binary
    /lams_central/web/images/svg/icon_chat.png
    • binary
    /lams_central/web/images/svg/icon_daco.png
    • binary
    /lams_central/web/images/svg/icon_dimdim.png
    • binary
    /lams_central/web/images/svg/icon_dotLRNForum.png
    • binary
    /lams_central/web/images/svg/icon_eAdventure2.png
    • binary
    /lams_central/web/images/svg/icon_forum.png
    • binary
    /lams_central/web/images/svg/icon_forum_and_scribe.png
    • binary
    /lams_central/web/images/svg/icon_gate.png
    • binary
    /lams_central/web/images/svg/icon_gmap.png
    • binary
    /lams_central/web/images/svg/icon_grouping.png
    • binary
    /lams_central/web/images/svg/icon_groupreporting.png
    • binary
    /lams_central/web/images/svg/icon_htmlnb.png
    • binary
    /lams_central/web/images/svg/icon_imageGallery.png
  16. … 16 more files in changeset.
Wednesday 17 Nov 2010
1:27 am

angel.dba

Add gradebook support Add outputs language strings Fix problem with eAdventure Var Type

Options
    • -0
    • +11
    /lams_tool_eadventure/.classpath
    • -1
    • +9
    /lams_tool_eadventure/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +2
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/EadventureConstants.java
    • -0
    • +2
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/EadventureParamDAO.java
    • -3
    • +14
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dao/hibernate/EadventureParamDAOHibernate.java
    • -0
    • +3
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/eadventureApplicationContext.xml
    • -29
    • +65
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureOutputFactory.java
    • -16
    • +31
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
    • -2
    • +10
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/AuthoringAction.java
    • -4
    • +3
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/AuthoringEadventureConditionAction.java
    • -8
    • +1
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java
    • -1
    • +2
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/servlet/VarsExchangeServlet.java
Tuesday 16 Nov 2010
1:49 am

Andrey Balan

LDEV-2551 fixing 2 problems: - when lesson gets created not all MessageSeq objects were stored in DB - Message's cascade="all-delete-orphan" Hibernate setting which prevented deletion of topics

*merge from lams2_3_release

Options
    • -1
    • +1
    /lams_tool_forum/conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/Message.hbm.xml
    • -1
    • +1
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
    • -2
    • +11
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
Monday 15 Nov 2010
7:48 pm

Andrey Balan

LDEV-2569 fixed problem with 2 ordering question on the same page

*merge from lams2_3_release

Options
    • -1
    • +3
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/ordering.jsp
Saturday 13 Nov 2010
5:30 pm

Marcin Cieslak

LDEV-2577: Modified Equation plugin so it opens an existing image.

Options
    • -12
    • +49
    /lams_central/web/ckeditor/plugins/equation_html/plugin.js
Friday 12 Nov 2010
10:45 pm

erniegx <ernieg@gmail.com>

Adding Catalan

Options
    • -0
    • +14
    /lams_build/librarypackages/chatscribe/language/lams/ApplicationResources_ca_ES.properties
    • -0
    • +14
    /lams_build/librarypackages/forumscribe/language/lams/ApplicationResources_ca_ES.properties
    • -0
    • +14
    /lams_build/librarypackages/shareresourcesforum/language/lams/ApplicationResources_ca_ES.properties
10:38 pm

erniegx <ernieg@gmail.com>

Adding Maori

Options
    • -0
    • +246
    /lams_tool_assessment/conf/language/lams/ApplicationResources_mi_NZ.properties
Wednesday 10 Nov 2010
9:38 pm

erniegx <ernieg@gmail.com>

LDEV-2599: set URIEncoding to UTF-8

Options
    • -1
    • +1
    /lams_build/conf/unix/jboss/jbossweb/server.xml
    • -1
    • +1
    /lams_build/conf/windows/jboss/jbossweb/server.xml
9:23 am

angel.dba

Fix problems with vars - language files - multiple frames in eAdventure window at learner view

Options
    • -0
    • +1
    /lams_tool_eadventure/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/model/EadventureItemVisitLog.java
    • -1
    • +88
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/model/EadventureVars.java
    • -8
    • +14
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
    • -1
    • +1
    /lams_tool_eadventure/web/pages/learningobj/mainframe.jsp
2:24 am

Marcin Cieslak

LDEV-2600: Committed missing changes for Paint plugin.

Options
    • -2
    • +2
    /lams_central/web/ckeditor/plugins/paint/content.jsp
    • -9
    • +14
    /lams_central/web/ckeditor/plugins/paint/plugin.js
Monday 08 Nov 2010
7:52 pm

Andrey Balan

LDEV-2562 Summary page in Learner shows other people's submissions now

*merge from lams2_3_release

Options
    • -4
    • +2
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/DacoAnswerDAO.java
    • -8
    • +0
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java
    • -0
    • +8
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/model/DacoAnswer.hbm.xml
    • -1
    • +7
    /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java
7:28 pm

Andrey Balan

LDEV-2597 added Ability to export course gradebook into excel

*merge from lams2_3_release

Options
    • -0
    • +46
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -0
    • +9
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -0
    • +36
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java
    • -0
    • +7
    /lams_gradebook/web/gradebookCourseMonitor.jsp
1:14 am

Marcin Cieslak

LDEV-2577: Readded Paint plugin.

Options
    • binary
    /lams_central/web/ckeditor/plugins/paint/CK Paint.swf
    • -0
    • +64
    /lams_central/web/ckeditor/plugins/paint/content.jsp
    • binary
    /lams_central/web/ckeditor/plugins/paint/icon.png
    • -0
    • +22
    /lams_central/web/ckeditor/plugins/paint/lang/en.js
    • -0
    • +43
    /lams_central/web/ckeditor/plugins/paint/plugin.js
    • -0
    • +5
    /lams_central/web/ckeditor/plugins/paint/swfobject.js
    • -1
    • +1
    /lams_central/web/includes/javascript/ckconfig_custom.js
Sunday 07 Nov 2010
5:22 pm

Marcin Cieslak

LDEV-2577: Removed some unnecessary code.

Options
    • -2
    • +1
    /lams_tool_wiki/web/wikilink/plugin.js
4:40 pm

Marcin Cieslak

LDEV-2577: Added a new version of equation plugin. This version requires a connection to the plugin's home page.

Options
    • binary
    /lams_central/web/ckeditor/plugins/equation_html/equation.gif
    • -0
    • +4
    /lams_central/web/ckeditor/plugins/equation_html/lang/en.js
    • -0
    • +67
    /lams_central/web/ckeditor/plugins/equation_html/plugin.js
    • -1
    • +1
    /lams_central/web/includes/javascript/ckconfig_custom.js
Friday 05 Nov 2010
8:32 am

Andrey Balan

LDEV-2548 Ability for a course manager to see *all* lessons...

*merge from lams2_3_release

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_central/conf/xdoclet/web-security.xml
8:19 am

Andrey Balan

LDEV-2548 Ability for a course manager to see *all* lessons...

*merge from lams2_3_release

Options
    • -3
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -1
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java
    • -0
    • +15
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
    • -3
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -3
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -3
    • +10
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
4:24 am

Marcin Cieslak

LDEV-2596: Forcing CKEditor be reinitialized after AJAX form submit.

Options
    • -17
    • +26
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +28
    /lams_central/web/WEB-INF/tags/CKEditor.tag
    • -0
    • +5
    /lams_central/web/includes/javascript/pedagogicalPlanner.js
    • -17
    • +27
    /lams_gradebook/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_learning/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_monitoring/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_openid/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_assessment/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_chat/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_daco/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_dimdim/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_forum/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_gmap/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_images/web/WEB-INF/tags/CKEditor.tag
    • -17
    • +27
    /lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag
  16. … 14 more files in changeset.
Wednesday 03 Nov 2010
6:16 am

angel.dba

LDEV-2587

Uploading e-Adventure project to head

Options
    • -0
    • +15
    /lams_tool_eadventure/.classpath
    • -0
    • +3
    /lams_tool_eadventure/.cvsignore
    • -0
    • +43
    /lams_tool_eadventure/.project
    • -0
    • +60
    /lams_tool_eadventure/axisclient.properties
    • -0
    • +71
    /lams_tool_eadventure/axisservice.properties
    • -0
    • +25
    /lams_tool_eadventure/build.properties
    • -0
    • +509
    /lams_tool_eadventure/build.xml
    • -0
    • +1
    /lams_tool_eadventure/conf/hibernate/mappings/.cvsignore
    • -0
    • +13
    /lams_tool_eadventure/conf/hibernate/mappings/hibernate.cfg.xml
    • -0
    • +4
    /lams_tool_eadventure/conf/jar/META-INF/MANIFEST.MF
    • -0
    • +198
    /lams_tool_eadventure/conf/language/lams/ApplicationResources.properties
    • -0
    • +215
    /lams_tool_eadventure/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +171
    /lams_tool_eadventure/conf/language/rams/ApplicationResources.properties
    • -0
    • +171
    /lams_tool_eadventure/conf/language/rams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_eadventure/conf/war/META-INF/MANIFEST.MF
  16. … 236 more files in changeset.
Tuesday 02 Nov 2010
11:26 pm

Andrey Balan

LDEV-2579 saving conditionList when editing activity in monitor

Options
    • -2
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
    • -6
    • +6
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
    • -1
    • +9
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
8:26 pm

Andrey Balan

LDEV-2524 fixed jsps from HEAD branch

*it also includes fix for expanding window on adding new questions.

which is caused by CKEditor and this fix should be removed once CKeditor will start working correct

Options
    • -1
    • +1
    /lams_tool_laqa/web/authoring/BasicContent.jsp
    • -9
    • +0
    /lams_tool_laqa/web/authoring/editQuestionBox.jsp
    • -18
    • +2
    /lams_tool_laqa/web/authoring/newQuestionBox.jsp
7:06 am

Andrey Balan

LDEV-2489 Added a checkbox to the configure learners/staff popup that will check/uncheck all other boxes. Also investigated sorting and paging of the table.

*merge from lams2_3_release

Options
    • -0
    • +2
    /lams_admin/web/organisation/cloneStart.jsp
    • -21
    • +81
    /lams_admin/web/organisation/parts/selectLearners.jsp
    • -21
    • +78
    /lams_admin/web/organisation/parts/selectStaff.jsp
Monday 01 Nov 2010
8:27 pm

fmalikoff

Merging changes from 2.3 release branch for LDEV-2524.

Options
    • -1
    • +1
    /lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml
    • -0
    • +10
    /lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml
    • -0
    • +1
    /lams_tool_laqa/db/sql/create_lams_tool_qa.sql
    • -0
    • +9
    /lams_tool_laqa/db/sql/updatescripts/updateTo20101022.sql
    • -21
    • +4
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java
    • -15
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralMonitoringDTO.java
    • -1
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java
    • -2
    • +2
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java
    • -1
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConditionDTO.java
    • -17
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java
    • -26
    • +22
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java
    • -1
    • +32
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java
    • -11
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
    • -102
    • +43
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java
    • -11
    • +6
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
  16. … 15 more files in changeset.
8:19 pm

fmalikoff

Merging changes from 2.3 release branch. Working on bugs LDEV-2524, LDEV-2578, LDEV-2581

Options
    • -1
    • +1
    /lams_tool_laqa/build.properties
    • -32
    • +96
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java