lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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 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
    • -29
    • +57
    ./conf/language/lams/ApplicationResources.properties
    • -29
    • +40
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +1
    ./web/includes/javascript/ckconfig_custom.js
  4. … 52 more files in changeset.
Tuesday 02 Jul 2019
3:23 pm

Marcin Cieslak

LDEV-4828 Make service methods' names more simple

"Qb" part everywhere does not introduce anything helpful

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
  6. … 10 more files in changeset.
3:19 pm

Marcin Cieslak

LDEV-4828 Add subgrid with previous versions in QB collection view

Options
    • -5
    • +20
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -6
    • +55
    ./web/qb/collection.jsp
  3. … 3 more files in changeset.
10:48 am

Marcin Cieslak

LDEV-4828 Rewrite QB collections to use question ID instead of uid

Options
    • -32
    • +35
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -22
    • +18
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -6
    • +8
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -22
    • +8
    ./src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
    • -1
    • +1
    ./web/qb/collection.jsp
    • -4
    • +7
    ./web/qb/stats.jsp
  8. … 5 more files in changeset.
Sunday 30 Jun 2019
12:42 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -12
    • +16
    ./conf/language/lams/ApplicationResources.properties
    • -12
    • +17
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +15
    ./web/css/_authoring_base.scss
12:35 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Cosmetic button changes, Assessment questions not numbered

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -4
    • +5
    ./web/authoring/template/tbl/appex.jsp
    • -5
    • +3
    ./web/authoring/template/tbl/tbl.jsp
    • -3
    • +3
    ./web/authoring/template/tool/assessmcq.jsp
    • -2
    • +2
    ./web/authoring/template/tool/assessment.jsp
    • -2
    • +3
    ./web/authoring/template/tool/mcquestion.jsp
    • -5
    • +15
    ./web/css/_authoring_base.scss
8:34 am

Marcin Cieslak

LDEV-4828 Prevent public collection's name from being changed

Options
    • -8
    • +8
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -28
    • +33
    ./web/qb/collection.jsp
Saturday 29 Jun 2019
2:43 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Marks for iRA, tRa and AE go to Gradebook

Options
    • -3
    • +18
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
Friday 28 Jun 2019
10:02 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Deletion of unwanted RAT and Application Exercises supported.

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +33
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -0
    • +14
    ./web/authoring/template/comms.jsp
    • -0
    • +1
    ./web/authoring/template/tbl/appex.jsp
    • -1
    • +1
    ./web/authoring/template/tool/assessmcq.jsp
    • -1
    • +1
    ./web/authoring/template/tool/assessment.jsp
    • -0
    • +1
    ./web/authoring/template/tool/mcquestion.jsp
Thursday 27 Jun 2019
2:18 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Error msg and text improvements, supports mark entry

Options
    • -12
    • +14
    ./conf/language/lams/ApplicationResources.properties
    • -12
    • +15
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +4
    ./conf/language/lams/TBLResources.properties
    • -21
    • +27
    ./src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -11
    • +6
    ./src/java/org/lamsfoundation/lams/authoring/template/SurveyQuestion.java
    • -10
    • +18
    ./src/java/org/lamsfoundation/lams/authoring/template/TemplateData.java
    • -7
    • +18
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -34
    • +63
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -2
    • +2
    ./web/authoring/template/groupingerrors.jsp
    • -3
    • +3
    ./web/authoring/template/tbl/tbl.jsp
    • -0
    • +3
    ./web/authoring/template/tool/assessmcq.jsp
    • -0
    • +4
    ./web/authoring/template/tool/assessment.jsp
    • -1
    • +1
    ./web/authoring/template/tool/mcquestion.jsp
  14. … 1 more file in changeset.
Wednesday 26 Jun 2019
7:54 pm

Andrey Balan

LDEV-3997 Try to fetch user name from lis_person_name_full parameter

Options
    • -6
    • +23
    ./src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
Tuesday 25 Jun 2019
7:09 pm

Andrey Balan

LDEV-4833 Move import/export questions in XML format feature to QB

Options
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +188
    ./src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
    • -0
    • +22
    ./web/qb/collection.jsp
    • -0
    • +106
    ./web/qb/importQuestionsXml.jsp
  5. … 4 more files in changeset.
Monday 24 Jun 2019
9:48 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -1
    • +99
    ./conf/language/lams/ApplicationResources_el_GR.properties
7:26 am

Marcin Cieslak

LDEV-4828 Make Edit button smaller on collection list page

Options
    • -1
    • +2
    ./web/qb/collectionList.jsp
7:19 am

Marcin Cieslak

LDEV-4828 Make collection name a link for editing it

Options
    • -5
    • +6
    ./web/qb/collectionList.jsp
7:17 am

Marcin Cieslak

LDEV-4828 Make question name a link for showing stats

Options
    • -1
    • +3
    ./web/qb/collection.jsp
    • -1
    • +8
    ./web/qb/collectionList.jsp
7:07 am

Marcin Cieslak

LDEV-4828 Show row count also on jqGrid

Options
    • -0
    • +1
    ./web/qb/collection.jsp
    • -0
    • +1
    ./web/qb/collectionList.jsp
7:02 am

Marcin Cieslak

LDEV-4828 Use title on whole buttons, not just icons

Options
    • -8
    • +9
    ./web/qb/collection.jsp
6:57 am

Marcin Cieslak

LDEV-4828 Make "private collection" label smaller

Options
    • -0
    • +1
    ./web/qb/collection.jsp
    • -0
    • +1
    ./web/qb/collectionList.jsp
Friday 21 Jun 2019
8:14 pm

Andrey Balan

LDEV-4826 Hide "Export QTI" button if this feature is OFF in sysadmin

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +1
    ./web/qb/collection.jsp
4:12 pm

Andrey Balan

LDEV-4828 Show total number of questions in jqGrid properly

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
3:10 pm

Andrey Balan

LDEV-4832 Add new version of question to the appropriate collection

Options
    • -6
    • +23
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +1
    ./web/qb/collection.jsp
1:22 pm

Andrey Balan

LDEV-4828 Redesign "Remove", "Share"/"Unshare" features

Options
    • -55
    • +67
    ./web/qb/collection.jsp
    • -1
    • +1
    ./web/qb/stats.jsp
Thursday 20 Jun 2019
10:47 pm

Andrey Balan

LDEV-4826 Add upload/download QTI feature to collection page

Options
    • -4
    • +11
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -28
    • +70
    ./web/qb/collection.jsp
    • -39
    • +0
    ./web/questions/importExport.jsp
9:17 pm

Andrey Balan

LDEV-4828 Display question type and version information

Options
    • -27
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -2
    • +49
    ./web/qb/collection.jsp
    • -6
    • +10
    ./web/qb/collectionList.jsp
8:15 pm

Andrey Balan

LDEV-4828 Add edit question button

Options
    • -1
    • +33
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -55
    • +82
    ./web/qb/collection.jsp
7:50 pm

Andrey Balan

LDEV-4828 Adjust layout to be closer to the provided mockups

Options
    • -43
    • +46
    ./web/qb/collection.jsp
    • -18
    • +14
    ./web/qb/stats.jsp
1:21 pm

Marcin Cieslak

Merge branch 'LDEV-4828' into LDEV-4745

Options
    • -328
    • +182
    ./web/qb/collection.jsp
    • -166
    • +315
    ./web/qb/stats.jsp
  3. … 2 more files in changeset.
12:38 pm

Marcin Cieslak

LDEV-4828 Adjust layout. Add comments.

Options
    • -25
    • +20
    ./web/qb/collection.jsp
    • -1
    • +4
    ./web/qb/collectionList.jsp
    • -26
    • +66
    ./web/qb/stats.jsp
12:02 pm

Marcin Cieslak

LDEV-4828 Toggle questions transfer and collection creation in sysadmin

Options
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -1
    • +33
    ./web/qb/collection.jsp
    • -3
    • +6
    ./web/qb/collectionList.jsp
    • -2
    • +4
    ./web/qb/stats.jsp
  6. … 3 more files in changeset.