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 Jan 2017
4:57 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4200: Adding start and finish dates for lessons and activities to teacher's gradebook screens.

Options
    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • -1
    • +2
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -9
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -21
    • +5
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBLessonGridRowDTO.java
    • -19
    • +8
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -0
    • +24
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GradebookGridRowDTO.java
    • -47
    • +80
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -6
    • +7
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -9
    • +9
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java
    • -34
    • +54
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -46
    • +64
    /lams_gradebook/web/gradebookMonitor.jsp
    • -4
    • +0
    /lams_gradebook/web/includes/css/gradebook.css
4:52 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4200: Increasing width of the gradebook windows to accomodate start and finish date columns.

Options
    • -2
    • +2
    /lams_central/web/includes/javascript/main.js
3:24 pm

Andrey Balan

LDEV-4196 Added new options to allow multiple leaders

Options
    • -0
    • +8
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml
    • -0
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql
    • -2
    • +0
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -0
    • +8
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranUserDAO.java
    • -0
    • +7
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
    • -0
    • +14
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -5
    • +0
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java
    • -26
    • +111
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -2
    • +33
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -31
    • +22
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
    • -0
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java
    • -0
    • +13
    /lams_tool_doku/web/pages/authoring/advance.jsp
    • -0
    • +17
    /lams_tool_doku/web/pages/monitoring/advanceoptions.jsp
3:24 pm

Andrey Balan

LDEV-4196 Added new options to allow multiple leaders

Options
    • -0
    • +8
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml
    • -0
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql
    • -2
    • +0
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -0
    • +8
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DokumaranUserDAO.java
    • -0
    • +7
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java
    • -0
    • +14
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -5
    • +0
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java
    • -26
    • +111
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -2
    • +33
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -31
    • +22
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
    • -0
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/form/DokumaranForm.java
    • -0
    • +13
    /lams_tool_doku/web/pages/authoring/advance.jsp
    • -0
    • +17
    /lams_tool_doku/web/pages/monitoring/advanceoptions.jsp
3:15 pm

erniegx <ernieg@gmail.com>

LDEV-4201: remove feedback formatting from questions

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/markandpenaltyarea.jsp
    • -12
    • +3
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -11
    • +2
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/numerical.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp
    • -3
    • +3
    /lams_tool_assessment/web/pages/learning/parts/truefalse.jsp
Tuesday 24 Jan 2017
9:27 pm

Marcin Cieslak

LDEV-4198: Re-committing Fiona's changes: Do not try to get the Floating Activity URL for the progress bar. It does not exist and just results in an error in the log. If isFloating = true then we have come from the progress bar, if isFloating = false we have come from elsewhere in the system and we should get the "broken progress" screen just in case LAMS does try to show to floating activity somewhere.

Options
    • -2
    • +7
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
9:25 pm

Marcin Cieslak

LDEV-4175: Do not put DB entities (LearnerProgress, Activity) into request as this can cause problems. Better stick to IDs as parameters.

Options
    • -2
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -2
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -4
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -8
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -7
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -13
    • +10
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -2
    • +0
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
    • -15
    • +7
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -82
    • +14
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
8:46 pm

Andrey Balan

LDEV-4196 Create document collaboration tool

Options
    • -51
    • +0
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/util/CreatePadThread.java
8:46 pm

Andrey Balan

LDEV-4196 Create document collaboration tool

Options
    • -51
    • +0
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/util/CreatePadThread.java
8:06 pm

Marcin Cieslak

LDEV-4197: Use exact methods (insert, update) instead of a general one (save) in order to detect double save.

Options
    • -1
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/DAO.java
    • -10
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
5:45 pm

Andrey Balan

LDEV-4196 Create document collaboration tool

Options
    • -0
    • +8
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml
    • -0
    • +9
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml
    • -0
    • +8
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml
    • -0
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +5
    /lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql
    • -1
    • +5
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -0
    • +19
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -1
    • +22
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java
    • -0
    • +15
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java
    • -43
    • +199
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -8
    • +6
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -3
    • +11
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
    • -32
    • +20
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java
    • -15
    • +23
    /lams_tool_doku/web/pages/authoring/advance.jsp
    • -3
    • +4
    /lams_tool_doku/web/pages/learning/learning.jsp
5:45 pm

Andrey Balan

LDEV-4196 Create document collaboration tool

Options
    • -0
    • +8
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml
    • -0
    • +9
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml
    • -0
    • +8
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml
    • -0
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +5
    /lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql
    • -1
    • +5
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -0
    • +19
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -1
    • +22
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java
    • -0
    • +15
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java
    • -43
    • +199
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -8
    • +6
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -3
    • +11
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
    • -32
    • +20
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java
    • -15
    • +23
    /lams_tool_doku/web/pages/authoring/advance.jsp
    • -3
    • +4
    /lams_tool_doku/web/pages/learning/learning.jsp
Monday 23 Jan 2017
12:50 pm

erniegx <ernieg@gmail.com>

LDEV-4055: fixed label

Options
    • -1
    • +1
    /lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
    • -1
    • +1
    /lams_tool_larsrc/web/pages/learning/addurl.jsp
9:51 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4198: Do not try to get the Floating Activity URL for the progress bar. It does not exist and just results in an error in the log. If isFloating = true then we have come from the progress bar, if isFloating = false we have come from elsewhere in the system and we should get the "broken progress" screen just in case LAMS does try to show to floating activity somewhere.

Options
    • -2
    • +7
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
8:55 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4191: Bootstrapping.

Options
    • -12
    • +9
    /lams_monitoring/web/complexProgress.jsp
Friday 20 Jan 2017
10:51 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4183: notifyCloseURL was not being passed on when the authoring window was reopened for editing, so the special lesson launch and window close code was not being triggered.

Options
    • -0
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java
8:54 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4192: Make activities within complex activities appear in Gradebook.

Options
    • -14
    • +20
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBActivityGridRowDTO.java
    • -57
    • +172
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Wednesday 18 Jan 2017
12:44 pm

Andrey Balan

LDEV-4196 Comment out the document collaboration tool from the list of LAMS tools

Options
    • -4
    • +4
    /lams_build/build.xml
Tuesday 17 Jan 2017
9:19 pm

Marcin Cieslak

LDEV-4187: Open new session on Presence Chat websocket thread run.

Options
    • -7
    • +10
    /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
10:23 am

Andrey Balan

LDEV-4196 Create document collaboration tool

Options
    • -0
    • +1
    /lams_build/3rdParty.userlibraries
    • -1
    • +15
    /lams_build/build.xml
    • -0
    • +1
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • binary
    /lams_build/lib/json/json-simple-1.1.1.jar
    • -0
    • +29
    /lams_build/lib/json/json-simple.module.xml
    • -0
    • +2
    /lams_build/liblist.txt
Monday 16 Jan 2017
11:36 pm

Andrey Balan

LDEV-4196 Create document collaboration tool

Options
    • binary
    /lams_central/web/images/svg/icon_dokumaran.png
    • -0
    • +1
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
11:28 pm

Andrey Balan

LDEV-4196 Create document collaboration tool

Options
    • -0
    • +30
    /lams_tool_doku/.classpath
    • -0
    • +2
    /lams_tool_doku/.cvsignore
    • -0
    • +19
    /lams_tool_doku/.project
    • -0
    • +7
    /lams_tool_doku/build.properties
    • -0
    • +7
    /lams_tool_doku/build.xml
    • -0
    • +152
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml
    • -0
    • +58
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.hbm.xml
    • -0
    • +110
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml
    • -0
    • +100
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml
    • -0
    • +0
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
    • -0
    • +75
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +78
    /lams_tool_doku/db/sql/activity_insert.sql
    • -0
    • +83
    /lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql
    • -0
    • +2
    /lams_tool_doku/db/sql/db_version_insert.sql
    • -0
    • +10
    /lams_tool_doku/db/sql/drop_lams_tool_dokumaran.sql
  16. … 124 more files in changeset.
11:28 pm

Andrey Balan

LDEV-4196 Create document collaboration tool

Options
    • -0
    • +30
    /lams_tool_doku/.classpath
    • -0
    • +2
    /lams_tool_doku/.cvsignore
    • -0
    • +19
    /lams_tool_doku/.project
    • -0
    • +7
    /lams_tool_doku/build.properties
    • -0
    • +7
    /lams_tool_doku/build.xml
    • -0
    • +152
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml
    • -0
    • +58
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.hbm.xml
    • -0
    • +110
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml
    • -0
    • +100
    /lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml
    • -0
    • +0
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
    • -0
    • +75
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +78
    /lams_tool_doku/db/sql/activity_insert.sql
    • -0
    • +83
    /lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql
    • -0
    • +2
    /lams_tool_doku/db/sql/db_version_insert.sql
    • -0
    • +10
    /lams_tool_doku/db/sql/drop_lams_tool_dokumaran.sql
  16. … 124 more files in changeset.
Friday 13 Jan 2017
2:56 pm

Andrey Balan

LDEV-4190 Use LAMS course groups in case monitor comes from integrations (thus prohibit importing them from LMS)

Options
    • -21
    • +22
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
2:05 pm

Andrey Balan

LDEV-4195 Fixed exception on opening dialog "Mapping course groups to branching groups"

Options
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
Thursday 12 Jan 2017
2:45 pm

Marcin Cieslak

LDEV-4187: Add missing classpath entry to silence Eclipse error.

Options
    • -0
    • +5
    /lams_learning/.classpath
Wednesday 11 Jan 2017
10:54 pm

erniegx <ernieg@gmail.com>

LDEV-4187: Reprocess the learner progress for a lesson, basing any missing entries from data gathered from the related tool or system activity.

Options
    • binary
    /lams_build/lib/lams/lams.jar
7:29 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4187: Get an learner's status from the tool for a particular tool session, which can be used to regenerate learner progress.

Options
    • -0
    • +5
    /lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/service/DimdimService.java
7:20 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4187: Get an learner's status from the tool for a particular tool session, which can be used to regenerate learner progress.

Options
    • -0
    • +6
    /lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
    • -0
    • +6
    /lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/service/VideoRecorderService.java
5:00 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4187: Reprocess the learner progress for a lesson, basing any missing entries from data gathered from the related tool or system activity.

Options
    • -0
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -0
    • +7
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -0
    • +184
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -0
    • +218
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/RepopulateProgressMarksServlet.java
    • -0
    • +12
    /lams_learning/web/WEB-INF/web.xml