lams-github / lams_central

web

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
Thursday 16 Nov 2017
4:54 am

Andrey Balan

LDEV-4436 Ability to change portrait in learner

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

Andrey Balan

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

Options
    • -0
    • +70
    ./css/_dialogs.scss
    • -71
    • +0
    ./css/_main_base.scss
    • -0
    • +1
    ./css/defaultHTML_learner.scss
    • -0
    • +1
    ./css/defaultHTML_main.scss
Wednesday 15 Nov 2017
5:09 pm

Marcin Cieslak

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

Options
    • -1
    • +2
    ./includes/javascript/authoring/authoringGeneral.js
    • -0
    • +4
    ./includes/javascript/authoring/authoringProperty.js
Friday 10 Nov 2017
12:57 am

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
    • +3
    ./authoring/authoring.jsp
    • -0
    • +2
    ./includes/javascript/authoring/authoringActivity.js
    • -43
    • +47
    ./includes/javascript/authoring/authoringGeneral.js
    • -0
    • +1
    ./includes/javascript/authoring/authoringProperty.js
  5. … 7 more files in changeset.
Wednesday 08 Nov 2017
11:45 pm

Andrey Balan

LDEV-4451 Add scss files and fix their names

Options
    • -0
    • +1
    ./css/jqGrid.confidenceLevelFormattter.css
    • -0
    • +41
    ./css/jquery.jqGrid.confidence-level-formattter.scss
    • -34
    • +0
    ./includes/javascript/jqGrid.confidenceLevelFormattter.js
    • -0
    • +34
    ./includes/javascript/jquery.jqGrid.confidence-level-formattter.js
  5. … 6 more files in changeset.
5:32 am

Andrey Balan

LDEV-4451 Display confidence level as percentage rather than number

Options
    • -29
    • +29
    ./includes/javascript/jqGrid.confidenceLevelFormattter.js
Friday 03 Nov 2017
5:24 am

Andrey Balan

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

Options
    • -1
    • +10
    ./css/bootstrap-slider.css
  2. … 2 more files in changeset.
Thursday 02 Nov 2017
8: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
    ./css/circle.css
    • -0
    • +34
    ./includes/javascript/jqGrid.confidenceLevelFormattter.js
  3. … 21 more files in changeset.
Wednesday 01 Nov 2017
7:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4450: Learner icons in progress tab have portraits

Options
    • -17
    • +23
    ./css/_learner_base.scss
    • -7
    • +34
    ./includes/javascript/portrait.js
  3. … 3 more files in changeset.
Tuesday 31 Oct 2017
12:59 am

Marcin Cieslak

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

Options
    • -8
    • +13
    ./addLesson.jsp
  2. … 8 more files in changeset.
Thursday 26 Oct 2017
1:11 pm

Marcin Cieslak

LDEV-4452 Prompt on overwriting unsaved changes in Authoring

Options
    • -5
    • +1
    ./includes/javascript/authoring/authoringGeneral.js
    • -0
    • +6
    ./includes/javascript/authoring/authoringMenu.js
  3. … 2 more files in changeset.
7: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
    • +41
    ./css/bootstrap-slider.css
    • -0
    • +5
    ./includes/javascript/bootstrap-slider.js
  3. … 28 more files in changeset.
Wednesday 25 Oct 2017
8:57 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4366: Small UI change

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

Marcin Cieslak

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

Options
    • -3
    • +25
    ./groupHeader.jsp
  2. … 4 more files in changeset.
Monday 23 Oct 2017
2:29 am

Marcin Cieslak

Merge branch 'LDEV-4366'

Options
    • -0
    • +34
    ./includes/javascript/main.js
  2. … 4 more files in changeset.
Tuesday 17 Oct 2017
7:56 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4434 Monitor and Gradebook uses of jqgrid upgraded.

Options
    • -22
    • +31
    ./css/_learner_base.scss
    • -0
    • +5
    ./css/free.ui.jqgrid.min.css
    • -0
    • +11
    ./includes/javascript/free.jquery.jqgrid.min.js
    • -1
    • +2
    ./includes/javascript/main.js
  5. … 12 more files in changeset.
Saturday 14 Oct 2017
4:47 am

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
    ./ckeditor/plugins/bootsnippets/lang/en.js
    • -0
    • +42
    ./ckeditor/plugins/bootsnippets/lang/es.js
    • -0
    • +42
    ./ckeditor/plugins/bootsnippets/lang/gr.js
    • -0
    • +42
    ./ckeditor/plugins/bootsnippets/lang/ru.js
    • -9
    • +9
    ./ckeditor/plugins/bootsnippets/plugin.js
  6. … 1 more file in changeset.
Friday 13 Oct 2017
1:47 pm

Marcin Cieslak

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

Options
    • -2
    • +2
    ./includes/javascript/authoring/authoringProperty.js
Monday 09 Oct 2017
9:14 pm

Marcin Cieslak

LDEV-4293 Tune session log out

Make sure mapping login->session is cleared in certain situations.

Check if a session already exists for the given login. If so, invalidate

one of the sessions.

Options
    • -5
    • +6
    ./login.jsp
  2. … 2 more files in changeset.
4:23 pm

Marcin Cieslak

LDEV-4293 Rewrite session invalidation mechanism

Server-side non-current session invalidation does not work well on

clustered WildFly 10. It breaks Infinispan distributed session cache and

makes a logged out user clear LAMS cookies, otherwise he/she gets a

blank screen. See WFLY-7281 and WFLY-7229.

So instead of invalidating a session we mark it for invalidation. The

next time the user tries to use it, the session gets invalidated and the

user gets an error screen (not a very clean solution, but more effective

than another filter which would nicely redirect the user to logout

screen).

This solution seems to work nicely if both browsers interact with the

same node. Since we use distributed session for failover rather than

replication, it should be OK.

Options
    • -4
    • +3
    ./login.jsp
  2. … 3 more files in changeset.
Saturday 07 Oct 2017
8:27 am

Andrey Balan

LDEV-4432 Solve the problem with dialog's checkbox gets focused on start

Solved by adding an empty <div> to the beginning of the dialog and

marking this div as required to be focused.

Options
    • -9
    • +2
    ./ckeditor/plugins/bootsnippets/dialogs/snippets.css
    • -0
    • +7
    ./ckeditor/plugins/bootsnippets/plugin.js
Thursday 05 Oct 2017
7:26 pm

Andrey Balan

4429 Fix the JS error when saving image without classes

The issue arises on saving image and specifying no classes at all.

Options
    • -1
    • +1
    ./ckeditor/plugins/image2/dialogs/image2.js
1:01 am

Andrey Balan

LDEV-4432 Add new CKEditor plugin for working with Bootsrap snippets

Options
    • -0
    • +92
    ./ckeditor/plugins/bootsnippets/dialogs/snippets.css
    • binary
    ./ckeditor/plugins/bootsnippets/icons/hidpi/snippets-rtl.png
    • binary
    ./ckeditor/plugins/bootsnippets/icons/hidpi/snippets.png
    • binary
    ./ckeditor/plugins/bootsnippets/icons/ico_image.ico
    • binary
    ./ckeditor/plugins/bootsnippets/icons/ico_photo.gif
    • binary
    ./ckeditor/plugins/bootsnippets/icons/ico_text.ico
    • binary
    ./ckeditor/plugins/bootsnippets/icons/ico_video.png
    • binary
    ./ckeditor/plugins/bootsnippets/icons/snippets-rtl.png
    • binary
    ./ckeditor/plugins/bootsnippets/icons/snippets.png
    • -0
    • +14
    ./ckeditor/plugins/bootsnippets/lang/en.js
    • -0
    • +276
    ./ckeditor/plugins/bootsnippets/plugin.js
    • -3
    • +10
    ./includes/javascript/ckconfig_custom.js
12:59 am

Andrey Balan

LDEV-4432 Create plugin that will handle editing of Bootsrap panels

The name of the plugin is 'bootpanel' and it allows editing some of

panel's properties including making them clickable.

Options
    • -0
    • +78
    ./ckeditor/plugins/bootpanel/dialogs/element.css
    • -0
    • +334
    ./ckeditor/plugins/bootpanel/dialogs/element.js
    • binary
    ./ckeditor/plugins/bootpanel/icons/hidpi/image.png
    • binary
    ./ckeditor/plugins/bootpanel/icons/image.png
    • binary
    ./ckeditor/plugins/bootpanel/images/noimage.png
    • -0
    • +32
    ./ckeditor/plugins/bootpanel/lang/en.js
    • -0
    • +42
    ./ckeditor/plugins/bootpanel/plugin.js
    • -0
    • +17
    ./css/_learner_base.scss
    • -0
    • +12
    ./includes/javascript/clickable.js
Wednesday 04 Oct 2017
4:59 am

Andrey Balan

LDEV-4429 Add jqeury.js and bootstrap.min.js scripts to preview page

Options
    • -1
    • +1
    ./ckeditor/ckeditor.js
Tuesday 03 Oct 2017
8:56 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4430 fixes for signup pages

Small cosmetic changes in signup pages

Options
    • -8
    • +7
    ./signup/signup.jsp
    • -1
    • +0
    ./signup/singupTab.jsp
2:44 am

Marcin Cieslak

LDEV-4366 Kumalive reports export

Allow exporting all and selected Kumalives in Excel format. Use i18n

instead of hardcoded labels. Move free jqGrid library to lams_central.

Minor fixes.

Options
    • -0
    • +5
    ./css/free.ui.jqgrid.min.css
    • -0
    • +11
    ./includes/javascript/free.jquery.jqgrid.min.js
  3. … 10 more files in changeset.
12:38 am

Andrey Balan

LDEV-4429 Add 'classes' field to image2 plugin

Options
    • -0
    • +36
    ./ckeditor/plugins/image2/dialogs/image2.js
    • -1
    • +2
    ./ckeditor/plugins/image2/plugin.js
Sunday 01 Oct 2017
2:05 am

Marcin Cieslak

LDEV-4366 Initial implementation of Kumalive reports

Latest free jqGrid is used as the one present in lams_central is

outdated and standard jqGrid became commercial.

Use bootstrap theme with Font Awesome icons.

Rewrite XML code used in Gradebook to feed jqGrid into JSON.

Options
    • -0
    • +18
    ./includes/javascript/main.js
    • -0
    • +2
    ./main.jsp
  3. … 13 more files in changeset.
1:09 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4366

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java

Options
    • -6
    • +8
    ./main.jsp
  2. … 3 more files in changeset.