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 24 Oct 2017
12:05 am

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.
Monday 23 Oct 2017
11: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.
2:29 am

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.
Friday 20 Oct 2017
4:15 am

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
7: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.
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
    ./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.
Friday 13 Oct 2017
8: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.
1:47 pm

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
11: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.
Wednesday 11 Oct 2017
7:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4415' Marks can now be weighted

Options
    • -0
    • +7
    ./conf/language/lams/ApplicationResources.properties
  2. … 1 more file in changeset.
12:38 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating translations

Updating Greek and English

Options
    • -4
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +7
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -5
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
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
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/web/SessionListener.java
    • -5
    • +6
    ./web/login.jsp
  3. … 1 more file 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
    • -17
    • +6
    ./src/java/org/lamsfoundation/lams/web/SessionListener.java
    • -4
    • +3
    ./web/login.jsp
  3. … 2 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
    ./web/ckeditor/plugins/bootsnippets/dialogs/snippets.css
    • -0
    • +7
    ./web/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
    ./web/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
    ./web/ckeditor/plugins/bootsnippets/dialogs/snippets.css
    • binary
    ./web/ckeditor/plugins/bootsnippets/icons/hidpi/snippets-rtl.png
    • binary
    ./web/ckeditor/plugins/bootsnippets/icons/hidpi/snippets.png
    • binary
    ./web/ckeditor/plugins/bootsnippets/icons/ico_image.ico
    • binary
    ./web/ckeditor/plugins/bootsnippets/icons/ico_photo.gif
    • binary
    ./web/ckeditor/plugins/bootsnippets/icons/ico_text.ico
    • binary
    ./web/ckeditor/plugins/bootsnippets/icons/ico_video.png
    • binary
    ./web/ckeditor/plugins/bootsnippets/icons/snippets-rtl.png
    • binary
    ./web/ckeditor/plugins/bootsnippets/icons/snippets.png
    • -0
    • +14
    ./web/ckeditor/plugins/bootsnippets/lang/en.js
    • -0
    • +276
    ./web/ckeditor/plugins/bootsnippets/plugin.js
    • -3
    • +10
    ./web/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
    ./web/ckeditor/plugins/bootpanel/dialogs/element.css
    • -0
    • +334
    ./web/ckeditor/plugins/bootpanel/dialogs/element.js
    • binary
    ./web/ckeditor/plugins/bootpanel/icons/hidpi/image.png
    • binary
    ./web/ckeditor/plugins/bootpanel/icons/image.png
    • binary
    ./web/ckeditor/plugins/bootpanel/images/noimage.png
    • -0
    • +32
    ./web/ckeditor/plugins/bootpanel/lang/en.js
    • -0
    • +42
    ./web/ckeditor/plugins/bootpanel/plugin.js
    • -0
    • +17
    ./web/css/_learner_base.scss
    • -0
    • +12
    ./web/includes/javascript/clickable.js
Wednesday 04 Oct 2017
8:56 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Lesson marks always recalculated after Live Edit

Also tries to respect any teacher modified lesson marks when

activity marks are changed by doing a 'take the old marks off

and add the new mark on' calculation for weighting.

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
  2. … 1 more file in changeset.
4:59 am

Andrey Balan

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

Options
    • -1
    • +1
    ./web/ckeditor/ckeditor.js
Tuesday 03 Oct 2017
10:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4423 Additional portrait entries

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
  2. … 10 more files in changeset.
8:56 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4430 fixes for signup pages

Small cosmetic changes in signup pages

Options
    • -8
    • +7
    ./web/signup/signup.jsp
    • -1
    • +0
    ./web/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
    ./web/css/free.ui.jqgrid.min.css
    • -0
    • +11
    ./web/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
    ./web/ckeditor/plugins/image2/dialogs/image2.js
    • -1
    • +2
    ./web/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
    ./web/includes/javascript/main.js
    • -0
    • +2
    ./web/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
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +8
    ./web/main.jsp
  3. … 2 more files in changeset.
Saturday 30 Sep 2017
10:10 am

Andrey Balan

LDEV-4429 Open JLatexmath dialog when clicking on its image

Options
    • -1
    • +1
    ./web/ckeditor/plugins/image2/plugin.js
    • -3
    • +0
    ./web/ckeditor/plugins/jlatexmath/plugin.js
9:23 am

Andrey Balan

LDEV-4429 Modify html5audio plugin

Add support for double click event. Also add padding around widget to

increate area where user can double click and right click when trying to

open html5audio dialog

Options
    • -0
    • +19
    ./web/ckeditor/plugins/html5audio/plugin.js
9:22 am

Andrey Balan

LDEV-4429 Modify bootstrapTabs plugin

The "element.getAscendant"'s function that was specified in Double click

and contextMenu listener methods were replaced with the following:

return !( element instanceof CKEDITOR.dom.document ) &&

element.hasClass('bootstrap-tabs') ;

As otherwise it always false positively determined there is a tabs

element in CKEditor canvas (due to LAMS header containing a tab).

Options
    • -21
    • +15
    ./web/ckeditor/plugins/bootstrapTabs/plugin.js
9:21 am

Andrey Balan

LDEV-4429 Add html5audio and bootstrapTabs plugins

Options
    • -0
    • +674
    ./web/ckeditor/plugins/bootstrapTabs/LICENSE-GPL
    • -0
    • +165
    ./web/ckeditor/plugins/bootstrapTabs/LICENSE-LGPL
    • -0
    • +373
    ./web/ckeditor/plugins/bootstrapTabs/LICENSE-MPL
    • -0
    • +11
    ./web/ckeditor/plugins/bootstrapTabs/README.md
    • -0
    • +244
    ./web/ckeditor/plugins/bootstrapTabs/dialogs/bootstrapTabs.js
    • binary
    ./web/ckeditor/plugins/bootstrapTabs/icons/bootstrapTabs.png
    • -0
    • +14
    ./web/ckeditor/plugins/bootstrapTabs/lang/en.js
    • -0
    • +13
    ./web/ckeditor/plugins/bootstrapTabs/lang/ru.js
    • -0
    • +91
    ./web/ckeditor/plugins/bootstrapTabs/plugin.js
    • -0
    • +32
    ./web/ckeditor/plugins/bootstrapTabs/sample/bootstrapTabs.html
    • -0
    • +135
    ./web/ckeditor/plugins/html5audio/dialogs/html5audio.js
    • binary
    ./web/ckeditor/plugins/html5audio/icons/html5audio.png
    • -0
    • +14
    ./web/ckeditor/plugins/html5audio/lang/de.js
    • -0
    • +14
    ./web/ckeditor/plugins/html5audio/lang/el.js
    • -0
    • +14
    ./web/ckeditor/plugins/html5audio/lang/en.js
  16. … 10 more files in changeset.
9:15 am

Andrey Balan

LDEV-4429 Preview should show text on a white background

Don't add class to the resulted preview body. It can be achieved by

removing the following line

,d.getAttribute("class")&&(b+='class\x3d"'+d.getAttribute("class")+'" ')

Options
    • -1
    • +1
    ./web/ckeditor/ckeditor.js