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
Tuesday 10 Nov 2015
2:54 am

Marcin Cieslak

LDEV-3600: In Sequence and Learners tab allow searching for Learners who has not started the lesson yet.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -123
    • +133
    /lams_central/web/includes/javascript/progressBar.js
    • -5
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -26
    • +27
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -41
    • +54
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -19
    • +52
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -3
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -37
    • +37
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -16
    • +20
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -0
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -3
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -7
    • +9
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -9
    • +16
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -6
    • +7
    /lams_monitoring/web/monitor.jsp
2:30 am

Marcin Cieslak

LDEV-3600: In Sequence and Learners tab allow searching for Learners who has not started the lesson yet.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -123
    • +133
    /lams_central/web/includes/javascript/progressBar.js
    • -5
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILearnerProgressDAO.java
    • -26
    • +27
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
    • -28
    • +41
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LearnerProgressDAO.java
    • -5
    • +48
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -3
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -37
    • +37
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -16
    • +20
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -0
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -3
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -10
    • +11
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -10
    • +17
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -6
    • +7
    /lams_monitoring/web/monitor.jsp
Monday 09 Nov 2015
11:21 am

erniegx <ernieg@gmail.com>

LDEV-3443, LDEV-3586 Adding labels (no for real)

Options
    • -2
    • +8
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
    • -2
    • +8
    /lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +8
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties
11:21 am

erniegx <ernieg@gmail.com>

LDEV-3443, LDEV-3586 Adding labels (no for real)

Options
    • -2
    • +8
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
    • -2
    • +8
    /lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +8
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties
11:16 am

erniegx <ernieg@gmail.com>

LDEV-3443, LDEV-3586 Adding labels

Options
    • -9
    • +5
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
    • -9
    • +4
    /lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +5
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties
11:14 am

erniegx <ernieg@gmail.com>

LDEV-3443, LDEV-3586 Adding labels

Options
    • -9
    • +5
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
    • -9
    • +4
    /lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties
11:07 am

erniegx <ernieg@gmail.com>

LDEV-2975 updating Greek

Options
    • -17
    • +18
    /lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties
11:07 am

erniegx <ernieg@gmail.com>

LDEV-2975 updating Greek

Options
    • -2
    • +12
    /lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties
8:23 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3586: Monitor supports name searching.

Options
    • -3
    • +2
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/IForumUserDAO.java
    • -30
    • +51
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumUserDao.java
    • -4
    • +4
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -2
    • +2
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
    • -3
    • +4
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
    • -3
    • +8
    /lams_tool_forum/web/jsps/monitoring/summary.jsp
8:22 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3581: Name search now works by checking each token in the search string, and it will only match if all tokens exist in the fullname or username fields.

Options
    • -39
    • +74
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java
7:36 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3586: Monitor supports name searching.

Options
    • -1
    • +1
    /lams_tool_forum/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_forum/conf/language/lams/ApplicationResources_en_AU.properties
    • -26
    • +51
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumUserDao.java
    • -4
    • +4
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -2
    • +2
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
    • -3
    • +4
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
    • -3
    • +8
    /lams_tool_forum/web/jsps/monitoring/summary.jsp
7:24 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3581: Name search now works by checking each token in the search string, and it will only match if all tokens exist in the fullname or username fields.

Options
    • -38
    • +74
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java
Sunday 08 Nov 2015
4:54 pm

Marcin Cieslak

LDEV-3115: Improve child activities detection. The patch was initally added to WF branch and now it is getting merged.

Options
    • -7
    • +11
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
4:52 pm

Marcin Cieslak

LDEV-3115: Focus on title when saving a LD in FLA.

Options
    • -1
    • +1
    /lams_central/web/authoring/authoring.jsp
4:31 pm

Marcin Cieslak

LDEV-3600: Set the arrow offset when it is already visible, otherwise it is misplaced. Use red user icon instead of green.

Options
    • binary
    /lams_central/web/images/icons/user_red.png
    • -6
    • +9
    /lams_monitoring/web/includes/javascript/monitorLesson.js
4:28 pm

Marcin Cieslak

LDEV-3600: Set the arrow offset when it is already visible, otherwise it is misplaced. Use red user icon instead of green.

Options
    • binary
    /lams_central/web/images/icons/user_red.png
    • -6
    • +9
    /lams_monitoring/web/includes/javascript/monitorLesson.js
Thursday 05 Nov 2015
7:54 pm

Marcin Cieslak

LDEV-3600: Search for a learner in Monitoring Sequence tab and highlight it afterwards.

Options
    • -11
    • +47
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -0
    • +22
    /lams_monitoring/web/css/monitorLesson.css
    • -9
    • +86
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -5
    • +14
    /lams_monitoring/web/monitor.jsp
7:45 pm

Marcin Cieslak

LDEV-3600: Search for a learner in Monitoring Sequence tab and highlight it afterwards.

Options
    • -12
    • +49
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -0
    • +22
    /lams_monitoring/web/css/monitorLesson.css
    • -11
    • +89
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -5
    • +14
    /lams_monitoring/web/monitor.jsp
7:20 pm

erniegx <ernieg@gmail.com>

LDEV-3606: adding css

Options
    • -1
    • +6
    /lams_tool_laqa/web/includes/qalearning.css
4:31 pm

Marcin Cieslak

LDEV-3603: Remove obsolete labels.

Options
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_pt_BR.properties
4:29 pm

Marcin Cieslak

LDEV-3603: Remove obsolete labels.

Options
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_pt_BR.properties
Wednesday 04 Nov 2015
8:36 pm

erniegx <ernieg@gmail.com>

LDEV-3607: Remove old movieplayer

Options
    • -1
    • +1
    /lams_central/web/includes/javascript/ckconfig_custom.js
7:36 pm

Marcin Cieslak

LDEV-3603: Remove obsolete labels.

Options
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_fr_FR.properties
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_pt_BR.properties
7:34 pm

Marcin Cieslak

LDEV-3603: Remove obsolete labels.

Options
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_fr_FR.properties
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +0
    /lams_monitoring/conf/language/lams/ApplicationResources_pt_BR.properties
7:50 am

Andrey Balan

LDEV-3606 In monitor display the author of each feedback comment

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +9
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/rating/RatingComment.hbm.xml
    • -0
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040048.sql
    • -2
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
    • -1
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/rating/dto/RatingCommentDTO.java
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/rating/model/RatingComment.java
    • -0
    • +1
    /lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_images/web/pages/monitoring/monitoring.jsp
    • -0
    • +5
    /lams_tool_images/web/pages/monitoring/summary.jsp
    • -0
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +16
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
    • -1
    • +1
    /lams_tool_laqa/web/learning/LearnerRep.jsp
    • -1
    • +1
    /lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
    • -1
    • +1
    /lams_tool_laqa/web/learning/mobile/LearnerRep.jsp
    • -1
    • +1
    /lams_tool_laqa/web/learning/mobile/RevisitedLearnerRep.jsp
    • -1
    • +9
    /lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
3:50 am

Marcin Cieslak

LDEV-3603: Add autocomplete for search in Learners tab. Merge this and previous changes into the custom Monitoring for a client.

Options
    • -6
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -0
    • +24
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -39
    • +33
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -7
    • +2
    /lams_monitoring/web/monitor.jsp
1:41 am

Marcin Cieslak

LDEV-3603: Add autocomplete for search in Learners tab. Merge this and previous changes into the custom Monitoring for a client.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -6
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
    • -0
    • +24
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -41
    • +35
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -7
    • +2
    /lams_monitoring/web/monitor.jsp
Tuesday 03 Nov 2015
10:43 pm

erniegx <ernieg@gmail.com>

LDEV-3607: Remove old movieplayer

Options
    • -25
    • +0
    /lams_central/web/ckeditor/plugins/movieplayer/LICENSE.TXT
    • binary
    /lams_central/web/ckeditor/plugins/movieplayer/filmreel.gif
    • binary
    /lams_central/web/ckeditor/plugins/movieplayer/filmreel.png
    • -3
    • +0
    /lams_central/web/ckeditor/plugins/movieplayer/lang/en.js
    • -1
    • +0
    /lams_central/web/ckeditor/plugins/movieplayer/movieplayer.html
    • -1
    • +0
    /lams_central/web/ckeditor/plugins/movieplayer/movieplayer.js
    • binary
    /lams_central/web/ckeditor/plugins/movieplayer/player_flv_maxi.swf
    • binary
    /lams_central/web/ckeditor/plugins/movieplayer/player_mp3_maxi.swf
    • -13
    • +0
    /lams_central/web/ckeditor/plugins/movieplayer/plugin.js
10:41 pm

erniegx <ernieg@gmail.com>

LDEV-3607: Include oembed plugin in CKEditor

Options
    • -0
    • +172
    /lams_central/web/ckeditor/plugins/lineutils/dev/dnd.html
    • -0
    • +285
    /lams_central/web/ckeditor/plugins/lineutils/dev/magicfinger.html
    • -0
    • +1013
    /lams_central/web/ckeditor/plugins/lineutils/plugin.js
    • -0
    • +21
    /lams_central/web/ckeditor/plugins/oembed/LICENSE.md
    • -0
    • +201
    /lams_central/web/ckeditor/plugins/oembed/README.md
    • binary
    /lams_central/web/ckeditor/plugins/oembed/icons/hidpi/oembed.png
    • binary
    /lams_central/web/ckeditor/plugins/oembed/icons/oembed.png
    • -0
    • +23
    /lams_central/web/ckeditor/plugins/oembed/lang/de.js
    • -0
    • +23
    /lams_central/web/ckeditor/plugins/oembed/lang/en.js
    • -0
    • +25
    /lams_central/web/ckeditor/plugins/oembed/lang/fr.js
    • -0
    • +23
    /lams_central/web/ckeditor/plugins/oembed/lang/nl.js
    • -0
    • +23
    /lams_central/web/ckeditor/plugins/oembed/lang/pl.js
    • -0
    • +23
    /lams_central/web/ckeditor/plugins/oembed/lang/pt-br.js
    • -0
    • +23
    /lams_central/web/ckeditor/plugins/oembed/lang/ru.js
    • -0
    • +23
    /lams_central/web/ckeditor/plugins/oembed/lang/tr.js
  16. … 55 more files in changeset.
10:23 pm

Marcin Cieslak

LDEV-3490: Re-introduce methods for Live Edit. They have been accindentaly removed during an another commit.

Options
    • -2
    • +1
    /lams_monitoring/web/includes/javascript/monitorLesson.js