lams-github / lams_tool_laqa / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 24
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 25 Aug 2018
1:26 pm

Andrey Balan

LDEV-4407 Other projects stop depending on lams_central

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java
    • -3
    • +2
    ./lamsfoundation/lams/tool/qa/web/action/QaAction.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java
  4. … 107 more files in changeset.
Saturday 18 Aug 2018
7:44 pm

Andrey Balan

Merge branch 'master' into LDEV-4407

Conflicts:

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

lams_central/web/css/pedagogicalPlanner.css

lams_central/web/includes/javascript/openUrls.js

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/qa/qaApplicationContext.xml
    • -10
    • +18
    ./lamsfoundation/lams/tool/qa/service/QaService.java
  3. … 102 more files in changeset.
Thursday 09 Aug 2018
10:41 am

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 JSON fix

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -2
    • +3
    ./lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java
  3. … 7 more files in changeset.
Monday 06 Aug 2018
1:09 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A autosave fix

Options
    • -7
    • +7
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
  2. … 13 more files in changeset.
Thursday 02 Aug 2018
3:28 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Scribe tool

Options
    • -1
    • +0
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -16
    • +0
    ./lamsfoundation/lams/tool/qa/web/form/QaAuthoringForm.java
    • -18
    • +0
    ./lamsfoundation/lams/tool/qa/web/form/QaLearningForm.java
    • -19
    • +0
    ./lamsfoundation/lams/tool/qa/web/form/QaMonitoringForm.java
  5. … 48 more files in changeset.
10:03 am

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A & pixlr minor fixes

Options
    • -0
    • +1183
    ./lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java
    • -1190
    • +0
    ./lamsfoundation/lams/tool/qa/web/controller/QaController.java
  3. … 1 more file in changeset.
Wednesday 01 Aug 2018
3:30 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Pixlr nostruts library

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/qa/web/controller/QaController.java
  2. … 43 more files in changeset.
1:22 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A nostruts library

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java
    • -6
    • +8
    ./lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
    • -20
    • +21
    ./lamsfoundation/lams/tool/qa/web/controller/QaController.java
    • -12
    • +11
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -4
    • +1
    ./lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/qa/web/form/QaAdminForm.java
  7. … 14 more files in changeset.
9:56 am

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A learning

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/qa/QaAppConstants.java
    • -28
    • +28
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
  3. … 8 more files in changeset.
Tuesday 31 Jul 2018
2:54 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Pixlr & Q&A fixes

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/qa/dbupdates/patch20180729.sql
    • -1
    • +1
    ./lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java
    • -2
    • +3
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -1
    • +1
    ./lamsfoundation/lams/tool/qa/web/controller/QaPedagogicalPlannerController.java
  5. … 46 more files in changeset.
9:01 am

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A learning & monitoring fixes

Options
    • -0
    • +2
    ./lamsfoundation/lams/tool/qa/web/controller/QaController.java
    • -2
    • +2
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
  3. … 2 more files in changeset.
Monday 30 Jul 2018
3:05 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A fixes

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/qa/dbupdates/patch20180729.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java
    • -4
    • +5
    ./lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java
  4. … 16 more files in changeset.
Sunday 29 Jul 2018
2:19 pm

MichalKowalski <mickowal@hotmail.com>

LDEV-4440 Q&A authoring and learning fixes

Options
    • -19
    • +0
    ./lamsfoundation/lams/tool/qa/dbupdates/patch20180726.sql
    • -0
    • +21
    ./lamsfoundation/lams/tool/qa/dbupdates/patch20180729.sql
    • -2
    • +2
    ./lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
    • -52
    • +59
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
  5. … 7 more files in changeset.
Friday 27 Jul 2018
1:40 pm

korwi <korwi@korwi-Inspiron-3542>

LDEV-4440 Shared resources monitoring fixes

Options
    • -4
    • +5
    ./lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
    • -4
    • +5
    ./lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java
  3. … 2 more files in changeset.
12:40 pm

korwi <korwi@korwi-Inspiron-3542>

LDEV-4440 Shared resource authoring & Q&A

Options
    • -5
    • +4
    ./lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
    • -81
    • +72
    ./lamsfoundation/lams/tool/qa/web/controller/QaController.java
  3. … 22 more files in changeset.
8:29 am

korwi <korwi@korwi-Inspiron-3542>

LDEV-4440 Shared resources minor fixes

Options
    • -1
    • +13
    ./lamsfoundation/lams/tool/qa/dbupdates/patch20180726.sql
  2. … 4 more files in changeset.
Thursday 26 Jul 2018
6:05 pm

korwi <korwi@korwi-Inspiron-3542>

LDEV-4440 Mysql patch

Options
    • -7
    • +0
    ./lamsfoundation/lams/tool/qa/dbupdates/patch20180425.sql
    • -0
    • +7
    ./lamsfoundation/lams/tool/qa/dbupdates/patch20180726.sql
5:27 pm

korwi <korwi@korwi-Inspiron-3542>

LDEV-4440 Q&A authoring

Options
    • -1
    • +2
    ./lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
    • -84
    • +94
    ./lamsfoundation/lams/tool/qa/web/controller/QaController.java
  3. … 4 more files in changeset.
Wednesday 25 Jul 2018
7:38 am

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 Shared resources udate

Options
    • -458
    • +458
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningStarterController.java
  2. … 1 more file in changeset.
Tuesday 24 Jul 2018
3:17 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 Share resource - work in progress, almost finished authoring

Options
    • -377
    • +372
    ./lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java
    • -442
    • +441
    ./lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
    • -1149
    • +1500
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -457
    • +458
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningStarterController.java
  5. … 7 more files in changeset.
1:27 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 Sared resources - authoring - work in progress

Options
    • -377
    • +377
    ./lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java
    • -442
    • +442
    ./lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
    • -1149
    • +1149
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
    • -457
    • +457
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningStarterController.java
    • -314
    • +314
    ./lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java
    • -224
    • +224
    ./lamsfoundation/lams/tool/qa/web/controller/QaMonitoringStarterController.java
    • -285
    • +285
    ./lamsfoundation/lams/tool/qa/web/controller/QaStarterController.java
  8. … 27 more files in changeset.
Monday 23 Jul 2018
4:46 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 Share Resources & Q&A tools.

Options
    • -52
    • +0
    ./lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java
    • -979
    • +0
    ./lamsfoundation/lams/tool/qa/web/action/QaAction.java
    • -396
    • +0
    ./lamsfoundation/lams/tool/qa/web/action/QaAdminAction.java
    • -490
    • +0
    ./lamsfoundation/lams/tool/qa/web/action/QaAuthoringConditionAction.java
    • -1170
    • +0
    ./lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java
    • -445
    • +0
    ./lamsfoundation/lams/tool/qa/web/action/QaLearningStarterAction.java
    • -310
    • +0
    ./lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java
    • -220
    • +0
    ./lamsfoundation/lams/tool/qa/web/action/QaMonitoringStarterAction.java
    • -128
    • +0
    ./lamsfoundation/lams/tool/qa/web/action/QaPedagogicalPlannerAction.java
    • -284
    • +0
    ./lamsfoundation/lams/tool/qa/web/action/QaStarterAction.java
    • -0
    • +67
    ./lamsfoundation/lams/tool/qa/web/controller/ClearSessionController.java
    • -0
    • +377
    ./lamsfoundation/lams/tool/qa/web/controller/QaAdminController.java
    • -0
    • +442
    ./lamsfoundation/lams/tool/qa/web/controller/QaAuthoringConditionController.java
    • -0
    • +975
    ./lamsfoundation/lams/tool/qa/web/controller/QaController.java
    • -0
    • +1149
    ./lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java
  16. … 58 more files in changeset.
Thursday 03 May 2018
1:26 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Rename dbupdate files as name is a month out.

Options
    • -0
    • +19
    ./lamsfoundation/lams/tool/qa/dbupdates/patch20180425.sql
    • -19
    • +0
    ./lamsfoundation/lams/tool/qa/dbupdates/patch20180525.sql
  3. … 38 more files in changeset.
Monday 30 Apr 2018
6:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Expand DB Fields to support pictures pasted in CKEditor

Options
    • -0
    • +19
    ./lamsfoundation/lams/tool/qa/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.
Friday 23 Mar 2018
7:12 pm

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -10
    • +18
    ./lamsfoundation/lams/tool/qa/service/QaService.java
    • -76
    • +21
    ./lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java
    • -31
    • +37
    ./lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java
  4. … 81 more files in changeset.
Thursday 08 Mar 2018
4:02 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4525 Fixed Reflection issues

Options
    • -77
    • +22
    ./lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java
  2. … 4 more files in changeset.
Monday 05 Mar 2018
1:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -3
    • +3
    ./lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java
  2. … 34 more files in changeset.
Thursday 22 Feb 2018
2:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -2
    • +2
    ./lamsfoundation/lams/tool/qa/service/IQaService.java
    • -10
    • +18
    ./lamsfoundation/lams/tool/qa/service/QaService.java
    • -2
    • +6
    ./lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java
  4. … 63 more files in changeset.
Tuesday 06 Feb 2018
5:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/qa/qaApplicationContext.xml
  2. … 62 more files in changeset.
Thursday 01 Feb 2018
10:41 pm

Andrey Balan

LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

Options
    • -2
    • +1
    ./lamsfoundation/lams/tool/qa/qaApplicationContext.xml
    • -7
    • +1
    ./lamsfoundation/lams/tool/qa/service/QaService.java
  3. … 57 more files in changeset.