lams-github / lams_admin / conf / language

lams

Clone Tools

Stats

Commits this week: 0
Total Committers: 17
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
Monday 18 Nov 2019
3: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
    • -0
    • +1
    ./ApplicationResources.properties
  2. … 14 more files in changeset.
3:13 pm

Marcin Cieslak

LDEV-4905 Add session counter in sysadmin

Options
    • -0
    • +1
    ./ApplicationResources.properties
  2. … 1 more file in changeset.
Friday 08 Nov 2019
4:29 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/web/main.jsp

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_tool_lamc/web/authoring/itemlist.jsp

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

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/authoring/start.jsp

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -655
    • +660
    ./ApplicationResources.properties
  2. … 27 more files in changeset.
Saturday 26 Oct 2019
10:26 pm

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_admin/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +6
    ./ApplicationResources.properties
    • -3
    • +4
    ./ApplicationResources_el_GR.properties
    • -3
    • +3
    ./ApplicationResources_en_AU.properties
    • -2
    • +6
    ./ApplicationResources_es_ES.properties
2:53 am

Ernie Ghiglione

LDEV-4769 Update translations

Options
    • -2
    • +13
    ./ApplicationResources.properties
    • -2
    • +17
    ./ApplicationResources_el_GR.properties
    • -3
    • +11
    ./ApplicationResources_en_AU.properties
    • -2
    • +13
    ./ApplicationResources_es_ES.properties
Friday 11 Oct 2019
10:46 pm

Andrey Balan

Merge branch 'master' into develop

Conflicts:

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

Options
    • -0
    • +2
    ./ApplicationResources_en_AU.properties
  2. … 4 more files in changeset.
7:43 pm

Andrey Balan

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

Options
    • -0
    • +2
    ./ApplicationResources_en_AU.properties
  2. … 8 more files in changeset.
Wednesday 09 Oct 2019
10:18 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -0
    • +1
    ./ApplicationResources_en_AU.properties
10:16 am

Andrey Balan

LDEV-4876 Ability for LTI servers to get userId using alternative request parameter name

Options
    • -0
    • +1
    ./ApplicationResources_en_AU.properties
  2. … 5 more files in changeset.
Wednesday 28 Aug 2019
3:53 pm

Marcin Cieslak

LKC-214 In sysadmin add entry point for blueprint management page

Options
    • -655
    • +657
    ./ApplicationResources.properties
  2. … 4 more files in changeset.
Friday 16 Aug 2019
2:20 pm

Marcin Cieslak

LDEV-4827, LDEV-4844 Toggle question merging is admin panel

Options
    • -655
    • +656
    ./ApplicationResources.properties
  2. … 3 more files in changeset.
Wednesday 03 Jul 2019
9:25 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

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

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

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

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

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

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

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

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

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

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -0
    • +6
    ./ApplicationResources.properties
  2. … 54 more files in changeset.
Thursday 20 Jun 2019
12:02 pm

Marcin Cieslak

LDEV-4828 Toggle questions transfer and collection creation in sysadmin

Options
    • -0
    • +1
    ./ApplicationResources.properties
  2. … 7 more files in changeset.
Thursday 30 May 2019
3:50 pm

Marcin Cieslak

LDEV-4827 Add Question Bank settings to sysadmin

Options
    • -641
    • +648
    ./ApplicationResources.properties
  2. … 3 more files in changeset.
Wednesday 15 May 2019
1:10 pm

Marcin Cieslak

LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

Options
    • -1
    • +1
    ./ApplicationResources.properties
  2. … 35 more files in changeset.
Monday 15 Apr 2019
3:26 pm

Marcin Cieslak

SP-3 Automatically redirect to logout URL configured in sysadmin

Options
    • -0
    • +1
    ./ApplicationResources.properties
  2. … 7 more files in changeset.
Wednesday 27 Mar 2019
12:18 pm

Marcin Cieslak

LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

Options
    • -0
    • +1
    ./ApplicationResources.properties
    • -0
    • +1
    ./ApplicationResources_en_AU.properties
  3. … 86 more files in changeset.
Monday 25 Mar 2019
1:07 am

Ernie Ghiglione

LDEV-4739 Updating translations

Options
    • -3
    • +3
    ./ApplicationResources.properties
    • -2
    • +3
    ./ApplicationResources_el_GR.properties
    • -2
    • +3
    ./ApplicationResources_en_AU.properties
    • -2
    • +3
    ./ApplicationResources_es_ES.properties
  5. … 8 more files in changeset.
Tuesday 12 Mar 2019
3:41 pm

Marcin Cieslak

LDEV-4786 Allow creating learning outcomes on the fly

Options
    • -0
    • +1
    ./ApplicationResources.properties
  2. … 63 more files in changeset.
Sunday 10 Feb 2019
8:27 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4769 Updating Greek

Options
    • -2
    • +14
    ./ApplicationResources_el_GR.properties
Thursday 07 Feb 2019
5:46 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4767 LDEV-4755 adding labels

Adding labels for use login/out logs and anti virus config

Options
    • -6
    • +9
    ./ApplicationResources.properties
    • -2
    • +8
    ./ApplicationResources_en_AU.properties
    • -2
    • +8
    ./ApplicationResources_es_ES.properties
Saturday 19 Jan 2019
4:25 pm

Marcin Cieslak

LDEV-4755 Add configuration for antivirus

Options
    • -1
    • +4
    ./ApplicationResources.properties
  2. … 3 more files in changeset.
Wednesday 16 Jan 2019
9:48 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4693 adding label

Missing label for admin

Options
    • -2
    • +3
    ./ApplicationResources.properties
    • -2
    • +3
    ./ApplicationResources_en_AU.properties
    • -2
    • +3
    ./ApplicationResources_es_ES.properties
9:40 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4693 adding label

Missing label for admin

Options
    • -2
    • +3
    ./ApplicationResources.properties
    • -2
    • +3
    ./ApplicationResources_en_AU.properties
    • -2
    • +3
    ./ApplicationResources_es_ES.properties
Friday 28 Dec 2018
8:04 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4739 Updating labels for admin

Updating Greek, Spanish and Englisg

Options
    • -14
    • +13
    ./ApplicationResources.properties
    • -12
    • +5
    ./ApplicationResources_el_GR.properties
    • -15
    • +11
    ./ApplicationResources_en_AU.properties
    • -12
    • +9
    ./ApplicationResources_es_ES.properties
Wednesday 28 Nov 2018
8:50 am

Marcin Cieslak

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

Conflicts:

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

lams_central/web/forgotPassword.jsp

lams_central/web/forgotPasswordChange.jsp

lams_central/web/forgotPasswordProc.jsp

lams_tool_assessment/web/pages/learning/results.jsp

Options
    • -0
    • +1
    ./ApplicationResources_en_AU.properties
  2. … 10 more files in changeset.
Tuesday 27 Nov 2018
8:54 pm

Andrey Balan

LDEV-4710 Add config setting to enable "Forgot your password?" option

Also if people try to get to the login page by going to the URL

directly, we display a 404 error message.

Options
    • -0
    • +1
    ./ApplicationResources_en_AU.properties
  2. … 5 more files in changeset.
Thursday 15 Nov 2018
6:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4697 Audit entries filtering by user and remarks

Options
    • -1
    • +1
    ./ApplicationResources.properties
  2. … 6 more files in changeset.
Friday 19 Oct 2018
11:38 am

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_admin/web/sessionmaintain.jsp

lams_build/build.xml

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

Options
    • -2
    • +1
    ./ApplicationResources.properties
  2. … 17 more files in changeset.
10:20 am

Marcin Cieslak

LDEV-4693 Add name in logged in user list in sysadmin

Options
    • -0
    • +1
    ./ApplicationResources.properties
  2. … 2 more files in changeset.