lams-github / lams_central

conf

Clone Tools

Stats

Commits this week: 0
Total Committers: 22
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
9:40 am

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, Greek and Norwegian labels

Options
    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +14
    ./language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
  6. … 10 more files in changeset.
Thursday 20 Aug 2020
2:46 pm

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
    • -1066
    • +1076
    ./language/lams/ApplicationResources_en_AU.properties
    • -2
    • +21
    ./security/Owasp.CsrfGuard.properties
  3. … 24 more files in changeset.
Wednesday 19 Aug 2020
4:26 pm

Marcin Cieslak

LDEV-4917 Add error pop up on attempt of uploading incorrect file

Options
    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  2. … 10 more files in changeset.
Monday 17 Aug 2020
12:05 pm

Ernie Ghiglione

LDEV-4769 Updating English , Spanish, Norwegian

Options
    • -1
    • +14
    ./language/lams/ApplicationResources_no_NO.properties
  2. … 5 more files in changeset.
Monday 10 Aug 2020
9:37 am

Ernie Ghiglione

LDEV-4769 Updating Spanish

Options
    • -2
    • +2
    ./language/lams/ApplicationResources_es_ES.properties
Friday 07 Aug 2020
12:52 pm

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -2
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -11
    • +10
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_no_NO.properties
  7. … 40 more files in changeset.
Thursday 06 Aug 2020
10:00 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Norwegian

Options
    • -14
    • +14
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
    • -1
    • +14
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +14
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
  6. … 6 more files in changeset.
Wednesday 05 Aug 2020
10:59 pm

Marcin Cieslak

LDEV-5059 Add missing labels for Question Bank

Options
    • -0
    • +13
    ./language/lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Tuesday 04 Aug 2020
2:20 pm

Ernie Ghiglione

Updating labels Spanish, English, French, Norwegian

Options
    • -23
    • +23
    ./language/lams/ApplicationResources_es_ES.properties
  2. … 41 more files in changeset.
9:40 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Norwegian

Options
    • -0
    • +53
    ./language/lams/ApplicationResources_es_ES.properties
  2. … 3 more files in changeset.
Monday 03 Aug 2020
5:11 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
2:23 am

Ernie Ghiglione

LDEV-4769 Updating Spanish

Also removing a deprecated label

Options
    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +6
    ./language/lams/ApplicationResources_es_ES.properties
  4. … 20 more files in changeset.
Sunday 02 Aug 2020
10:55 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -38
    • +38
    ./language/lams/ApplicationResources_es_ES.properties
  2. … 21 more files in changeset.
Tuesday 28 Jul 2020
7:30 pm

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, French, Greek and Norwegian for all active projects

From this commit onwards, we no longer will use the LAMS Community i18n to manage and handle translations.

Instead, we have now migrated to Lokalise (https://lokalise.com/) for managing all i18n projects and translations.

Many thanks Lokalise for your support!!

Options
    • -1089
    • +1062
    ./language/lams/ApplicationResources.properties
    • -1066
    • +1063
    ./language/lams/ApplicationResources_el_GR.properties
    • -1066
    • +1063
    ./language/lams/ApplicationResources_en_AU.properties
    • -835
    • +1005
    ./language/lams/ApplicationResources_es_ES.properties
    • -313
    • +320
    ./language/lams/ApplicationResources_fr_FR.properties
    • -1070
    • +1063
    ./language/lams/ApplicationResources_no_NO.properties
  7. … 166 more files in changeset.
Thursday 16 Jul 2020
10:49 pm

Marcin Cieslak

LKC-215 Allow comment when sending question for reviewing

Options
    • -0
    • +1
    ./security/Owasp.CsrfGuard.properties
Friday 03 Jul 2020
8:03 pm

Marcin Cieslak

LKC-213 Add CSRF protection to Workflow Automation project

Options
    • -2
    • +15
    ./security/Owasp.CsrfGuard.properties
Thursday 18 Jun 2020
11:50 pm

Marcin Cieslak

LDEV-5041 Add individual time limits

Options
    • -1
    • +2
    ./security/Owasp.CsrfGuard.properties
  2. … 12 more files in changeset.
Wednesday 17 Jun 2020
6:17 pm

Marcin Cieslak

LDEV-5041 Control relative time limit in Assessment monitor

Options
    • -0
    • +1
    ./security/Owasp.CsrfGuard.properties
  2. … 6 more files in changeset.
12:43 pm

Ernie Ghiglione

LDEV-4769 Updating labels

Options
    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
  3. … 2 more files in changeset.
Tuesday 02 Jun 2020
5:01 pm

Marcin Cieslak

DEMO-5 Add Google SSO integration to CSRF Guard

Options
    • -0
    • +3
    ./security/Owasp.CsrfGuard.properties
Monday 18 May 2020
2:01 pm

Marcin Cieslak

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

Options
    • -2
    • +162
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +164
    ./language/lams/ApplicationResources_no_NO.properties
  3. … 1 more file in changeset.
1:56 pm

Ernie Ghiglione

LDEV-4745 adding labels for Greek and Norwegian

Options
    • -2
    • +162
    ./language/lams/ApplicationResources_el_GR.properties
    • -2
    • +164
    ./language/lams/ApplicationResources_no_NO.properties
Thursday 14 May 2020
7:27 pm

Marcin Cieslak

LDEV-5024 Import question from QB to TBL template wizard

Options
    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  2. … 2 more files in changeset.
5:24 pm

Marcin Cieslak

LDEV-5024 Add "question from bank" button to TBL template wizard

Options
    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  2. … 1 more file in changeset.
Wednesday 06 May 2020
7: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
    • -0
    • +2
    ./security/Owasp.CsrfGuard.properties
  2. … 30 more files in changeset.
Saturday 02 May 2020
9:06 am

Andrey Balan

LDEV-4995 First draft of the monitor page

Options
    • -1
    • +1
    ./scss/_lams_variables.scss
  2. … 16 more files in changeset.
Monday 20 Apr 2020
6:55 pm

Marcin Cieslak

LDEV-4999 Allow marks update in Dokuy monitoring summary page

Options
    • -0
    • +1
    ./security/Owasp.CsrfGuard.properties
  2. … 4 more files in changeset.
Friday 03 Apr 2020
9: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
    • -2
    • +2
    ./scss/_lams_variables.scss
    • -1
    • +1
    ./scss/_lams_variables_purple.scss
  3. … 18 more files in changeset.
Tuesday 31 Mar 2020
6:00 am

Andrey Balan

LDEV-4949 import questions from Word files

Options
    • -0
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
  2. … 15 more files in changeset.
6: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
    • -0
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
  2. … 15 more files in changeset.