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
Wednesday 25 Sep 2013
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
    • -19
    • +54
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -6
    • +24
    /lams_central/web/includes/javascript/orgGroup.js
    • -1
    • +1
    /lams_central/web/orgGroup.jsp
    • -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
    • -2
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.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
    • -14
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -10
    • +1
    /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
    • -21
    • +54
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -1
    • +0
    /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
    • -15
    • +5
    /lams_tool_scratchie/web/pages/learning/notebook.jsp
  16. … 4 more files in changeset.
Tuesday 24 Sep 2013
9:47 pm

Marcin Cieslak

LDEV-3120: Use course groups in lessons.

Options
    • -3
    • +6
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -87
    • +229
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -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
    • -33
    • +56
    /lams_central/web/orgGroup.jsp
    • -67
    • +40
    /lams_central/web/orgGrouping.jsp
    • -3
    • +3
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -449
    • +588
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java
    • -113
    • +33
    /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
    • -1
    • +3
    /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
    • -1
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -7
    • +14
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -1
    • +1
    /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

erniegx <ernieg@gmail.com>

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:33 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
    • -70
    • +247
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -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
    • -28
    • +35
    /lams_central/web/orgGroup.jsp
    • -0
    • +97
    /lams_central/web/orgGrouping.jsp
    • -0
    • +1
    /lams_common/build.xml
    • -3
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040021.sql
    • -11
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationGroup.java
    • -0
    • +129
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationGrouping.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -15
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
12:25 am

erniegx <ernieg@gmail.com>

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-23 When changing a mark for leader, the mark should be propagated to all students within the group

Options
    • -1
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentQuestionResultDAO.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -4
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -2
    • +2
    /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
1:52 am

Andrey Balan

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

Options
    • -1
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.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
    • -0
    • +11
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -0
    • +179
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -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
    • -1
    • +2
    /lams_central/web/main.jsp
    • -0
    • +98
    /lams_central/web/orgGroup.jsp
    • -0
    • +2
    /lams_common/build.xml
    • -0
    • +29
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040021.sql
    • -0
    • +130
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/OrganisationGroup.java
    • -0
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/IUserManagementService.java
    • -0
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
    • -18
    • +33
    /lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java
    • -23
    • +9
    /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
    • -0
    • +4
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +13
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130912.sql
    • -9
    • +13
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieUser.java
    • -2
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -3
    • +6
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -4
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -29
    • +85
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -3
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -4
    • +22
    /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

erniegx <ernieg@gmail.com>

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:15 am

erniegx <ernieg@gmail.com>

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:12 am

erniegx <ernieg@gmail.com>

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
2:11 am

erniegx <ernieg@gmail.com>

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
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
    • -0
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -1
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -0
    • +77
    /lams_central/src/java/org/lamsfoundation/lams/web/AuthoringAction.java
    • -35
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -3
    • +58
    /lams_central/web/author2.jsp
    • -55
    • +189
    /lams_central/web/includes/javascript/authoring.js
    • -1
    • +1
    /lams_central/web/main.jsp
    • -0
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java
    • -0
    • +38
    /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

erniegx <ernieg@gmail.com>

LDEV-3118 turning single activity lessons ON by default

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

erniegx <ernieg@gmail.com>

LDEV-3107: scratchie icons

Options
    • -0
    • +1900
    /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:28 pm

Andrey Balan

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

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -81
    • +86
    /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
    • -0
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
6:20 pm

Andrey Balan

LDEV-3117 Let maks indicated as done in gradebook to be rewritten several times

Options
    • -2
    • +3
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
3:37 pm

Marcin Cieslak

LDEV-3113: Update tld files after tags being removed.

Options
    • -1
    • +2
    /lams_build/build.xml
    • -0
    • +1
    /lams_build/shared.properties
    • -45
    • +6
    /lams_tool_kaltura/web/WEB-INF/tlds/lams/lams.tld
1:35 am

Andrey Balan

LDEV-3104 Improve performance for MCQ Monitor

Options
    • -0
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -1
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUsrAttemptDAO.java
    • -7
    • +7
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUsrAttemptDAO.java
    • -0
    • +24
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
    • -5
    • +160
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
    • -8
    • +10
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java
    • -227
    • +3
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
    • -19
    • +73
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
    • -117
    • +19
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/MonitoringUtil.java
    • -19
    • +3
    /lams_tool_lamc/web/monitoring/SummaryContent.jsp
    • -41
    • +16
    /lams_tool_lamc/web/monitoring/parts/advanceOptions.jsp
    • -0
    • +53
    /lams_tool_lamc/web/monitoring/parts/advanceQuestions.jsp