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
Wednesday 09 Jan 2019
6:51 am

Andrey Balan

Merge branch 'LDEV-4747' into develop

Options
6:50 am

Andrey Balan

LDEV-4747 Fix cancel button, which used to save instead of cancel

Options
    • -10
    • +0
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LoginMaintainController.java
    • -7
    • +5
    /lams_admin/web/config/editconfig.jsp
    • -16
    • +20
    /lams_admin/web/loginmaintain.jsp
    • -7
    • +7
    /lams_admin/web/timezoneManagement.jsp
Tuesday 08 Jan 2019
1:48 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v3.1'

Options
7:02 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4743 Update SQL script with autopatch changes for LAMS 3.1 release

Options
6:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4743 Squash/Update SQL scripts ready for LAMS 3.1 release

Options
    • -1
    • +1
    /lams_tool_assessment/build.properties
    • -18
    • +22
    /lams_tool_assessment/db/sql/create_lams_tool_assessment.sql
    • -16
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20130216.sql
    • -15
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20130611.sql
    • -14
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20131118.sql
    • -20
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140101.sql
    • -19
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140102.sql
    • -16
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140428.sql
    • -17
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140612.sql
    • -17
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140707.sql
    • -15
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20140723.sql
    • -14
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150629.sql
    • -14
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150706.sql
    • -14
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150731.sql
    • -14
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150928.sql
  16. … 115 more files in changeset.
4:12 am

Andrey Balan

Merge branch 'LDEV-4743'

Options
4:11 am

Andrey Balan

LDEV-4743 Update SQL script with autopatch changes for LAMS 3.1 release

Options
    • -1
    • +1
    /lams_tool_laqa/build.properties
    • -59
    • +6
    /lams_tool_laqa/db/sql/create_lams_tool_qa.sql
    • -1
    • +0
    /lams_tool_laqa/db/sql/db_version_insert.sql
    • -11
    • +8
    /lams_tool_laqa/db/sql/tool_insert.sql
    • -26
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140101.sql
    • -19
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140102.sql
    • -19
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140527.sql
    • -16
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140812.sql
    • -15
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20140822.sql
    • -19
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20150511.sql
    • -14
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20150619.sql
    • -14
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20150930.sql
    • -23
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20151006.sql
    • -51
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20151217.sql
    • -14
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20160325.sql
  16. … 125 more files in changeset.
Monday 07 Jan 2019
8:01 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4744 Authoring window JSTL error fixed. Needed primitive boolean.

Options
    • -2
    • +3
    /lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java
Saturday 05 Jan 2019
9:16 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4743 update SQL core tables

Updating all core tables for 3.1 release.

Options
    • -1531
    • +2445
    /lams_common/db/sql/create_lams_11_tables.sql
    • -173
    • +252
    /lams_common/db/sql/create_quartz_table.sql
    • -299
    • +9
    /lams_common/db/sql/insert_lams_config_data.sql
    • -235
    • +38
    /lams_common/db/sql/insert_lams_users.sql
    • -321
    • +235
    /lams_common/db/sql/insert_types_data.sql
6:51 am

Andrey Balan

LDEV-4743 Update SQL script with autopatch changes for LAMS 3.1 release

Options
    • -2
    • +2
    /lams_tool_task/db/sql/create_lams_tool_taskList.sql
6:01 am

Andrey Balan

Merge branch 'LDEV-4743'

Options
6:00 am

Andrey Balan

LDEV-4743 Update SQL script with autopatch changes for LAMS 3.1 release

Options
    • -1
    • +1
    /lams_tool_task/build.properties
    • -6
    • +4
    /lams_tool_task/db/sql/create_lams_tool_taskList.sql
    • -54
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20140102.sql
    • -13
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20150217.sql
    • -14
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20150930.sql
    • -85
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20151217.sql
    • -39
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20170101.sql
    • -0
    • +163
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dbupdates/patch20170101_updateTo30.sql
3:51 am

Andrey Balan

LDEV-4699 Fix Tasklist tool's comments feature

* Fixed feature for v3.1

* Allow several tasks to have this feature ON

* Minor code improvements

Options
    • -1
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java
    • -8
    • +8
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TasListItemDTO.java
    • -89
    • +54
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java
    • -3
    • +0
    /lams_tool_task/web/pages/authoring/parts/itemlist.jsp
    • -0
    • +20
    /lams_tool_task/web/pages/learning/learning.jsp
    • -3
    • +0
    /lams_tool_task/web/pages/learning/parts/addtask.jsp
    • -11
    • +32
    /lams_tool_task/web/pages/learning/parts/commentlist.jsp
    • -27
    • +8
    /lams_tool_task/web/pages/learning/parts/itemdetails.jsp
    • -12
    • +2
    /lams_tool_task/web/pages/learning/parts/itemlist.jsp
Thursday 03 Jan 2019
7:50 pm

Marcin Cieslak

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

Options
7:22 pm

Marcin Cieslak

LDEV-4714 Fix a typo in arrange detection.

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
7:21 pm

Marcin Cieslak

LDEV-4696 Make inherited properties also mapped to DB.

Options
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
2:50 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4742 Match Groups to Branches dialog body is now shown

Options
    • -0
    • +1
    /lams_central/web/css/_authoring_base.scss
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4740 Support Activity error message shown correctly.

Options
    • -14
    • +11
    /lams_learning/web/msgContent.jsp
2:33 am

Andrey Balan

LDEV-4692 Fix time taken's timezone

And some minor code formatting.

Options
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java
    • -10
    • +10
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java
    • -16
    • +13
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/MonitoringController.java
1:50 am

Andrey Balan

LDEV-4700 Fix getDefaultTheme() method

Options
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java
Wednesday 02 Jan 2019
7:16 pm

Andrey Balan

LDEV-4719 Remove incorrect warning for numerical question's units

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/parts/unitlist.jsp
Friday 28 Dec 2018
11:38 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4730 Updating Spanish forum labels

Options
    • -2
    • +2
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties
11:36 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4730 Updating labels for Peer review

Updating English, Greek, Spanish and Norwegian

Options
    • -6
    • +7
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -9
    • +2
    /lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +6
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    /lams_tool_preview/conf/language/lams/ApplicationResources_es_ES.properties
    • -9
    • +2
    /lams_tool_preview/conf/language/lams/ApplicationResources_no_NO.properties
11:33 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4730 Updating labels for Scratchie

Updating Greek, English and Spanish

Options
    • -6
    • +7
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +6
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_es_ES.properties
11:30 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4730 Updating labels for Leader selection

Updating Greek, English and Spanish

Options
    • -1
    • +1
    /lams_tool_leader/conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    /lams_tool_leader/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    /lams_tool_leader/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    /lams_tool_leader/conf/language/lams/ApplicationResources_es_ES.properties
11:27 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4730 Updating labels for IMS Common cartridge

Updating Greek, Spanish, English and Norwegian

Options
    • -9
    • +6
    /lams_tool_imscc/conf/language/lams/ApplicationResources.properties
    • -5
    • +2
    /lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties
    • -5
    • +5
    /lams_tool_imscc/conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +6
    /lams_tool_imscc/conf/language/lams/ApplicationResources_es_ES.properties
    • -5
    • +2
    /lams_tool_imscc/conf/language/lams/ApplicationResources_no_NO.properties
11:21 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4730 Updating labels for Mindmap

Updating Spanish, English and Greek

Options
    • -6
    • +7
    /lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +6
    /lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    /lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties
11:18 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4730 Updating labels for Assessment

Updating English, Spanish and Greek

Options
    • -10
    • +10
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -4
    • +8
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +8
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
3:40 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4730 Updating labels for Gradebook

Updating English, Spanish, Norwegian and Greek.

Options
    • -12
    • +14
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -2
    • +12
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +12
    /lams_gradebook/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources_no_NO.properties
3:27 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4730 Updating labels for images

Updating English, Spanish, Greek and Norwegian

Options
    • -6
    • +7
    /lams_tool_images/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +6
    /lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    /lams_tool_images/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_images/conf/language/lams/ApplicationResources_no_NO.properties