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
Monday 17 Jun 2019
3:57 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -14
    • +16
    ./conf/language/lams/ApplicationResources.properties
    • -14
    • +18
    ./conf/language/lams/ApplicationResources_en_AU.properties
3:49 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Wording tweaks and tool tips added to templates

Options
    • -14
    • +16
    ./conf/language/lams/ApplicationResources.properties
    • -14
    • +18
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./web/authoring/template/tbl/appex.jsp
    • -3
    • +10
    ./web/authoring/template/tbl/tbl.jsp
  5. … 3 more files in changeset.
Sunday 16 Jun 2019
6:04 pm

Marcin Cieslak

LDEV-4828 Allow adding a question to a collection from its stats page

Options
    • -16
    • +4
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -0
    • +20
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -1
    • +34
    ./web/qb/stats.jsp
  4. … 3 more files in changeset.
5:21 pm

Marcin Cieslak

LDEV-4828 Prevent question removal from last collection

If a question is in its last collection, it gets permanently removed.

Unless it is used in Learning Designs - then the user gets a message

that the question could not be removed.

Options
    • -3
    • +13
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -12
    • +21
    ./web/qb/collection.jsp
  3. … 4 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
    • -0
    • +26
    ./build.xml
    • -7
    • +0
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -5
    • +31
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +2
    ./web/addLesson.jsp
    • -12
    • +12
    ./web/authoring/authoring.jsp
    • -14
    • +59
    ./web/authoring/template/tool/assessmcq.jsp
    • -5
    • +30
    ./web/authoring/template/tool/assessment.jsp
    • -5
    • +5
    ./web/authoring/template/tool/assessoption.jsp
    • -8
    • +1
    ./web/authoring/template/tool/mcoption.jsp
    • -25
    • +73
    ./web/authoring/template/tool/mcquestion.jsp
    • -6
    • +34
    ./web/css/_authoring_base.scss
    • -1
    • +13
    ./web/css/_learner_base.scss
    • -15
    • +22
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -1
    • +14
    ./web/includes/javascript/dialog.js
    • -3
    • +1
    ./web/main.jsp
  16. … 80 more files in changeset.
5:22 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -8
    • +12
    ./conf/language/lams/ApplicationResources.properties
    • -8
    • +10
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +34
    ./web/css/_authoring_base.scss
Thursday 13 Jun 2019
11:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 QTI Import window appears centered on screen.

Options
    • -1
    • +3
    ./web/authoring/template/comms.jsp
5:15 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Fixed incompatibility between x-editable and jquery-validation

Options
    • -0
    • +20
    ./web/authoring/template/comms.jsp
    • -14
    • +5
    ./web/authoring/template/tbl/appex.jsp
    • -12
    • +3
    ./web/authoring/template/tool/assessmcq.jsp
    • -19
    • +10
    ./web/authoring/template/tool/assessment.jsp
    • -19
    • +11
    ./web/authoring/template/tool/mcquestion.jsp
3:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Application Exercise functionality completed, can edit titles

Options
    • -2
    • +2
    ./build.properties
    • -6
    • +10
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +8
    ./conf/language/lams/TBLResources.properties
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -52
    • +80
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -10
    • +9
    ./web/authoring/template/comms.jsp
    • -19
    • +45
    ./web/authoring/template/tbl/appex.jsp
    • -39
    • +16
    ./web/authoring/template/tbl/tbl.jsp
    • -6
    • +34
    ./web/authoring/template/tool/assessmcq.jsp
    • -6
    • +34
    ./web/authoring/template/tool/assessment.jsp
    • -2
    • +38
    ./web/authoring/template/tool/mcquestion.jsp
    • -6
    • +34
    ./web/css/_authoring_base.scss
  15. … 3 more files in changeset.
Sunday 09 Jun 2019
9:22 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Multiple App Exercises with multiple Questions, QTI import

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -8
    • +10
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +15
    ./conf/language/lams/TBLResources.properties
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -14
    • +21
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -54
    • +136
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -28
    • +36
    ./web/authoring/template/comms.jsp
    • -0
    • +57
    ./web/authoring/template/tbl/appex.jsp
    • -21
    • +63
    ./web/authoring/template/tbl/tbl.jsp
    • -14
    • +17
    ./web/authoring/template/tool/assessmcq.jsp
    • -5
    • +9
    ./web/authoring/template/tool/assessment.jsp
    • -2
    • +2
    ./web/authoring/template/tool/assessmentQTI.jsp
    • -5
    • +5
    ./web/authoring/template/tool/assessoption.jsp
    • -2
    • +2
    ./web/authoring/template/tool/assessredooption.jsp
    • -1
    • +1
    ./web/authoring/template/tool/mcquestionQTI.jsp
Thursday 06 Jun 2019
11:42 am

Marcin Cieslak

LDEV-4828 Rewrite layout to bootstrap grid. Add comments. Minor fixes.

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -66
    • +115
    ./web/qb/collection.jsp
  3. … 1 more file in changeset.
10:31 am

Marcin Cieslak

LDEV-4828 Allow collection unsharing on QB collections page

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -1
    • +24
    ./web/qb/collection.jsp
10:23 am

Marcin Cieslak

LDEV-4828 Allow question copy and collection sharing in QB

Options
    • -2
    • +12
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -3
    • +45
    ./web/qb/collection.jsp
  3. … 4 more files in changeset.
9:31 am

Marcin Cieslak

LDEV-4828 Add "Remove collection" button to QB collections page

Options
    • -7
    • +13
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -26
    • +52
    ./web/qb/collection.jsp
  3. … 1 more file in changeset.
Wednesday 05 Jun 2019
6:14 pm

Marcin Cieslak

LDEV-4828 Add "Add question" button to QB collections page

Options
    • -1
    • +21
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -2
    • +52
    ./web/qb/collection.jsp
  3. … 4 more files in changeset.
5:12 pm

Marcin Cieslak

LDEV-4828 Add "Add collection" button on QB collection page

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -0
    • +45
    ./web/qb/collection.jsp
4:17 pm

Marcin Cieslak

LDEV-4828 Add remove button to QB collections

Options
    • -0
    • +26
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -33
    • +41
    ./web/qb/collection.jsp
  3. … 5 more files in changeset.
2:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Activities removable in build, RAT and AE have QTI Import

Options
    • -1
    • +6
    ./build.properties
    • -0
    • +26
    ./build.xml
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +4
    ./conf/language/lams/TBLResources.properties
    • -3
    • +85
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -107
    • +240
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/web/QuestionsController.java
    • -4
    • +18
    ./web/authoring/template/comms.jsp
    • -11
    • +72
    ./web/authoring/template/tbl/tbl.jsp
    • -5
    • +28
    ./web/authoring/template/tool/assessmcq.jsp
    • -2
    • +4
    ./web/authoring/template/tool/assessment.jsp
    • -0
    • +29
    ./web/authoring/template/tool/assessmentQTI.jsp
    • -8
    • +1
    ./web/authoring/template/tool/mcoption.jsp
    • -23
    • +43
    ./web/authoring/template/tool/mcquestion.jsp
    • -0
    • +22
    ./web/authoring/template/tool/mcquestionQTI.jsp
  16. … 3 more files in changeset.
10:17 am

Marcin Cieslak

LDEV-4828 Add QB collections link on index page

Options
    • -884
    • +885
    ./conf/language/lams/ApplicationResources.properties
    • -302
    • +306
    ./src/java/org/lamsfoundation/lams/web/IndexController.java
    • -0
    • +4
    ./web/includes/javascript/openUrls.js
    • -331
    • +339
    ./web/main.jsp
9:55 am

Marcin Cieslak

LDEV-4828 Multiselect in QB collection jqGrid

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -5
    • +98
    ./web/qb/collection.jsp
9:52 am

Marcin Cieslak

LDEV-4828 Fix a CSS link on QB stats page

Options
    • -285
    • +285
    ./web/qb/stats.jsp
8:56 am

Marcin Cieslak

LDEV-4828 Paging and search in QB collections jqGrid

Options
    • -26
    • +26
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -4
    • +4
    ./web/qb/collection.jsp
  3. … 9 more files in changeset.
7:12 am

Marcin Cieslak

LDEV-4828 Initial implementation of QB collections front end

Options
    • -0
    • +151
    ./src/java/org/lamsfoundation/lams/web/qb/QbCollectionController.java
    • -0
    • +77
    ./web/qb/collection.jsp
  3. … 4 more files in changeset.
Monday 03 Jun 2019
11:04 pm

Andrey Balan

LDEV-4830 LTI requests should proceed with "author" method in order to acquire author and monitor roles as well

Options
    • -8
    • +4
    ./src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
11:03 pm

Andrey Balan

LDEV-4830 if integration method is "monitor", assign user monitor role only (no learner, no author)

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/GradebookServlet.java
  2. … 2 more files in changeset.
Thursday 30 May 2019
2:08 am

Andrey Balan

LDEV-4826 Move import/export QTI questions feature to QB

Options
    • -0
    • +476
    ./src/java/org/lamsfoundation/lams/web/controller/ImsQtiController.java
    • -0
    • +56
    ./web/questions/importExport.jsp
2:06 am

Andrey Balan

LDEV-4826 Remove import/export QTI questions feature from tools

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
  2. … 12 more files in changeset.
Wednesday 29 May 2019
4:20 pm

Marcin Cieslak

LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

Options
    • -2
    • +15
    ./web/qb/stats.jsp
  2. … 9 more files in changeset.
Monday 27 May 2019
10:02 pm

Marcin Cieslak

LDEV-4825 Calculate and display question indexes on stats page

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -9
    • +24
    ./web/qb/stats.jsp
  3. … 8 more files in changeset.
Wednesday 15 May 2019
1:10 pm

Marcin Cieslak

LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

Options
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -3
    • +10
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  3. … 34 more files in changeset.