lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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
Saturday 07 Oct 2017
8:28 am

Andrey Balan

Merge branch 'LDEV-4432'

Options
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
    /lams_central/web/ckeditor/plugins/bootsnippets/dialogs/snippets.css
    • -0
    • +7
    /lams_central/web/ckeditor/plugins/bootsnippets/plugin.js
8:14 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4433: reverting files that shouldn't have changed.

Options
    • -4
    • +0
    /lams_build/common.properties
    • -1
    • +0
    /lams_build/unix.properties
8:00 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4433: adding new label

Options
    • -1
    • +5
    /lams_build/common.properties
    • -1
    • +2
    /lams_build/unix.properties
    • -2
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
Friday 06 Oct 2017
8:03 pm

Andrey Balan

Merge branch 'LDEV-4433'

Options
8:02 pm

Andrey Balan

LDEV-4433 Move simplified activities info to Lesson summary tab

Besides, display info only for those activities that have numeric

outputs (which are Assessment, MCQ or Sratchie. Also activity must be

set to produce tool outputs in Authoring)

Options
    • -55
    • +67
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
6:19 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4431 Portraits shown in Monitor and Course Gradebook

Options
    • -6
    • +19
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dto/GBUserGridRowDTO.java
    • -5
    • +18
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -7
    • +33
    /lams_gradebook/web/gradebookMonitor.jsp
    • -2
    • +5
    /lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
2:55 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4432: Tweaking snippets video

Fixing layout and embedding video options

Options
    • -1
    • +1
    /lams_www/web/public/ckeditor-templates/bootsnippets.js
    • binary
    /lams_www/web/public/ckeditor-templates/images/video.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/video_side_text.png
12:42 am

Andrey Balan

LDEV-4433 Add 'Simplified activity' tab to the lesson gradebook export

Options
    • -0
    • +52
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Thursday 05 Oct 2017
7:27 pm

Andrey Balan

Merge branch 'LDEV-4429'

Options
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
    /lams_central/web/ckeditor/plugins/image2/dialogs/image2.js
4:41 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4432: Tweaking snippets images and text

Adding new public domain images as well as tweaking layouts slightly

Options
    • -26
    • +26
    /lams_www/web/public/ckeditor-templates/bootsnippets.js
    • binary
    /lams_www/web/public/ckeditor-templates/images/albert.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/cape_phiolent.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/centered_image.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/centered_image.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/cogs.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/desert.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/desk.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/fuji.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/ideas.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/image_and_text.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/image_full_width.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/image_full_width.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/image_within_a_panel.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/krabi.jpg
  16. … 13 more files in changeset.
1:06 am

Andrey Balan

LDEV-4432 Introduce config file for bootsnippets CKEditor plugin

Config file is located in

/lams-www/www/public/ckeditor-templates/bootsnippets.js (if the path

will be altered, it needs to be updated in ckconfig_custom.js). Contains

list of Bootstrap snippets with all required images and CSS files.

Options
    • -0
    • +519
    /lams_www/web/public/ckeditor-templates/bootsnippets.js
    • -0
    • +53
    /lams_www/web/public/ckeditor-templates/css/panel_table.css
    • binary
    /lams_www/web/public/ckeditor-templates/images/audio.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/cape_phiolent.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/carousel.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/centered_image.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/desert.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/image_and_text.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/image_full_width.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/image_within_a_panel.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/jumbotron_with_text.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/mountain_ridge.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/note.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/orangutan_house.jpg
    • binary
    /lams_www/web/public/ckeditor-templates/images/panel with tabs.jpg
  16. … 19 more files in changeset.
1:01 am

Andrey Balan

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

Options
    • -0
    • +92
    /lams_central/web/ckeditor/plugins/bootsnippets/dialogs/snippets.css
    • binary
    /lams_central/web/ckeditor/plugins/bootsnippets/icons/hidpi/snippets-rtl.png
    • binary
    /lams_central/web/ckeditor/plugins/bootsnippets/icons/hidpi/snippets.png
    • binary
    /lams_central/web/ckeditor/plugins/bootsnippets/icons/ico_image.ico
    • binary
    /lams_central/web/ckeditor/plugins/bootsnippets/icons/ico_photo.gif
    • binary
    /lams_central/web/ckeditor/plugins/bootsnippets/icons/ico_text.ico
    • binary
    /lams_central/web/ckeditor/plugins/bootsnippets/icons/ico_video.png
    • binary
    /lams_central/web/ckeditor/plugins/bootsnippets/icons/snippets-rtl.png
    • binary
    /lams_central/web/ckeditor/plugins/bootsnippets/icons/snippets.png
    • -0
    • +14
    /lams_central/web/ckeditor/plugins/bootsnippets/lang/en.js
    • -0
    • +276
    /lams_central/web/ckeditor/plugins/bootsnippets/plugin.js
    • -3
    • +10
    /lams_central/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
    /lams_central/web/ckeditor/plugins/bootpanel/dialogs/element.css
    • -0
    • +334
    /lams_central/web/ckeditor/plugins/bootpanel/dialogs/element.js
    • binary
    /lams_central/web/ckeditor/plugins/bootpanel/icons/hidpi/image.png
    • binary
    /lams_central/web/ckeditor/plugins/bootpanel/icons/image.png
    • binary
    /lams_central/web/ckeditor/plugins/bootpanel/images/noimage.png
    • -0
    • +32
    /lams_central/web/ckeditor/plugins/bootpanel/lang/en.js
    • -0
    • +42
    /lams_central/web/ckeditor/plugins/bootpanel/plugin.js
    • -0
    • +17
    /lams_central/web/css/_learner_base.scss
    • -0
    • +12
    /lams_central/web/includes/javascript/clickable.js
12:54 am

Andrey Balan

Merge branch 'LDEV-4429'

Options
Wednesday 04 Oct 2017
2:09 pm

Marcin Cieslak

LDEV-4366 Re-enable export buttons based on cookie conversation

The solution is based on Andrey's solution for Gradebook.

Options
    • -0
    • +7
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -17
    • +28
    /lams_learning/web/kumalive/kumaliveReport.jsp
12:35 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
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
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -6
    • +11
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
4:59 am

Andrey Balan

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

Options
    • -1
    • +1
    /lams_central/web/ckeditor/ckeditor.js
Tuesday 03 Oct 2017
2:19 pm

Marcin Cieslak

LDEV-4366 Add learners summary sheet to Kumalive Excel report

Also add date to learner attempts in Kumalive sheet and do some minor

formatting.

Options
    • -1
    • +3
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -17
    • +125
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
2:17 pm

Marcin Cieslak

LDEV-4366 Disable export buttons to prevent double clicking

They get re-enable after few seconds.

Options
    • -11
    • +21
    /lams_learning/web/kumalive/kumaliveReport.jsp
10:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4423 Additional portrait entries

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
    • -1
    • +1
    /lams_learning/web/grouping/show.jsp
    • -1
    • +1
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
    • -3
    • +7
    /lams_tool_images/web/pages/learning/learning.jsp
    • -4
    • +5
    /lams_tool_leader/web/pages/learning/leaderselection.jsp
    • -1
    • +2
    /lams_tool_leader/web/pages/monitoring/manageLeaders.jsp
    • -1
    • +1
    /lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp
    • -1
    • +1
    /lams_tool_wiki/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties
    • -13
    • +15
    /lams_tool_wiki/web/pages/learning/wiki.jsp
    • -11
    • +13
    /lams_tool_wiki/web/pages/monitoring/wikiDisplay.jsp
8:56 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4430 fixes for signup pages

Small cosmetic changes in signup pages

Options
    • -8
    • +7
    /lams_central/web/signup/signup.jsp
    • -1
    • +0
    /lams_central/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
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +5
    /lams_central/web/css/free.ui.jqgrid.min.css
    • -0
    • +11
    /lams_central/web/includes/javascript/free.jquery.jqgrid.min.js
    • -0
    • +14
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -5
    • +52
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -3
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -2
    • +13
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +6
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -27
    • +150
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -0
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -20829
    • +0
    /lams_learning/web/includes/javascript/jquery.jqgrid.src.js
    • -14
    • +57
    /lams_learning/web/kumalive/kumaliveReport.jsp
12:38 am

Andrey Balan

LDEV-4429 Add 'classes' field to image2 plugin

Options
    • -0
    • +36
    /lams_central/web/ckeditor/plugins/image2/dialogs/image2.js
    • -1
    • +2
    /lams_central/web/ckeditor/plugins/image2/plugin.js
Sunday 01 Oct 2017
8:59 pm

Marcin Cieslak

LDEV-4366 Fix JAR broken when merging. Fix batch naming.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_learning/web/includes/javascript/kumalive.js
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
    /lams_central/web/includes/javascript/main.js
    • -0
    • +2
    /lams_central/web/main.jsp
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170710.sql
    • -0
    • +1
    /lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveScore.hbm.xml
    • -5
    • +126
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -2
    • +9
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -2
    • +45
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -2
    • +11
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java
    • -1
    • +11
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -4
    • +181
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -0
    • +5
    /lams_learning/web/WEB-INF/struts-config.xml
    • -0
    • +20829
    /lams_learning/web/includes/javascript/jquery.jqgrid.src.js
    • -1
    • +4
    /lams_learning/web/includes/javascript/kumalive.js
    • -0
    • +160
    /lams_learning/web/kumalive/kumaliveReport.jsp
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
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -6
    • +8
    /lams_central/web/main.jsp
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
Saturday 30 Sep 2017
10:10 am

Andrey Balan

LDEV-4429 Open JLatexmath dialog when clicking on its image

Options
    • -1
    • +1
    /lams_central/web/ckeditor/plugins/image2/plugin.js
    • -3
    • +0
    /lams_central/web/ckeditor/plugins/jlatexmath/plugin.js