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
Tuesday 20 Aug 2019
3:23 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
Friday 16 Aug 2019
10:07 pm

Marcin Cieslak

LDEV-4848 Internationalise labels in Question Bank

Options
    • -0
    • +67
    ./conf/language/lams/ApplicationResources.properties
    • -28
    • +32
    ./web/qb/collection.jsp
    • -11
    • +12
    ./web/qb/collectionList.jsp
    • -44
    • +49
    ./web/qb/stats.jsp
8:26 pm

Marcin Cieslak

LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

Options
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -1
    • +1
    ./web/qb/stats.jsp
8:23 pm

Marcin Cieslak

Merge branch 'LDEV-4827' into LDEV-4844

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
  2. … 6 more files in changeset.
8:20 pm

Marcin Cieslak

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

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
  2. … 3 more files in changeset.
Thursday 15 Aug 2019
11:48 pm

Marcin Cieslak

LDEV-4846 Set LD's content folder ID when importing old questions

In pre-QB LAMS version only LD had content folder ID. In QB each

question has its own content folder ID. When importing pre-QB questions

and converting them into QB questions, we give them the LD's (shared)

content folder ID.

Options
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
  2. … 5 more files in changeset.
Tuesday 13 Aug 2019
5:13 am

Andrey Balan

LDEV-4822 Create a better warning page shown on unsuccessful LTI call

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +7
    ./src/java/org/lamsfoundation/lams/web/controller/LtiController.java
5:13 am

Andrey Balan

LDEV-4822 Create a better warning page shown on unsuccessful LTI call

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +7
    ./src/java/org/lamsfoundation/lams/web/controller/LtiController.java
4:28 am

Andrey Balan

LDEV-4850 Adjust LTI integration to support course copy

Options
    • -19
    • +47
    ./src/java/org/lamsfoundation/lams/web/controller/LtiController.java
  2. … 2 more files in changeset.
4:28 am

Andrey Balan

LDEV-4850 Adjust LTI integration to support course copy

Options
    • -20
    • +49
    ./src/java/org/lamsfoundation/lams/web/controller/LtiController.java
  2. … 2 more files in changeset.
2:16 am

Marcin Cieslak

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

Options
    • -5
    • +8
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
2:15 am

Marcin Cieslak

LDEV-4851 Add email to Learner and LearnerOutput elements

Options
    • -5
    • +8
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
Friday 09 Aug 2019
5:03 am

Andrey Balan

LDEV-4589 Fix content-item feature

Options
    • -155
    • +13
    ./src/java/org/lamsfoundation/lams/web/controller/LtiController.java
  2. … 1 more file in changeset.
5:03 am

Andrey Balan

LDEV-4589 Fix content-item feature

Options
    • -153
    • +11
    ./src/java/org/lamsfoundation/lams/web/controller/LtiController.java
  2. … 1 more file in changeset.
Wednesday 07 Aug 2019
3:20 pm

Marcin Cieslak

LDEv-4844 Allow manual QB question merging

Options
    • -0
    • +37
    ./src/java/org/lamsfoundation/lams/web/qb/QbStatsController.java
    • -4
    • +69
    ./web/qb/stats.jsp
  3. … 4 more files in changeset.
4:47 am

Andrey Balan

LDEV-4589 Add support for LTI membership service

Includes interim logging.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -3
    • +159
    ./src/java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -43
    • +6
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  4. … 7 more files in changeset.
4:47 am

Andrey Balan

LDEV-4589 Add support for LTI membership service

Includes interim logging.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -4
    • +161
    ./src/java/org/lamsfoundation/lams/web/controller/LtiController.java
    • -43
    • +6
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  4. … 7 more files in changeset.
Sunday 04 Aug 2019
5:07 am

Andrey Balan

LDEV-4838 Move collection processing to common utils method

Options
    • -55
    • +7
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -1
    • +1
    ./web/qb/authoring/addQuestionFooter.jsp
    • -2
    • +2
    ./web/qb/authoring/addessay.jsp
    • -2
    • +2
    ./web/qb/authoring/addmarkhedging.jsp
    • -2
    • +2
    ./web/qb/authoring/addmatchingpairs.jsp
    • -2
    • +2
    ./web/qb/authoring/addmultiplechoice.jsp
    • -2
    • +2
    ./web/qb/authoring/addnumerical.jsp
    • -2
    • +2
    ./web/qb/authoring/addordering.jsp
    • -2
    • +2
    ./web/qb/authoring/addshortanswer.jsp
    • -2
    • +2
    ./web/qb/authoring/addtruefalse.jsp
    • -2
    • +2
    ./web/qb/collection.jsp
  12. … 2 more files in changeset.
Wednesday 31 Jul 2019
8:49 pm

Andrey Balan

LDEV-4745 Fix exception on importing QTI questions and XML ones

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -6
    • +5
    ./src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
Thursday 25 Jul 2019
7:10 pm

Marcin Cieslak

LDEV-4746 Removed "correct" field from QbOption

It can be inferred from maxMark.

Also fix incorrect overwriting of QB question names with Assessment

question descriptions.

Options
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
  2. … 2 more files in changeset.
Wednesday 24 Jul 2019
5:04 pm

Andrey Balan

LDEV-4836 Display limited set of question types for MCQ and Scratchie

Options
    • -8
    • +14
    ./web/qb/search.jsp
4:51 am

Andrey Balan

Merge branch 'LDEV-4836' into LDEV-4745

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
  2. … 4 more files in changeset.
4:44 am

Andrey Balan

LDEV-4836 Advanced search on authoring basic tab

* "Random questions" page in authoring. Add "Select all questions"

button + collections dropdown

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -6
    • +29
    ./src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java
    • -0
    • +6
    ./web/css/bootstrap-select.css
    • -0
    • +9
    ./web/includes/javascript/bootstrap-select.js
    • -14
    • +19
    ./web/includes/javascript/qb-search.js
    • -1
    • +1
    ./web/qb/authoring/addQuestionFooter.jsp
    • -16
    • +74
    ./web/qb/search.jsp
  8. … 8 more files in changeset.
Tuesday 23 Jul 2019
9:19 pm

Marcin Cieslak

LDEV-4746 Skip validation CKEditor for question description

jQuery validation plugin does not seem to work well with CKEditor.

Options
    • -1
    • +1
    ./web/qb/authoring/addessay.jsp
    • -1
    • +1
    ./web/qb/authoring/addmarkhedging.jsp
    • -1
    • +1
    ./web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +1
    ./web/qb/authoring/addmultiplechoice.jsp
    • -1
    • +1
    ./web/qb/authoring/addnumerical.jsp
    • -1
    • +1
    ./web/qb/authoring/addordering.jsp
    • -1
    • +1
    ./web/qb/authoring/addshortanswer.jsp
    • -1
    • +1
    ./web/qb/authoring/addtruefalse.jsp
8:48 pm

Marcin Cieslak

LDEV-4834 Allow LO widget on add new QB question screen

Options
    • -3
    • +1
    ./web/qb/authoring/addessay.jsp
    • -3
    • +1
    ./web/qb/authoring/addmarkhedging.jsp
    • -3
    • +1
    ./web/qb/authoring/addmatchingpairs.jsp
    • -3
    • +1
    ./web/qb/authoring/addmultiplechoice.jsp
    • -3
    • +1
    ./web/qb/authoring/addnumerical.jsp
    • -3
    • +1
    ./web/qb/authoring/addordering.jsp
    • -3
    • +1
    ./web/qb/authoring/addshortanswer.jsp
    • -3
    • +1
    ./web/qb/authoring/addtruefalse.jsp
  9. … 1 more file in changeset.
8:31 pm

Marcin Cieslak

LDEV-4746 Use table as question ID generator for QbQuestion

In the future we can add new columns to lams_sequence_generator, so we

have a single table for generating new IDs instead table-per-ID.

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/qb/XmlQuestionsController.java
    • -0
    • +1
    ./web/qb/authoring/addessay.jsp
    • -0
    • +1
    ./web/qb/authoring/addmarkhedging.jsp
    • -0
    • +1
    ./web/qb/authoring/addmatchingpairs.jsp
    • -0
    • +1
    ./web/qb/authoring/addmultiplechoice.jsp
    • -0
    • +1
    ./web/qb/authoring/addnumerical.jsp
    • -0
    • +1
    ./web/qb/authoring/addordering.jsp
    • -0
    • +1
    ./web/qb/authoring/addshortanswer.jsp
    • -0
    • +1
    ./web/qb/authoring/addtruefalse.jsp
  12. … 7 more files in changeset.
7:13 pm

Marcin Cieslak

LDEV-4834 Revert to panel LO widget in QB question authoring

Options
    • -1
    • +1
    ./web/qb/authoring/addessay.jsp
    • -1
    • +1
    ./web/qb/authoring/addmarkhedging.jsp
    • -1
    • +1
    ./web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +1
    ./web/qb/authoring/addmultiplechoice.jsp
    • -1
    • +1
    ./web/qb/authoring/addnumerical.jsp
    • -1
    • +1
    ./web/qb/authoring/addordering.jsp
    • -1
    • +1
    ./web/qb/authoring/addshortanswer.jsp
    • -1
    • +1
    ./web/qb/authoring/addtruefalse.jsp
Monday 22 Jul 2019
11:19 pm

Marcin Cieslak

LDEV-4836 Set an option as correct if it has 100% mark

Options
    • -56
    • +51
    ./src/java/org/lamsfoundation/lams/web/qb/EditQbQuestionController.java
10:47 pm

Marcin Cieslak

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

Options
    • -10
    • +33
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    ./web/qb/authoring/addessay.jsp
    • -1
    • +1
    ./web/qb/authoring/addmarkhedging.jsp
    • -1
    • +1
    ./web/qb/authoring/addmatchingpairs.jsp
    • -1
    • +1
    ./web/qb/authoring/addmultiplechoice.jsp
    • -1
    • +1
    ./web/qb/authoring/addnumerical.jsp
    • -1
    • +1
    ./web/qb/authoring/addordering.jsp
    • -1
    • +1
    ./web/qb/authoring/addshortanswer.jsp
    • -1
    • +1
    ./web/qb/authoring/addtruefalse.jsp
  10. … 62 more files in changeset.
10:44 pm

Marcin Cieslak

LDEV-4834 Move Learning Outcomes widget to Settings tab

Options
    • -4
    • +4
    ./web/qb/authoring/addessay.jsp
    • -4
    • +4
    ./web/qb/authoring/addmarkhedging.jsp
    • -4
    • +4
    ./web/qb/authoring/addmatchingpairs.jsp
    • -4
    • +4
    ./web/qb/authoring/addmultiplechoice.jsp
    • -5
    • +5
    ./web/qb/authoring/addnumerical.jsp
    • -4
    • +4
    ./web/qb/authoring/addordering.jsp
    • -4
    • +4
    ./web/qb/authoring/addshortanswer.jsp
    • -4
    • +4
    ./web/qb/authoring/addtruefalse.jsp