lams-github

lams_admin

Clone Tools

Stats

Commits this week: 0
Total Committers: 23
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
Tuesday 19 Nov 2019
2:43 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.java

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

lams_tool_scratchie/web/pages/learning/learning.jsp

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

Marcin Cieslak

LDEV-4440 Use redirects rather than forwards so links do not get broken

Options
    • -8
    • +4
    ./src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java
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
    ./conf/language/lams/ApplicationResources.properties
  2. … 14 more files in changeset.
3:13 pm

Marcin Cieslak

LDEV-4905 Add session counter in sysadmin

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./web/sessionmaintain.jsp
1:33 pm

Andrey Balan

LDEV-4906 Fix saving/editing users

Options
    • -1
    • +0
    ./web/user.jsp
    • -1
    • +0
    ./web/userChangePass.jsp
Thursday 14 Nov 2019
2:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files 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
    ./conf/language/lams/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
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_es_ES.properties
2:53 am

Ernie Ghiglione

LDEV-4769 Update translations

Options
    • -2
    • +13
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +17
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +11
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +13
    ./conf/language/lams/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
    ./conf/language/lams/ApplicationResources_en_AU.properties
  2. … 4 more files in changeset.
10:42 pm

Andrey Balan

LDEV-4873 Remove version numbering from login and main pages

And add it instead to sysadmin.jsp

Options
    • -16
    • +27
    ./web/sysadmin.jsp
  2. … 2 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
    ./conf/language/lams/ApplicationResources_en_AU.properties
  2. … 8 more files in changeset.
Thursday 10 Oct 2019
12:08 am

Andrey Balan

LDEV-4876 Change isUseAlternativeUseridParameterName() to getUseAlternativeUseridParameterName()

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
  2. … 2 more files in changeset.
12:08 am

Andrey Balan

LDEV-4876 Change isUseAlternativeUseridParameterName() to getUseAlternativeUseridParameterName()

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
  2. … 2 more files in changeset.
Wednesday 09 Oct 2019
10:18 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -0
    • +1
    ./conf/language/lams/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
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
    • -1
    • +6
    ./web/integration/ltiConsumer.jsp
  4. … 3 more files in changeset.
Wednesday 11 Sep 2019
11:40 am

Andrey Balan

LDEV-4869 Add default lesson settings for LTI tool consumers

* Also move all integrations jsps to /integration/ folder

Options
    • -8
    • +12
    ./src/java/org/lamsfoundation/lams/admin/web/controller/LtiConsumerManagementController.java
    • -0
    • +38
    ./web/integration/extLessonForm.jsp
    • -0
    • +126
    ./web/integration/ltiConsumer.jsp
    • -0
    • +88
    ./web/integration/ltiConsumerList.jsp
    • -0
    • +72
    ./web/integration/serverlist.jsp
    • -0
    • +136
    ./web/integration/servermaintain.jsp
    • -112
    • +0
    ./web/lti/ltiConsumer.jsp
    • -88
    • +0
    ./web/lti/ltiConsumerList.jsp
    • -72
    • +0
    ./web/serverlist.jsp
    • -172
    • +0
    ./web/servermaintain.jsp
11:39 am

Andrey Balan

LDEV-4869 Aggregate ServerListController, ServerMaintainController and ServerSaveController into a single ExtServerManagementController

Options
    • -0
    • +186
    ./src/java/org/lamsfoundation/lams/admin/web/controller/ExtServerManagementController.java
    • -54
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/controller/ServerListController.java
    • -91
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/controller/ServerMaintainController.java
    • -138
    • +0
    ./src/java/org/lamsfoundation/lams/admin/web/controller/ServerSaveController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
11:37 am

Andrey Balan

LDEV-4869 Create common form for ExtServerForm and LtiConsumerForm

Options
    • -0
    • +171
    ./src/java/org/lamsfoundation/lams/admin/web/form/ExtServerCommonForm.java
    • -162
    • +5
    ./src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java
    • -91
    • +6
    ./src/java/org/lamsfoundation/lams/admin/web/form/LtiConsumerForm.java
Wednesday 28 Aug 2019
3:53 pm

Marcin Cieslak

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

Options
    • -655
    • +657
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/admin/AdminConstants.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java
  4. … 2 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
    ./conf/language/lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Monday 22 Jul 2019
4:47 pm

Marcin Cieslak

LDEV-4834 Use panel-less LO widget in QB question authoring

Options
    • -1
    • +14
    ./web/WEB-INF/tags/CKEditor.tag
    • -10
    • +33
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  3. … 69 more files in changeset.
Thursday 04 Jul 2019
5:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -10
    • +19
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 50 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
    ./conf/language/lams/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
    ./conf/language/lams/ApplicationResources.properties
  2. … 7 more files in changeset.
Friday 14 Jun 2019
7:11 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

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

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

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

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

# lams_tool_task/web/common/monitorheader.jsp

Options
    • -5
    • +31
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 94 more files in changeset.
Thursday 30 May 2019
3:50 pm

Marcin Cieslak

LDEV-4827 Add Question Bank settings to sysadmin

Options
    • -641
    • +648
    ./conf/language/lams/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
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +10
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  3. … 34 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
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/admin/web/form/ExtServerForm.java
    • -0
    • +4
    ./web/servermaintain.jsp
  4. … 5 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
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +7
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  4. … 85 more files in changeset.