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 21 Nov 2017
12:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457 Create groupings based on file upload

Options
    • -0
    • +16
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +17
    ./web/WEB-INF/struts-config.xml
    • -1
    • +13
    ./web/css/orgGroup.scss
    • -0
    • +126
    ./web/includes/javascript/orgGroup.js
    • -6
    • +71
    ./web/orgGroup.jsp
  7. … 10 more files in changeset.
Monday 20 Nov 2017
4:43 pm

Andrey Balan

LDEV-4436 Fixing progress bar css

Removed 'min-height' parameter as it was causing nav.sidebar to

appear larger than its descendant .container-fluid div.

Besides, removed box-shadow parameter from .container-fluid as

its parent already has it.

Options
    • -2
    • +0
    ./web/css/_learner_base.scss
Thursday 16 Nov 2017
2:34 pm

Marcin Cieslak

LDEV-4454 Add Kumalive poll setup front end

Options
    • -2
    • +2
    ./conf/scss/_bootstrap-variables.scss
  2. … 4 more files in changeset.
Wednesday 15 Nov 2017
9:54 pm

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    ./web/WEB-INF/tags/Page.tag
    • -6
    • +33
    ./web/css/_learner_base.scss
    • -0
    • +25
    ./web/includes/javascript/dialog.js
    • -6
    • +8
    ./web/portrait.jsp
  5. … 30 more files in changeset.
9:50 pm

Andrey Balan

LDEV-4436 Dialog CSS rules to be available in learning as well

Options
    • -0
    • +70
    ./web/css/_dialogs.scss
    • -71
    • +0
    ./web/css/_main_base.scss
    • -0
    • +1
    ./web/css/defaultHTML_learner.scss
    • -0
    • +1
    ./web/css/defaultHTML_main.scss
10:09 am

Marcin Cieslak

LDEV-4453 Fix weights calculation on LD save when output changed

Options
    • -1
    • +2
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +4
    ./web/includes/javascript/authoring/authoringProperty.js
Thursday 09 Nov 2017
5:57 pm

Marcin Cieslak

LDEV-4453 Mark chosen activity outputs as weightable

Activity outputs without max score are not eligible for weighting as we

can not calculate percent in which the activity is completed. They must

not appear in weighting dialog and they must always have 0% weight.

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    ./web/authoring/authoring.jsp
    • -0
    • +2
    ./web/includes/javascript/authoring/authoringActivity.js
    • -43
    • +47
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +1
    ./web/includes/javascript/authoring/authoringProperty.js
  6. … 6 more files in changeset.
4:40 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4366: adding labels

Options
    • -2
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
4:30 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4453: adding labels

Adding labels to central and learning

Options
    • -8
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 2 more files in changeset.
Wednesday 08 Nov 2017
4:45 pm

Andrey Balan

LDEV-4451 Add scss files and fix their names

Options
    • -0
    • +1
    ./.gitignore
    • -0
    • +1
    ./web/css/jqGrid.confidenceLevelFormattter.css
    • -0
    • +41
    ./web/css/jquery.jqGrid.confidence-level-formattter.scss
    • -34
    • +0
    ./web/includes/javascript/jqGrid.confidenceLevelFormattter.js
    • -0
    • +34
    ./web/includes/javascript/jquery.jqGrid.confidence-level-formattter.js
  6. … 5 more files in changeset.
Tuesday 07 Nov 2017
10:32 pm

Andrey Balan

LDEV-4451 Display confidence level as percentage rather than number

Options
    • -29
    • +29
    ./web/includes/javascript/jqGrid.confidenceLevelFormattter.js
9:57 am

Marcin Cieslak

LDEV-4453 Fix method calls after signature changes

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  4. … 1 more file in changeset.
Thursday 02 Nov 2017
10:24 pm

Andrey Balan

LDEV-4451 Make slider neater (narrower and with lesser text size)

Options
    • -1
    • +10
    ./web/css/bootstrap-slider.css
  2. … 2 more files in changeset.
1:01 am

Andrey Balan

LDEV-4451 Display confidence levels in Scratchie

Add ability to Scratchie to display what options the individual students

have had in the individual assessment.

Add advanced option to Scratchie - 'Show confidences' and then list

activites from the sequence to choose from (skip branching or use only

the current branch if inside of it).

Options
    • -0
    • +1050
    ./web/css/circle.css
    • -0
    • +34
    ./web/includes/javascript/jqGrid.confidenceLevelFormattter.js
  3. … 21 more files in changeset.
12:51 am

Andrey Balan

LDEV-4451 Move ConfidenceLevels to the tools finally

ConfidenceLevels should be stored at the tools levels as otherwise it's

hard to keep questions hashes updated in lams_central.

Options
    • -80
    • +0
    ./src/java/org/lamsfoundation/lams/web/ConfidenceLevelServlet.java
  2. … 12 more files in changeset.
Wednesday 01 Nov 2017
12:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4450: Learner icons in progress tab have portraits

Options
    • -17
    • +23
    ./web/css/_learner_base.scss
    • -7
    • +34
    ./web/includes/javascript/portrait.js
  3. … 3 more files in changeset.
Monday 30 Oct 2017
5:59 pm

Marcin Cieslak

LDEV-4453 Add "gradebook on lesson complete" field to Lesson

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -8
    • +13
    ./web/addLesson.jsp
  3. … 7 more files in changeset.
Thursday 26 Oct 2017
7:11 am

Marcin Cieslak

LDEV-4452 Prompt on overwriting unsaved changes in Authoring

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +1
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +6
    ./web/includes/javascript/authoring/authoringMenu.js
1:17 am

Andrey Balan

LDEV-4451 Allow learners to choose confidence levels

Add advanced option in Assessment/MCQ - 'Store Confidences'.

If this option is ON, then in learning show sliders which will allow

choosing confidence levels. Display stored levels in learning and

monitoring.

Options
    • -0
    • +80
    ./src/java/org/lamsfoundation/lams/web/ConfidenceLevelServlet.java
    • -0
    • +41
    ./web/css/bootstrap-slider.css
    • -0
    • +5
    ./web/includes/javascript/bootstrap-slider.js
  4. … 27 more files in changeset.
Wednesday 25 Oct 2017
2:57 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4366: Small UI change

Options
    • -9
    • +12
    ./web/groupHeader.jsp
Tuesday 24 Oct 2017
3:53 pm

Marcin Cieslak

LDEV-4366 Disable learner's button when Kumalive is not started

Options
    • -26
    • +37
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -3
    • +25
    ./web/groupHeader.jsp
  3. … 3 more files in changeset.
Monday 23 Oct 2017
6:05 pm

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on organisation level

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
  2. … 7 more files in changeset.
5:34 pm

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on sysadmin level

Options
    • -5
    • +13
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
  2. … 6 more files in changeset.
Sunday 22 Oct 2017
8:29 pm

Marcin Cieslak

Merge branch 'LDEV-4366'

Options
    • -0
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/scss/_bootstrap-variables.scss
    • -0
    • +34
    ./web/includes/javascript/main.js
  4. … 2 more files in changeset.
Thursday 19 Oct 2017
10:15 pm

Marcin Cieslak

LDEV-4440 Add a test library which does not reference Struts

After full LAMS migration to Spring MVC it will become

3rdParty.userlibraries

Options
    • -0
    • +183
    ./src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishController.java
    • -0
    • +108
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java
  3. … 66 more files in changeset.
Tuesday 17 Oct 2017
1:56 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4434 Monitor and Gradebook uses of jqgrid upgraded.

Options
    • -3
    • +3
    ./conf/scss/_bootstrap-variables.scss
    • -22
    • +31
    ./web/css/_learner_base.scss
    • -0
    • +5
    ./web/css/free.ui.jqgrid.min.css
    • -0
    • +11
    ./web/includes/javascript/free.jquery.jqgrid.min.js
    • -1
    • +2
    ./web/includes/javascript/main.js
  6. … 11 more files in changeset.
Friday 13 Oct 2017
10:47 pm

Andrey Balan

LDEV-4441 CKEditor bootsnippets plugin to support i18n

Make bootsnippets plugin to support i18n. Besides of the plugin's

internal labels, we're also going to translate labels from

/lams_www/web/public/ckeditor-templates/bootsnippets.js (but only

snippets' titles).

Options
    • -1
    • +29
    ./web/ckeditor/plugins/bootsnippets/lang/en.js
    • -0
    • +42
    ./web/ckeditor/plugins/bootsnippets/lang/es.js
    • -0
    • +42
    ./web/ckeditor/plugins/bootsnippets/lang/gr.js
    • -0
    • +42
    ./web/ckeditor/plugins/bootsnippets/lang/ru.js
    • -9
    • +9
    ./web/ckeditor/plugins/bootsnippets/plugin.js
  6. … 1 more file in changeset.
2:01 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

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

Options
    • -26
    • +17
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -34
    • +17
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
  5. … 5 more files in changeset.
7:47 am

Marcin Cieslak

LDEV-4439 Fix a typo in optional activity properties init code

Options
    • -2
    • +2
    ./web/includes/javascript/authoring/authoringProperty.js
Thursday 12 Oct 2017
5:31 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating English and Spanish for various projects

Options
    • -9
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 5 more files in changeset.