lams-github

lams_build

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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 04 Jul 2018
11:05 pm

Andrey Balan

Merge branch 'LDEV-4620'

Options
    • binary
    ./lib/lams/lams.jar
Saturday 30 Jun 2018
7:22 am

Marcin Cieslak

LDEV-4609 Calculate dates and status for archived progress

Methods which calculate LearnerProgress dates and status use ugly

instanceof constructs. There seem to be no good alternatives, though.

LearnerProgressArchive can inherit from LearnerProgress and we use

table-per-subclass Hibernate strategy. But then queries for

LearnerProgress would fetch also LearnerProgressArchive entities unless

in each HQL query we put "WHERE lp.class = LearnerProgress". It is easy

to forget plus generic methods like findAll() will not work well anyway.

LearnerProgress and LearnerProgressArchive can extend a new

AbstractLearnerProgress and we use table-per-concrete-class Hibernate

strategy. Same with CompletedActivityProgress and

CompletedActivityProgressArchive. But then

AbstractLearnerProgress.completedActivities will not let use both of

them due to lack of polymorphism in collections. Neither

Map<Activty, AbstractCompletedActivityProgress>

nor

Map<Activity, ? extends AbstractCompletedActivityProgress>

will not work. And this collection is the main reason why to do

inheritance in the first place.

Looking how the above solutions add complexity and little gain, these

few methods with instanceof seem to be a fine trade off.

Options
    • binary
    ./lib/lams/lams-gradebook.jar
    • binary
    ./lib/lams/lams.jar
  3. … 9 more files in changeset.
Friday 29 Jun 2018
11:37 pm

Andrey Balan

Merge branch 'LDEV-4605'

Options
    • binary
    ./lib/lams/lams.jar
  2. … 1 more file in changeset.
5:24 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Almost finished authoring migration

Options
    • binary
    ./lib/lams/lams-central.jar
  2. … 22 more files in changeset.
5:14 pm

Marcin Cieslak

LDEV-4440 Show archived activity attempts in gradebook

Options
    • binary
    ./lib/lams/lams.jar
  2. … 9 more files in changeset.
2:09 pm

Michal Kowalski <mickowal@hotmail.com>

LDEV-4440 Finishing authoring migration

Options
    • binary
    ./lib/lams/lams-central.jar
    • binary
    ./lib/lams/lams.jar
  3. … 18 more files in changeset.
Thursday 28 Jun 2018
8:26 pm

Andrey Balan

Merge branch 'LDEV-4593'

Options
    • binary
    ./lib/lams/lams.jar
  2. … 5 more files in changeset.
8:41 am

Marcin Cieslak

LDEV-4609 Add archive date to gradebook marks on lesson restart

Options
    • binary
    ./lib/lams/lams.jar
  2. … 6 more files in changeset.
Sunday 24 Jun 2018
3:36 pm

Marcin Cieslak

LDEV-4402 Upgrade to MySQL 8.0.11

Options
    • -3
    • +1
    ./noStruts.userlibraries
  2. … 1 more file in changeset.
3:26 pm

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/lib/lams/lams-central.jar

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

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

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

lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag

Options
    • -1
    • +1
    ./3rdParty.userlibraries
    • binary
    ./lib/lams/lams-central.jar
    • binary
    ./lib/lams/lams-gradebook.jar
    • binary
    ./lib/lams/lams-learning.jar
    • binary
    ./lib/lams/lams-monitoring.jar
    • binary
    ./lib/lams/lams.jar
    • -1
    • +1
    ./liblist.txt
  8. … 8 more files in changeset.
2:43 pm

Marcin Cieslak

LDEV-4402 Update MySQL connector source code for version 8.0.11

Options
    • binary
    ./deploy-tool/lib/mysql-connector-java-5.1.46-bin.jar
    • binary
    ./deploy-tool/lib/mysql-connector-java-8.0.11.jar
    • binary
    ./lib/mysql/mysql-connector-java-5.1.46-bin.jar
    • binary
    ./lib/mysql/mysql-connector-java-8.0.11.jar
  5. … 751 more files in changeset.
2:43 pm

Marcin Cieslak

LDEV-4402 Upgrade to MySQL 8.0.11

This server version requires a newer connector and server time zone

settings.

Options
    • -34
    • +1
    ./3rdParty.userlibraries
    • -1
    • +4
    ./build.xml
    • -1
    • +1
    ./build_base.xml
    • -1
    • +1
    ./build_tools_base.xml
    • -2
    • +3
    ./common.properties
    • -1
    • +3
    ./conf/domain.xml
    • -1
    • +3
    ./conf/slim/standalone.xml
    • -1
    • +3
    ./conf/standalone.xml
    • -1
    • +1
    ./deploy-tool/deploy.bat
    • -1
    • +1
    ./deploy-tool/deploy.sh
    • binary
    ./deploy-tool/lib/lams-tool-deploy.jar
    • -1
    • +1
    ./lib/mysql/mysql-connector-java.module.xml
  13. … 4 more files in changeset.
2:41 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.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/web/action/McMonitoringAction.java

lams_tool_mindmap/.classpath

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

Options
    • -0
    • +1
    ./common.properties
    • binary
    ./lib/lams/lams-gradebook.jar
    • binary
    ./lib/lams/lams.jar
    • -0
    • +1
    ./unix.properties
  5. … 20 more files in changeset.
Friday 22 Jun 2018
6:42 pm

Marcin Cieslak

LDEV-4607 Remove marks on output change to "none" in monitoring

Options
    • binary
    ./lib/lams/lams-gradebook.jar
  2. … 11 more files in changeset.
Saturday 16 Jun 2018
5:16 pm

Marcin Cieslak

LDEV-4599 Enable contribution from tool activities

Options
    • binary
    ./lib/lams/lams.jar
  2. … 9 more files in changeset.
5:13 pm

Marcin Cieslak

LDEV-4599 Fix library path

Options
    • -1
    • +1
    ./3rdParty.userlibraries
Friday 15 Jun 2018
12:26 pm

Ernie Ghiglione <ernieg@gmail.com>

CLOUD-88: Ooopss

Sorry, didn't mean to commit these two files.

Options
    • -4
    • +0
    ./common.properties
    • -1
    • +0
    ./unix.properties
5:27 am

Ernie Ghiglione <ernieg@gmail.com>

CLOUD-88: removing flash tutorial video

removing flash video replace it with youtube streaming instead

Options
    • -0
    • +5
    ./common.properties
    • -0
    • +2
    ./unix.properties
  3. … 1 more file in changeset.
Friday 08 Jun 2018
10:05 am

Marcin Cieslak

LDEV-4599 Add JWT library. Set up dependencies.

If LAMS has been slimmed before deployment of this patch, it is missing

Jackson library which is needed for JWT library to work. The library can

taken from a fresh copy of WF from the following path:

<WF>modules\system\layers\base\com\fasterxml

It needs to be copied to the slimmed WF instance.

Options
    • -43
    • +44
    ./3rdParty.userlibraries
    • -3
    • +8
    ./build.xml
    • -1
    • +2
    ./conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +1
    ./lib/jdk/jdk.module.xml
    • binary
    ./lib/json/jjwt-0.9.0.jar
    • -0
    • +35
    ./lib/json/jjwt.module.xml
    • -0
    • +2
    ./liblist.txt
Saturday 02 Jun 2018
4:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4594 Turn on/off the integration learner index page block

Options
    • binary
    ./lib/lams/lams.jar
  2. … 8 more files in changeset.
Sunday 27 May 2018
6:01 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4590 Rating stars left can never be more than 5 stars

Options
    • binary
    ./lib/lams/lams.jar
Thursday 24 May 2018
11:25 pm

Andrey Balan

Merge branch 'LDEV-4589'

Options
    • binary
    ./lib/lams/lams.jar
11:19 pm

Andrey Balan

* LDEV-4589 Added few parameter names required for Deep linking

Options
    • binary
    ./lib/basiclti-util/basiclti-util-1.2.0.jar
  2. … 2 more files in changeset.
Tuesday 22 May 2018
11:59 am

Marcin Cieslak

LDEV-4587 Distinguish ordered branching by introducing a new field

The fields tells whether branching should start from highest ordered

answer (asc, true) or lowest (desc, false) or is it a plain, non-ordered

tool-based branching (null).

Options
    • binary
    ./lib/lams/lams.jar
  2. … 14 more files in changeset.
Monday 21 May 2018
1:01 pm

Marcin Cieslak

LDEV-4587 Select branch based on option order chosen by learner

A condition has a question sequence ID and an option sequence ID encoded

in its name. This way we know what output to produce. Then all outputs

are sorted and a branch which was not processed yet gets chosen.

Options
    • binary
    ./lib/lams/lams.jar
  2. … 6 more files in changeset.
Friday 18 May 2018
12:43 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

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

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

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

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

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

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

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

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

Options
    • binary
    ./lib/lams/lams.jar
  2. … 22 more files in changeset.
Tuesday 15 May 2018
9:23 pm

Andrey Balan

Merge branch 'LDEV-4583'

Options
    • binary
    ./lib/lams/lams.jar
Wednesday 09 May 2018
7:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • binary
    ./lib/lams/lams.jar
  2. … 92 more files in changeset.
Tuesday 01 May 2018
3:19 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4564 Audit log entry for Live Edit

Also fixed the learning screen that appears when a Live Edit is

in progress as it was throwing a Null Pointer Exception

Options
    • binary
    ./lib/lams/lams.jar
  2. … 6 more files in changeset.
Saturday 21 Apr 2018
12:33 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

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/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java

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

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

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

Options
    • -1
    • +1
    ./conf/slim/standalone.xml
    • -1
    • +1
    ./conf/standalone.xml
    • binary
    ./lib/lams/lams-central.jar
    • binary
    ./lib/lams/lams.jar
  5. … 17 more files in changeset.