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
Friday 21 Aug 2020
3:31 pm

Marcin Cieslak

Revert "LDEV-5015 Temporarily revert to MCQ as IRA for TBL template"

This reverts commit 59f6851d952d42a5d7b0125959ad3d5f843e7273.

Options
    • -6
    • +7
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
Thursday 20 Aug 2020
8:46 am

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_central/web/questions/questionFile.jsp

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

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

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_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

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

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

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

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

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

Options
    • -35
    • +111
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -4
    • +5
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -28
    • +30
    ./java/org/lamsfoundation/lams/web/QuestionsController.java
  4. … 23 more files in changeset.
Monday 17 Aug 2020
4:48 pm

Marcin Cieslak

LDEV-4917 Add Uppy file uploads to XML question import

Options
    • -1
    • +2
    ./java/org/lamsfoundation/lams/web/QuestionsController.java
    • -9
    • +21
    ./java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
  3. … 1 more file in changeset.
4:34 pm

Marcin Cieslak

LDEV-4917 Add Uppy file uploads to QTI question import

Options
    • -17
    • +31
    ./java/org/lamsfoundation/lams/web/QuestionsController.java
  2. … 6 more files in changeset.
Friday 07 Aug 2020
6:13 pm

Marcin Cieslak

LDEV-4917 Add Uppy upload to Learning Desing zip import in authoring

Options
    • -10
    • +21
    ./java/org/lamsfoundation/lams/authoring/web/ImportToolContentController.java
  2. … 3 more files in changeset.
Tuesday 04 Aug 2020
10:39 am

Marcin Cieslak

LDEV-4917 Fix CKEditor upload successful message

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
10:30 am

Marcin Cieslak

LDEV-4917 Clean up tmp uploaded files when they are no longer needed

Options
    • -4
    • +5
    ./java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
  2. … 3 more files in changeset.
Sunday 02 Aug 2020
2:22 pm

Marcin Cieslak

LDEV-4917 Initial implementation of file uploads using Uppy

Image upload in Image Gallery authoring.

Options
    • -21
    • +132
    ./java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
  2. … 18 more files in changeset.
Thursday 30 Jul 2020
6:35 am

Marcin Cieslak

LDEV-5058 Move activity category from DB to authoring front end

Options
    • -1
    • +0
    ./java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -1
    • +0
    ./java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -30
    • +20
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
  4. … 12 more files in changeset.
Tuesday 28 Jul 2020
9:04 am

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -0
    • +1
    ./java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -0
    • +1
    ./java/org/lamsfoundation/lams/web/webApplicationContext.xml
    • -0
    • +1
    ./java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
  4. … 31 more files in changeset.
Friday 17 Jul 2020
2:37 pm

Marcin Cieslak

LDEV-5015 Temporarily revert to MCQ as IRA for TBL template

Options
    • -7
    • +6
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
12:01 pm

Marcin Cieslak

LDEV-5053 Fix Learning Outcome mapping encoding

Options
    • -3
    • +5
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
Thursday 16 Jul 2020
3:19 pm

Marcin Cieslak

Revert "LDEV-5015 Enable question numbering for AE for TBL template"

This reverts commit d4981fabcbe8f422ea93c86e9e54db7f80c0e705.

Options
    • -3
    • +4
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -3
    • +4
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
Tuesday 14 Jul 2020
2:34 pm

Marcin Cieslak

LDEV-5015 Enable question numbering for AE for TBL template

Options
    • -4
    • +3
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -4
    • +3
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
8:20 am

Marcin Cieslak

LDEV-5015 Allow answer justification for AE question for TBL template

Options
    • -1
    • +4
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -2
    • +2
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  3. … 1 more file in changeset.
Friday 10 Jul 2020
4:18 pm

Marcin Cieslak

LDEV-5050 Make all TBL template questions required

Options
    • -0
    • +8
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
  2. … 7 more files in changeset.
10:52 am

Marcin Cieslak

LDEV-5050 Move "is required" attribute from QB question to tools

Options
    • -1
    • +0
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -3
    • +0
    ./java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
  3. … 28 more files in changeset.
Thursday 09 Jul 2020
11:13 am

Marcin Cieslak

LDEV-5015 Allow disclose answers only for AEs, not for iRA assessment

Options
    • -2
    • +2
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -2
    • +3
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
Wednesday 08 Jul 2020
10:16 am

Marcin Cieslak

LDEV-5015 Tune TBL template iRA Assessment options

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +1
    ./java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
Tuesday 07 Jul 2020
2:50 pm

Marcin Cieslak

LKC-222 Simplify authorization flow for Workflow Automation

Learners need to already exist in the organisation. Staff gets synced

and added.

Options
    • -51
    • +11
    ./java/org/lamsfoundation/lams/web/LoginRequestServlet.java
  2. … 2 more files in changeset.
Monday 06 Jul 2020
12:52 pm

Marcin Cieslak

LKC-222 Add course and lesson roles to user on WA access

Options
    • -20
    • +64
    ./java/org/lamsfoundation/lams/web/LoginRequestServlet.java
  2. … 4 more files in changeset.
Monday 22 Jun 2020
10:48 am

Marcin Cieslak

LDEV-5041 Add lesson service utility method

Options
    • -6
    • +5
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
  2. … 5 more files in changeset.
Friday 05 Jun 2020
11:11 am

Marcin Cieslak

LDEV-5036 Do not prematurely map resource ID to a LAMS lesson

Options
    • -29
    • +33
    ./java/org/lamsfoundation/lams/web/controller/LtiController.java
Thursday 21 May 2020
8:46 am

Marcin Cieslak

LDEV-5025 Allow Assessment other groups' answer rating and commenting

Options
    • -0
    • +11
    ./java/org/lamsfoundation/lams/web/RatingServlet.java
  2. … 11 more files in changeset.
Tuesday 19 May 2020
7:58 pm

Marcin Cieslak

LDEV-5024 Fix layout issues in TBL template

Options
    • -1
    • +1
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
  2. … 2 more files in changeset.
5:00 pm

Marcin Cieslak

LDEV-5024 Import QB questions to AE in TBL template

Options
    • -4
    • +7
    ./java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -9
    • +46
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
  3. … 5 more files in changeset.
Thursday 14 May 2020
1:27 pm

Marcin Cieslak

LDEV-5024 Import question from QB to TBL template wizard

Options
    • -0
    • +39
    ./java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
  2. … 2 more files in changeset.
Monday 11 May 2020
12:14 pm

Marcin Cieslak

LDEV-4997 Renormalize line endings with git

Options
    • -623
    • +623
    ./java/org/lamsfoundation/lams/web/OrganisationGroupController.java
    • -283
    • +283
    ./java/org/lamsfoundation/lams/web/ProfileController.java
    • -790
    • +790
    ./java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
  4. … 418 more files in changeset.
12:05 pm

Marcin Cieslak

LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

Options
    • -0
    • +67
    ./java/org/lamsfoundation/lams/web/EtherpadController.java
  2. … 8 more files in changeset.
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.