lams-github / lams_central

src

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 06 May 2020
1:21 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_build/3rdParty.userlibraries

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

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

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

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Options
    • -3
    • +4
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -3
    • +5
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  3. … 29 more files in changeset.
Monday 04 May 2020
11:35 am

Marcin Cieslak

LDEV-5015 Replace MCQ with Assessment as iRA in TBL template

Options
    • -3
    • +4
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -6
    • +8
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  3. … 1 more file in changeset.
Wednesday 22 Apr 2020
6:02 am

Marcin Cieslak

SP-4 Allow some roles to be missing from a merged enrolment file

Options
    • -2
    • +5
    ./java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Tuesday 21 Apr 2020
4:34 pm

Marcin Cieslak

SP-4 Allow mixing different roles in a single file

Options
    • -156
    • +175
    ./java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
12:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -306
    • +306
    ./java/org/lamsfoundation/lams/web/IndexController.java
    • -623
    • +623
    ./java/org/lamsfoundation/lams/web/OrganisationGroupController.java
    • -283
    • +283
    ./java/org/lamsfoundation/lams/web/ProfileController.java
  4. … 461 more files in changeset.
Sunday 19 Apr 2020
1:04 pm

Marcin Cieslak

SP-4 Fix an entity processing bug

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
6:39 am

Marcin Cieslak

SP-4 In every mode inform that processing finished successfuly

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Friday 17 Apr 2020
4:10 pm

Marcin Cieslak

SP-4 Add group manager processing

Options
    • -34
    • +145
    ./java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Wednesday 08 Apr 2020
6:04 am

Marcin Cieslak

LDEV-5003 Change the way subcourses are grouped

Options
    • -6
    • +11
    ./java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Saturday 04 Apr 2020
7:46 pm

Marcin Cieslak

LDEV-5003 Detect subcourses correctly

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
2:47 pm

Marcin Cieslak

LDEV-5003 Load all necessary objects in one go instead of one by one

Options
    • -154
    • +121
    ./java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
  2. … 6 more files in changeset.
Friday 03 Apr 2020
3:42 am

Andrey Balan

LDEV-4995 Improvements to the index page

* Fix offcanvas bar search and organisation tablesorter markup in case

of big amount of available organisations

* Optimise DB queries

* Introduce hasContributeActivities Lesson's flag

* Show "fa-spin" when loading an organisation

Options
    • -43
    • +11
    ./java/org/lamsfoundation/lams/web/DisplayGroupController.java
  2. … 19 more files in changeset.
Thursday 02 Apr 2020
9:23 am

Marcin Cieslak

LDEV-4997 Introduce Etherpad as a JSP tag

Options
    • -0
    • +67
    ./java/org/lamsfoundation/lams/web/EtherpadController.java
  2. … 10 more files in changeset.
Tuesday 31 Mar 2020
2:34 am

Andrey Balan

LDEV-4995 Improvements to the index page

* Fix favorite organisations markup

* Fix cards height

* Email notifications buttons moved under "Three dots" menu

* Hide reorder buttons for any order other than "Default" one

* Reintroduce chart labels

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/DisplayGroupController.java
  2. … 5 more files in changeset.
12:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Options
    • -10
    • +22
    ./java/org/lamsfoundation/lams/web/QuestionsController.java
  2. … 15 more files in changeset.
12:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Cherry-pick from 5.0 branch

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

lams_central/web/questions/questionFile.jsp

Options
    • -8
    • +22
    ./java/org/lamsfoundation/lams/web/QuestionsController.java
  2. … 15 more files in changeset.
Saturday 21 Mar 2020
2:47 am

Andrey Balan

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

Options
    • -18
    • +123
    ./java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -1
    • +21
    ./java/org/lamsfoundation/lams/web/IndexController.java
  3. … 197 more files in changeset.
Friday 20 Mar 2020
6:35 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

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

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

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

Options
    • -1664
    • +1673
    ./java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
  2. … 21 more files in changeset.
Monday 16 Mar 2020
3:44 pm

Marcin Cieslak

LDEV-4989 Password Gate initial implementation

Options
    • -1661
    • +1670
    ./java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
  2. … 36 more files in changeset.
Thursday 27 Feb 2020
5:41 pm

Marcin Cieslak

SP-4 Process different structure of staff enrolment file

Options
    • -163
    • +170
    ./java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Tuesday 18 Feb 2020
3:21 pm

Andrey Balan

LDEV-4951 Remove traces of MCQ tool from other modules

Options
    • -32
    • +0
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -6
    • +5
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -3
    • +1
    ./java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -1
    • +0
    ./java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  5. … 189 more files in changeset.
Friday 07 Feb 2020
2:57 pm

Andrey Balan

LDEV-4964 Let learners access LTI deep linking lesson prior to teacher

Options
    • -4
    • +21
    ./java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -10
    • +5
    ./java/org/lamsfoundation/lams/web/controller/LtiController.java
2:57 pm

Andrey Balan

LDEV-4964 Let learners access LTI deep linking lesson prior to teacher

(cherry picked from commit dfe7f83f0d8544622cfd3e30484158ec43610cce)

Options
    • -4
    • +21
    ./java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -10
    • +5
    ./java/org/lamsfoundation/lams/web/controller/LtiController.java
Tuesday 04 Feb 2020
4:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/web/PortraitActionForm.java
    • -3
    • +6
    ./java/org/lamsfoundation/lams/web/PortraitController.java
    • -5
    • +6
    ./java/org/lamsfoundation/lams/web/PortraitSaveController.java
    • -20
    • +27
    ./java/org/lamsfoundation/lams/web/tag/PortraitTag.java
  5. … 32 more files in changeset.
4:10 pm

Marcin Cieslak

LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

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

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

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

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

Options
    • -3
    • +3
    ./java/org/lamsfoundation/lams/web/PortraitActionForm.java
    • -3
    • +6
    ./java/org/lamsfoundation/lams/web/PortraitController.java
    • -5
    • +6
    ./java/org/lamsfoundation/lams/web/PortraitSaveController.java
    • -20
    • +27
    ./java/org/lamsfoundation/lams/web/tag/PortraitTag.java
  5. … 35 more files in changeset.
Friday 31 Jan 2020
4:18 pm

Marcin Cieslak

LDEV-4802 Use redirect instead of forward to QB interface

Using a cross-module forward for some reason prevents modules from

shutting down in the end.

Options
    • -11
    • +9
    ./java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
Tuesday 28 Jan 2020
12:17 pm

Marcin Cieslak

LDEV-4958 Set content folder ID when importing QTI questions to QB

Options
    • -0
    • +2
    ./java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
1:48 am

Andrey Balan

LDEV-4956 Update "user_id" parameter if extServer.getUseAlternativeUseridParameterName() setting is ON

Options
    • -2
    • +4
    ./java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
Wednesday 15 Jan 2020
10:56 pm

Andrey Balan

LDEV-4943 Don't log error message on learner accessing LTI lesson

(cherry picked from commit 9f6b6a7487f9b5cbf283bf95361e3778e93fde95)

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/web/controller/LtiController.java
  2. … 2 more files in changeset.
10:56 pm

Andrey Balan

LDEV-4943 Don't log error message on learner accessing LTI lesson

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/web/controller/LtiController.java
  2. … 2 more files in changeset.