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 01 Feb 2017
7:58 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4204: Redirects were causing the login page to get stuck once it had failed a password or had a locked out password so changes to a forward which leaves the "referer" entry as it orginally was in the browser. Redirect appears to be needed for the two stage authentication to work properly so it was left as is.

Options
    • -10
    • +37
    /lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java
5:20 pm

Marcin Cieslak

LDEV-4210: Allow multiple users through a gate.

Options
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -3
    • +3
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -3
    • +11
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java
    • -1
    • +1
    /lams_monitoring/web/WEB-INF/struts-config.xml
    • -7
    • +10
    /lams_monitoring/web/gate/conditionGateContent.jsp
    • -16
    • +35
    /lams_monitoring/web/gate/openGateSingleUser.jsp
    • -7
    • +11
    /lams_monitoring/web/gate/permissionGateContent.jsp
1:25 pm

Marcin Cieslak

LDEV-4209: Disable Submit All, Next Activity and Finish buttons after clicking to prevent double submit.

Options
    • -5
    • +7
    /lams_tool_assessment/web/pages/learning/learning.jsp
11:12 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4206: Progress bar was missing in mobile format.

Options
    • -0
    • +1
    /lams_learning/web/lessonComplete.jsp
7:43 am

erniegx <ernieg@gmail.com>

LDEV-4023 adding missing label

Options
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
Tuesday 31 Jan 2017
11:18 pm

Andrey Balan

LDEV-4202 Fixed jQuery [value=] selector which started to work differently since jQuery 1.4.3

Options
    • -0
    • +3
    /lams_tool_assessment/web/pages/authoring/parts/addnumerical.jsp
10:09 pm

Andrey Balan

LDEV-4207 Added ability to select and use boolean type of tool outputs

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    /lams_central/web/authoring/authoring.jsp
    • -3
    • +18
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
6:25 pm

Andrey Balan

LDEV-4205 Attempt to solve the problem with setting cookies to the top level domain

Options
    • -1
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
6:25 pm

Andrey Balan

LDEV-4205 Attempt to solve the problem with setting cookies to the top level domain

Options
    • -1
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
Monday 30 Jan 2017
10:37 pm

Andrey Balan

LDEV-4205 Fixed incorrect initialization of WikiOutputFactory

Options
    • -2
    • +2
    /lams_tool_wiki/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiOutputFactory.java
    • -4
    • +0
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java
    • -0
    • +6
    /lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/wikiApplicationContext.xml
9:52 pm

Andrey Balan

LDEV-4205 Display tool output's description (i18n value) instead of currently displayed name

Options
    • -2
    • +2
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
5:00 pm

Andrey Balan

LDEV-4196 Cope with expired and close to being expired Etherpad sessions (which Etherpad regardless of their expiration date always returns)

Options
    • -36
    • +53
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -2
    • +2
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
5:00 pm

Andrey Balan

LDEV-4196 Cope with expired and close to being expired Etherpad sessions (which Etherpad regardless of their expiration date always returns)

Options
    • -36
    • +53
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -2
    • +2
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
12:13 pm

Marcin Cieslak

LDEV-4187: Make sure that even after an exception is thrown, the Hibernate session is closed. Add extra logging to verify completeActivity() failures.

Options
    • -46
    • +51
    /lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java
    • -6
    • +10
    /lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -14
    • +21
    /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
    • -66
    • +73
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -13
    • +16
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/quartz/job/EmailScheduleMessageJob.java
    • -19
    • +21
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java
    • -2
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -4
    • +5
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
Sunday 29 Jan 2017
6:56 pm

Marcin Cieslak

LDEV-3600: Fix SQL query syntax (pure SQL instead of HQL).

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
Saturday 28 Jan 2017
2:44 am

Andrey Balan

LDEV-4196 * Adding buttons in monitoring that will recover faulty sessions. * Improved timelimit feature so it opens in the same iframe * Show line numbers option. Etherpad ignores this URL parameter when it's stored in cookie so turned off checking this cookie.

Options
    • -0
    • +947
    /lams_tool_doku/conf/etherpad-lite/src/static/js/pad.js
    • -2
    • +5
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_tool_doku/readme.txt
    • -0
    • +2
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -3
    • +0
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -0
    • +9
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dto/SessionDTO.java
    • -155
    • +72
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +9
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -20
    • +3
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/util/DokumaranToolContentHandler.java
    • -0
    • +35
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java
    • -0
    • +4
    /lams_tool_doku/web/WEB-INF/struts-config.xml
    • -1
    • +13
    /lams_tool_doku/web/pages/monitoring/monitoring.jsp
    • -45
    • +80
    /lams_tool_doku/web/pages/monitoring/summary.jsp
2:44 am

Andrey Balan

LDEV-4196 * Adding buttons in monitoring that will recover faulty sessions. * Improved timelimit feature so it opens in the same iframe * Show line numbers option. Etherpad ignores this URL parameter when it's stored in cookie so turned off checking this cookie.

Options
    • -0
    • +947
    /lams_tool_doku/conf/etherpad-lite/src/static/js/pad.js
    • -2
    • +5
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_tool_doku/readme.txt
    • -0
    • +2
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/DokumaranConstants.java
    • -3
    • +0
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -0
    • +9
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dto/SessionDTO.java
    • -155
    • +72
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +9
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -20
    • +3
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/util/DokumaranToolContentHandler.java
    • -0
    • +35
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/MonitoringAction.java
    • -0
    • +4
    /lams_tool_doku/web/WEB-INF/struts-config.xml
    • -1
    • +13
    /lams_tool_doku/web/pages/monitoring/monitoring.jsp
    • -45
    • +80
    /lams_tool_doku/web/pages/monitoring/summary.jsp
Friday 27 Jan 2017
1:32 pm

Andrey Balan

LDEV-4196 Added new options to allow multiple leaders

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
    • -0
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
8:44 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4200: Changing the show/hide date link to be a button like link on the right hand side of the screen.

Options
    • -2
    • +2
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +3
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -2
    • +2
    /lams_gradebook/web/gradebookMonitor.jsp
1:07 am

Andrey Balan

LDEV-4196 * Сlose Etherpad session when user finishes activity * Use top level domain for storing cookies * Get rid of the ability of changing user names when editing pads * Remove several extra buttons from Etherpad toolbar. But show timeslider and export html buttons in monitor instead as a separate buttons * Fixed a few previous bugs

Options
    • -0
    • +444
    /lams_tool_doku/conf/etherpad-lite/src/node/utils/Settings.js
    • -0
    • +854
    /lams_tool_doku/conf/etherpad-lite/src/static/js/pad_userlist.js
    • -2
    • +5
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    /lams_tool_doku/readme.txt
    • -18
    • +48
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
    • -0
    • +6
    /lams_tool_doku/web/pages/monitoring/monitoring.jsp
    • -1
    • +40
    /lams_tool_doku/web/pages/monitoring/summary.jsp
1:07 am

Andrey Balan

LDEV-4196 * Сlose Etherpad session when user finishes activity * Use top level domain for storing cookies * Get rid of the ability of changing user names when editing pads * Remove several extra buttons from Etherpad toolbar. But show timeslider and export html buttons in monitor instead as a separate buttons * Fixed a few previous bugs

Options
    • -0
    • +444
    /lams_tool_doku/conf/etherpad-lite/src/node/utils/Settings.js
    • -0
    • +854
    /lams_tool_doku/conf/etherpad-lite/src/static/js/pad_userlist.js
    • -2
    • +5
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    /lams_tool_doku/readme.txt
    • -18
    • +48
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -1
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java
    • -0
    • +6
    /lams_tool_doku/web/pages/monitoring/monitoring.jsp
    • -1
    • +40
    /lams_tool_doku/web/pages/monitoring/summary.jsp
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