lams-github

lams_learning

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
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 18 Dec 2019
6:41 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4911 Added ids to support automated testing

Options
    • -1
    • +1
    ./web/gate/gateDescription.jsp
  2. … 1 more file in changeset.
Thursday 12 Dec 2019
12:26 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 16 more files in changeset.
Monday 09 Dec 2019
9:16 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -4
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
7:57 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating labels across all modules. Mainly Greek, Norwegian, Español and English

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 63 more files in changeset.
Wednesday 04 Dec 2019
3:44 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

# lams_monitoring/conf/language/lams/ApplicationResources.properties

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_chat/conf/language/lams/ApplicationResources.properties

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_daco/conf/language/lams/ApplicationResources.properties

# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_forum/conf/language/lams/ApplicationResources.properties

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_images/conf/language/lams/ApplicationResources.properties

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_leader/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_preview/conf/language/lams/ApplicationResources.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -8
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 34 more files in changeset.
Monday 02 Dec 2019
9:06 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

Options
    • -8
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +8
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +9
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +11
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 118 more files in changeset.
Monday 18 Nov 2019
10:30 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Conflicts:

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

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

Options
    • -5
    • +13
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -42
    • +91
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
    • -0
    • +13
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  8. … 8 more files in changeset.
Friday 15 Nov 2019
5:18 pm

Marcin Cieslak

LDEV-4900 Put websocket commands in a separate transaction

Otherwise command websocket server does not see them until main

transaction finishes.

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
5:17 pm

Marcin Cieslak

LDEV-4900 Fix websocket server run frequency

Options
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
4:10 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4900

Options
    • -26
    • +44
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
  2. … 1 more file in changeset.
Thursday 14 Nov 2019
9:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
5:30 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -26
    • +44
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
5:28 am

Andrey Balan

LDEV-4894 Fix opening group details from monitor's Learners tab

Options
    • -26
    • +44
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
Wednesday 13 Nov 2019
4:00 am

Marcin Cieslak

LDEV-4900 Run autosave command asynchronously after all

Synchronous approach would work only on LAMS installation with a single

application server. For multi-server environment we need to wait for the

proper server to pick up the command from DB.

Options
    • -58
    • +30
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -7
    • +1
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  3. … 2 more files in changeset.
3:32 am

Andrey Balan

LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

Options
    • -5
    • +13
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerFullService.java
    • -50
    • +87
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -5
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/controller/CompleteActivityController.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/controller/DisplayActivityController.java
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/controller/LessonCompleteActivityController.java
    • -3
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -40
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  11. … 51 more files in changeset.
Tuesday 12 Nov 2019
12:06 am

Marcin Cieslak

LDEV-4900 Trigger autosave when force completing Assessment activity

Options
    • -27
    • +54
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -7
    • +13
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  3. … 4 more files in changeset.
Wednesday 06 Nov 2019
9:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4887 Adding id, classes to make automated testing faster

Options
    • -1
    • +1
    ./web/lessonComplete.jsp
  2. … 8 more files in changeset.
Monday 04 Nov 2019
4:26 pm

Marcin Cieslak

LDEV-4899 Fix Kumalive rubrics saving

Options
    • -2
    • +1
    ./web/kumalive/kumaliveRubrics.jsp
Saturday 02 Nov 2019
1:41 am

Andrey Balan

LDEV-4897 Update Gradebook, Kumalive, and archived emails to use new Excel exporting methods

Options
    • -4
    • +5
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -90
    • +78
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  4. … 8 more files in changeset.
Thursday 31 Oct 2019
10:54 pm

Andrey Balan

LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java
  2. … 15 more files in changeset.
12:35 am

Andrey Balan

LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
  4. … 30 more files in changeset.
Wednesday 16 Oct 2019
3:05 am

Andrey Balan

LDEV-4882 Check lesson monitor rights correctly

Options
    • -27
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java
2:39 am

Andrey Balan

LDEV-4881 Remove notebook entries from DB on lesson removal

Options
    • -32
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/controller/NotebookController.java
    • -15
    • +15
    ./web/notebook/addnew.jsp
  3. … 3 more files in changeset.
Saturday 12 Oct 2019
4:46 am

Andrey Balan

Merge branch 'master' into develop

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -102
    • +48
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
  3. … 3 more files in changeset.
2:25 am

Andrey Balan

LDEV-4878 Sanitise XSS for notes title in learner

Options
    • -38
    • +27
    ./web/notebook/addnew.jsp
    • -41
    • +21
    ./web/notebook/view.jsp
    • -31
    • +19
    ./web/notebook/viewall.jsp
    • -16
    • +13
    ./web/notebook/viewalljournals.jsp
1:43 am

Andrey Balan

LDEV-4874 Restrict displaying names for students that are not within student's group

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -101
    • +49
    ./src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java
    • -31
    • +28
    ./web/grouping/choose.jsp
    • -45
    • +48
    ./web/grouping/show.jsp
    • -4
    • +2
    ./web/grouping/wait.jsp
  6. … 4 more files in changeset.
Monday 22 Jul 2019
10:47 pm

Marcin Cieslak

LDEV-4834 Use panel-less LO widget in QB question authoring

Options
    • -1
    • +14
    ./web/WEB-INF/tags/CKEditor.tag
    • -10
    • +33
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  3. … 69 more files in changeset.
Thursday 04 Jul 2019
11:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -10
    • +19
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 50 more files in changeset.
Monday 01 Jul 2019
6:43 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into develop

Options
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java
6:41 pm

Marcin Cieslak

LDEV-3839 Check on back end if a lesson can be restarted by a learner

Options
    • -4
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java