lams

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 33
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 4,779,243
Net change in LoC this week: 0

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 28 Sep 2013
1:16 am

Andrey Balan

LKC-29 Auto-save for Assessment

Options
    • -1
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_assessment/conf/xdoclet/struts-actions.xml
    • -0
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -4
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -8
    • +20
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -29
    • +67
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -11
    • +41
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -2
    • +5
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
Thursday 26 Sep 2013
6:26 pm

Marcin Cieslak

LDEV-3030: Allow Force Complete for users who finished a lesson and are displayed as a list instead of icons.

Options
    • -4
    • +3
    /lams_monitoring/web/includes/javascript/monitorLesson.js
Wednesday 25 Sep 2013
6:56 pm

Marcin Cieslak

LDEV-3125: Set min/max nominations not when Advanced tab is selected, but when any changes are done in item list.

Options
    • -31
    • +28
    /lams_tool_vote/web/authoring/AuthoringMaincontent.jsp
    • -0
    • +2
    /lams_tool_vote/web/authoring/itemlist.jsp
6:08 pm

Marcin Cieslak

LDEV-3120: Correctly detect default groups in chosen grouping and get rid of them if a course grouping is about to be used.

Options
    • -20
    • +55
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +1
    /lams_central/web/orgGroup.jsp
    • -6
    • +24
    /lams_central/web/includes/javascript/orgGroup.js
    • -31
    • +34
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
12:49 am

Andrey Balan

LKC-22 After submission, only display the a % score and output from *all* groups' notebook

Options
    • -2
    • +4
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_scratchie/conf/xdoclet/struts-actions.xml
    • -3
    • +2
    /lams_tool_scratchie/db/sql/create_lams_tool_scratchie.sql
    • -3
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java
    • -0
    • +13
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130923.sql
    • -1
    • +9
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/ReflectDTO.java
    • -15
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -11
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -42
    • +21
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -22
    • +55
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -2
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
    • -7
    • +0
    /lams_tool_scratchie/web/pages/authoring/advance.jsp
    • -12
    • +3
    /lams_tool_scratchie/web/pages/learning/learning.jsp
  16. … 5 more files in changeset.
Tuesday 24 Sep 2013
9:47 pm

Marcin Cieslak

LDEV-3120: Use course groups in lessons.

Options
    • -4
    • +7
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -87
    • +229
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -33
    • +56
    /lams_central/web/orgGroup.jsp
    • -68
    • +41
    /lams_central/web/orgGrouping.jsp
    • -5
    • +19
    /lams_central/web/css/orgGroup.css
    • -0
    • +41
    /lams_central/web/css/orgGrouping.css
    • -31
    • +221
    /lams_central/web/includes/javascript/orgGroup.js
    • -0
    • +35
    /lams_central/web/includes/javascript/orgGrouping.js
    • -4
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -459
    • +598
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -114
    • +34
    /lams_monitoring/web/grouping/chosenGrouping.jsp
    • -0
    • +154
    /lams_monitoring/web/grouping/chosenGroupingFlash.jsp
6:58 pm

Andrey Balan

LKC-20 escape users' notebook entry to be able to display it in jqgrid

Options
    • -2
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Friday 20 Sep 2013
11:59 pm

Andrey Balan

LDEV-3122 Stretchable jq-grids for Assessment monitor

Options
    • -7
    • +21
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
11:48 pm

Andrey Balan

LDEV-3122 Stretchable jq-grids for MCQ monitor

Options
    • -3
    • +18
    /lams_tool_lamc/web/monitoring/SummaryContent.jsp
11:11 pm

Andrey Balan

LKC-31 Display in Monitor summary only the leader's name for group

Options
    • -2
    • +7
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -8
    • +15
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java
10:13 pm

Andrey Balan

LKC-20 some improvements for the monitor view in Scratchie

1) make the answers jqgrid width=100%

2) Each student's feedback show also be in a jqgrid

Options
    • -18
    • +46
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
Thursday 19 Sep 2013
3:57 pm

Marcin Cieslak

LDEV-3124: Allow multiple activity monitor pop ups.

Options
    • -1
    • +5
    /lams_central/web/includes/javascript/progressBar.js
    • -3
    • +3
    /lams_monitoring/web/includes/javascript/monitorLesson.js
1:42 am

Ernie Ghiglione

LDEV-3119 LDEV-3070 adding labels

Options
    • -2
    • +27
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +27
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +27
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
12:31 am

Marcin Cieslak

LDEV-3119: Add course-level groupings.

Options
    • binary
    /lams_build/lib/lams/lams-central.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -72
    • +249
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -28
    • +35
    /lams_central/web/orgGroup.jsp
    • -0
    • +97
    /lams_central/web/orgGrouping.jsp
    • -0
    • +11
    /lams_central/web/css/defaultHTML.css
    • -6
    • +26
    /lams_central/web/css/orgGroup.css
    • -3
    • +28
    /lams_central/web/includes/javascript/groupDisplay.js
    • -10
    • +20
    /lams_central/web/includes/javascript/orgGroup.js
    • -0
    • +1
    /lams_common/build.xml
    • binary
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040021.sql
    • -12
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationGroup.java
    • -0
    • +129
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationGrouping.java
    • -2
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -16
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
12:24 am

Ernie Ghiglione

LDEV-3002: Groups are now called Courses

Options
    • -178
    • +177
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -176
    • +176
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -25
    • +6
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -6
    • +6
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
Wednesday 18 Sep 2013
1:52 am

Andrey Balan

LKC-21 Scratchie by default to push total mark to gradebook

Options
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
1:50 am

Andrey Balan

LKC-23 When changing a mark for leader, the mark should be propagated to all students within the group

Options
    • -2
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionResultDAO.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -5
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -12
    • +16
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
12:23 am

Marcin Cieslak

LDEV-3119: Add course-level groups.

Options
    • binary
    /lams_build/lib/lams/lams-central.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +12
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -0
    • +179
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +2
    /lams_central/web/main.jsp
    • -0
    • +98
    /lams_central/web/orgGroup.jsp
    • -0
    • +95
    /lams_central/web/css/orgGroup.css
    • -0
    • +33
    /lams_central/web/includes/javascript/groupDisplay.js
    • -0
    • +286
    /lams_central/web/includes/javascript/orgGroup.js
    • -0
    • +2
    /lams_common/build.xml
    • binary
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040021.sql
    • -0
    • +130
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationGroup.java
    • -1
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -1
    • +36
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -18
    • +33
    /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
    • -24
    • +10
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
Tuesday 17 Sep 2013
12:52 pm

Andrey Balan

LKC-28 Ability to modify marks in monitor

Options
    • -0
    • +1
    /lams_tool_scratchie/.classpath
    • -1
    • +5
    /lams_tool_scratchie/conf/xdoclet/struts-actions.xml
    • -1
    • +5
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -2
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -0
    • +13
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130912.sql
    • -10
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -4
    • +7
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -5
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -30
    • +86
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -4
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -5
    • +23
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -0
    • +90
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/PopulateMarksServlet.java
    • -0
    • +10
    /lams_tool_scratchie/web/WEB-INF/web.xml
    • -1
    • +1
    /lams_tool_scratchie/web/pages/export/parts/exportTeacher.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/monitoring/statistic.jsp
    • -13
    • +42
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
12:46 pm

Andrey Balan

LKC-28 updated jqgrid to the latest as there was a problem with Grid scrolls to top after selecting a cell

Options
    • -40
    • +47
    /lams_central/web/css/jquery.jqGrid.css
    • -490
    • +501
    /lams_central/web/includes/javascript/jquery.jqGrid.js
    • -4
    • +3
    /lams_central/web/includes/javascript/jquery.jqGrid.locale-en.js
Friday 13 Sep 2013
2:47 pm

Marcin Cieslak

LDEV-3121: Extract group ID from the right container.

Options
    • -5
    • +4
    /lams_central/web/includes/javascript/groupDisplay.js
7:17 am

Ernie Ghiglione

LDEV-3073: Updating English and Spanish

Options
    • -2
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
2:11 am

Ernie Ghiglione

LDEV-3073 LDEV-3026: Updating Norwegian, Greek, English and Spanish

Options
    • -4
    • +4
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_learning/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    /lams_learning/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +4
    /lams_learning/conf/language/lams/ApplicationResources_no_NO.properties
2:08 am

Ernie Ghiglione

LDEV-3073: Updating Norwegian

Options
    • -4
    • +3
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -3
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_laqa/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_nb/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_pixlr/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_survey/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_vote/conf/language/lams/ApplicationResources_no_NO.properties
2:07 am

Ernie Ghiglione

LDEV-3073: Updating Greek and Norwegian

Options
    • -2
    • +8
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
    • -6
    • +6
    /lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +19
    /lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +8
    /lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties
Tuesday 10 Sep 2013
4:32 pm

Marcin Cieslak

LDEV-3115: Use jQuery draggable for Activity templates, so they can be separated from main canvas. Add transition drawing.

Options
    • binary
    /lams_build/lib/lams/lams-central.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -55
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/dto/ToolDTO.java
    • -1
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -2
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -0
    • +77
    /lams_central/src/java/org/lamsfoundation/lams/web/AuthoringAction.java
    • -36
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -3
    • +58
    /lams_central/web/author2.jsp
    • -1
    • +1
    /lams_central/web/main.jsp
    • -57
    • +191
    /lams_central/web/includes/javascript/authoring.js
    • -1
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
    • -1
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -0
    • +58
    /lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java
    • -0
    • +33
    /lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTONameComparator.java
Monday 09 Sep 2013
2:21 pm

Marcin Cieslak

LDEV-3112: Make "copy-tags" target only standard set of tools. Manually update LAMS tld file in other tools.

Options
    • -1
    • +3
    /lams_build/build.xml
    • -1
    • +2
    /lams_build/shared.properties
    • -45
    • +6
    /lams_tool_scratchie/web/WEB-INF/tlds/lams/lams.tld
Saturday 07 Sep 2013
10:07 pm

Ernie Ghiglione

LDEV-3118 turning single activity lessons ON by default

Options
    • binary
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040017.sql
5:01 am

Ernie Ghiglione

LDEV-3107: scratchie icons

Options
    • binary
    /lams_tool_scratchie/web/images/icon_scratchie.ai
    • binary
    /lams_tool_scratchie/web/images/icon_scratchie.png
    • -0
    • +135
    /lams_tool_scratchie/web/images/icon_scratchie.svg
    • binary
    /lams_tool_scratchie/web/images/icon_scratchie.swf
    • -0
    • +135
    /lams_tool_scratchie/web/images/icon_scratchie_16.svg
Friday 06 Sep 2013
11:25 pm

Andrey Balan

LDEV-3117 record mark changes done in tools with audit service

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -87
    • +92
    /lams_common/src/java/org/lamsfoundation/lams/util/audit/AuditService.java
    • -46
    • +84
    /lams_common/src/java/org/lamsfoundation/lams/util/audit/IAuditService.java
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -1
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java