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 16 Mar 2016
1:42 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3716: Changing ordering arrows to long arrows, and tweaking the question text display to handle the "no text entered" situation.

Options
    • -0
    • +35
    /lams_tool_assessment/web/WEB-INF/tags/Arrow.tag
    • -0
    • +4
    /lams_tool_assessment/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +4
    /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
    • -6
    • +6
    /lams_tool_assessment/web/pages/learning/parts/ordering.jsp
9:57 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3720: Update Share Resources learner to Bootstrap. Also removed all the iframes/framesets from learner except for one iframe that is used to load the user entered content.

Options
    • -1
    • +1
    /lams_tool_larsrc/conf/xdoclet/struts-actions.xml
    • -0
    • +46
    /lams_tool_larsrc/web/WEB-INF/tags/Alert.tag
    • -0
    • +36
    /lams_tool_larsrc/web/WEB-INF/tags/Page.tag
    • -0
    • +53
    /lams_tool_larsrc/web/WEB-INF/tags/TSTable.tag
    • -0
    • +12
    /lams_tool_larsrc/web/WEB-INF/tlds/lams/lams.tld
    • -2
    • +2
    /lams_tool_larsrc/web/WEB-INF/urlrewrite.xml
    • -5
    • +5
    /lams_tool_larsrc/web/common/messages.jsp
    • -15
    • +20
    /lams_tool_larsrc/web/pages/authoring/parts/addurl.jsp
    • -37
    • +40
    /lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
    • -5
    • +43
    /lams_tool_larsrc/web/pages/itemreview/mainframe.jsp
    • -24
    • +18
    /lams_tool_larsrc/web/pages/itemreview/openurl.jsp
    • -46
    • +44
    /lams_tool_larsrc/web/pages/learning/addfile.jsp
    • -53
    • +47
    /lams_tool_larsrc/web/pages/learning/addurl.jsp
    • -10
    • +10
    /lams_tool_larsrc/web/pages/learning/definelater.jsp
    • -133
    • +179
    /lams_tool_larsrc/web/pages/learning/learning.jsp
    • -5
    • +5
    /lams_tool_larsrc/web/pages/learning/notebook.jsp
    • -8
    • +7
    /lams_tool_larsrc/web/pages/learning/success.jsp
2:49 am

Andrey Balan

LDEV-3727 skip exporting RatingCriteria's toolContentId field. Also explicitly reset it to the new value on LD import (instead of relying on Hibernate to do it)

Options
    • -1
    • +10
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
    • -1
    • +8
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
    • -0
    • +5
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
2:38 am

Andrey Balan

LDEV-3727 skip exporting RatingCriteria's toolContentId field. Also explicitly reset it to the new value on LD import (instead of relying on Hibernate to do it)

Options
    • -0
    • +9
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
    • -1
    • +8
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
    • -0
    • +5
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
Tuesday 15 Mar 2016
1:53 am

Andrey Balan

LDEV-3725 Update IMS CC learner to Bootstrap

Options
    • -0
    • +46
    /lams_tool_imscc/web/WEB-INF/tags/Alert.tag
    • -0
    • +352
    /lams_tool_imscc/web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -7
    • +15
    /lams_tool_imscc/web/WEB-INF/tags/DefineLater.tag
    • -0
    • +36
    /lams_tool_imscc/web/WEB-INF/tags/Page.tag
    • -0
    • +194
    /lams_tool_imscc/web/WEB-INF/tags/Rating.tag
    • -0
    • +53
    /lams_tool_imscc/web/WEB-INF/tags/TSTable.tag
    • -0
    • +20
    /lams_tool_imscc/web/WEB-INF/tlds/lams/lams.tld
    • -10
    • +8
    /lams_tool_imscc/web/common/header.jsp
    • -2
    • +2
    /lams_tool_imscc/web/common/messages.jsp
    • -9
    • +8
    /lams_tool_imscc/web/common/tabbedheader.jsp
    • -9
    • +2
    /lams_tool_imscc/web/pages/itemreview/initnav.jsp
    • -33
    • +30
    /lams_tool_imscc/web/pages/itemreview/instructionsnav.jsp
    • -21
    • +2
    /lams_tool_imscc/web/pages/itemreview/mainframe.jsp
    • -12
    • +18
    /lams_tool_imscc/web/pages/itemreview/openurl.jsp
    • -47
    • +0
    /lams_tool_imscc/web/pages/learning/addfile.jsp
  16. … 24 more files in changeset.
Monday 14 Mar 2016
6:43 pm

Andrey Balan

LDEV-3399 united 2 SocketPermissions into 1

Options
    • -2
    • +1
    /lams_bb_integration/WEB-INF/bb-manifest.xml
6:43 pm

Andrey Balan

LDEV-3399 united 2 SocketPermissions into 1

Options
    • -2
    • +1
    /lams_bb_integration/WEB-INF/bb-manifest.xml
5:31 pm

Marcin Cieslak

LDEV-3673: Remove Batik source code.

Options
    • -103
    • +0
    /3rdParty_sources/batik/org/apache/batik/Version.java
    • -210
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/AbstractAnimation.java
    • -698
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/AnimationEngine.java
    • -90
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/AnimationException.java
    • -50
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/ColorAnimation.java
    • -167
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/InterpolatingAnimation.java
    • -331
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/MotionAnimation.java
    • -68
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/SetAnimation.java
    • -221
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/SimpleAnimation.java
    • -251
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/TransformAnimation.java
    • -149
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/timing/AccesskeyTimingSpecifier.java
    • -51
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/timing/EventLikeTimingSpecifier.java
    • -128
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/timing/EventbaseTimingSpecifier.java
    • -64
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/timing/IndefiniteTimingSpecifier.java
    • -117
    • +0
    /3rdParty_sources/batik/org/apache/batik/anim/timing/InstanceTime.java
  16. … 1461 more files in changeset.
Sunday 13 Mar 2016
9:20 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3713: Tweaking the Tablesorter footer

Options
    • -5
    • +5
    /lams_tool_images/web/WEB-INF/tags/TSTable.tag
    • -5
    • +5
    /lams_tool_laqa/web/WEB-INF/tags/TSTable.tag
    • -5
    • +5
    /lams_tool_mindmap/web/WEB-INF/tags/TSTable.tag
    • -5
    • +5
    /lams_tool_pixlr/web/WEB-INF/tags/TSTable.tag
    • -5
    • +5
    /lams_tool_preview/web/WEB-INF/tags/TSTable.tag
9:18 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3713: Tweaking the Tablesorter header and footer

Options
    • -5
    • +5
    /lams_central/web/WEB-INF/tags/TSTable.tag
    • -1
    • +10
    /lams_central/web/css/jquery.tablesorter.theme.bootstrap.css
    • -1
    • +1
    /lams_central/web/includes/javascript/jquery.tablesorter-widgets.js
1:37 pm

erniegx <ernieg@gmail.com>

LDEV-3724: updating LAMS Learning to bootstrap

Options
    • -7
    • +3
    /lams_learning/web/close.jsp
    • -22
    • +18
    /lams_learning/web/lessonComplete.jsp
    • -141
    • +126
    /lams_learning/web/optionsActivity.jsp
    • -10
    • +8
    /lams_learning/web/partialCompleted.jsp
    • -7
    • +2
    /lams_learning/web/progressBroken.jsp
    • -19
    • +13
    /lams_learning/web/welcome.jsp
8:56 am

erniegx <ernieg@gmail.com>

LDEV-3724: adding timeago to pad entries

Options
    • -3
    • +22
    /lams_learning/web/notebook/viewall.jsp
8:43 am

erniegx <ernieg@gmail.com>

LDEV-3724: updating LAMS Learning to bootstrap

Options
    • -46
    • +43
    /lams_learning/web/notebook/addnew.jsp
    • -93
    • +105
    /lams_learning/web/notebook/view.jsp
    • -104
    • +106
    /lams_learning/web/notebook/viewall.jsp
    • -68
    • +65
    /lams_learning/web/notebook/viewalljournals.jsp
7:48 am

erniegx <ernieg@gmail.com>

LDEV-3724: updating LAMS Learning to bootstrap

Options
    • -0
    • +46
    /lams_learning/web/WEB-INF/tags/Alert.tag
    • -0
    • +36
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -0
    • +8
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +74
    /lams_learning/web/css/nprogress.css
    • -7
    • +10
    /lams_learning/web/gate/conditionGateContent.jsp
    • -10
    • +15
    /lams_learning/web/gate/gateNext.jsp
    • -8
    • +11
    /lams_learning/web/gate/permissionGateContent.jsp
    • -64
    • +33
    /lams_learning/web/gate/scheduleGateContent.jsp
    • -14
    • +22
    /lams_learning/web/gate/synchGateContent.jsp
    • -55
    • +47
    /lams_learning/web/grouping/choose.jsp
    • -66
    • +92
    /lams_learning/web/grouping/show.jsp
    • -32
    • +30
    /lams_learning/web/grouping/wait.jsp
    • -0
    • +1
    /lams_learning/web/includes/javascript/nprogress.js
    • -16
    • +19
    /lams_learning/web/layout/gateLayout.jsp
    • -0
    • +3
    /lams_learning/web/layout/layout.jsp
    • -34
    • +52
    /lams_learning/web/loadToolActivity.jsp
Saturday 12 Mar 2016
7:22 am

erniegx <ernieg@gmail.com>

LDEV-3679: tablesorter with bootstrap

Options
    • -1
    • +11
    /lams_tool_laqa/web/learning/LearnerRep.jsp
    • -6
    • +2
    /lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
7:17 am

erniegx <ernieg@gmail.com>

LDEV-3679: fixing buttons and overall layout

Options
    • -1
    • +1
    /lams_tool_laqa/web/learning/CombinedAnswersContent.jsp
    • -2
    • +2
    /lams_tool_laqa/web/learning/IndividualLearnerResults.jsp
    • -27
    • +28
    /lams_tool_laqa/web/learning/LearnerRep.jsp
    • -16
    • +36
    /lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
6:16 am

erniegx <ernieg@gmail.com>

LDEV-3679: timeago and tablesorter with bootstrap

Options
    • -34
    • +19
    /lams_tool_laqa/web/learning/LearnerRep.jsp
3:37 am

Andrey Balan

LDEV-3723 Update PixIr learner to Bootstrap

Options
    • -0
    • +46
    /lams_tool_pixlr/web/WEB-INF/tags/Alert.tag
    • -0
    • +352
    /lams_tool_pixlr/web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -7
    • +15
    /lams_tool_pixlr/web/WEB-INF/tags/DefineLater.tag
    • -0
    • +36
    /lams_tool_pixlr/web/WEB-INF/tags/Page.tag
    • -0
    • +194
    /lams_tool_pixlr/web/WEB-INF/tags/Rating.tag
    • -0
    • +53
    /lams_tool_pixlr/web/WEB-INF/tags/TSTable.tag
    • -0
    • +20
    /lams_tool_pixlr/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +2
    /lams_tool_pixlr/web/common/learnerheader.jsp
    • -4
    • +4
    /lams_tool_pixlr/web/common/messages.jsp
    • -5
    • +5
    /lams_tool_pixlr/web/pages/learning/defineLater.jsp
    • -0
    • +0
    /lams_tool_pixlr/web/pages/learning/headItems.jsp
    • -7
    • +3
    /lams_tool_pixlr/web/pages/learning/image.jsp
    • -42
    • +35
    /lams_tool_pixlr/web/pages/learning/notebook.jsp
    • -89
    • +0
    /lams_tool_pixlr/web/pages/learning/parts/finishButton.jsp
    • -39
    • +101
    /lams_tool_pixlr/web/pages/learning/pixlr.jsp
    • -22
    • +17
    /lams_tool_pixlr/web/pages/learning/success.jsp
    • -75
    • +68
    /lams_tool_pixlr/web/pages/learning/viewAll.jsp
2:22 am

Andrey Balan

LDEV-3722 Update Mind Maps learner to Bootstrap

Options
    • -0
    • +46
    /lams_tool_mindmap/web/WEB-INF/tags/Alert.tag
    • -0
    • +352
    /lams_tool_mindmap/web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -7
    • +15
    /lams_tool_mindmap/web/WEB-INF/tags/DefineLater.tag
    • -0
    • +36
    /lams_tool_mindmap/web/WEB-INF/tags/Page.tag
    • -0
    • +194
    /lams_tool_mindmap/web/WEB-INF/tags/Rating.tag
    • -0
    • +53
    /lams_tool_mindmap/web/WEB-INF/tags/TSTable.tag
    • -0
    • +20
    /lams_tool_mindmap/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +2
    /lams_tool_mindmap/web/common/learnerheader.jsp
    • -2
    • +2
    /lams_tool_mindmap/web/common/messages.jsp
    • -5
    • +5
    /lams_tool_mindmap/web/pages/learning/defineLater.jsp
    • -0
    • +0
    /lams_tool_mindmap/web/pages/learning/headItems.jsp
    • -71
    • +61
    /lams_tool_mindmap/web/pages/learning/mindmap.jsp
    • -28
    • +26
    /lams_tool_mindmap/web/pages/learning/reflect.jsp
    • -15
    • +12
    /lams_tool_mindmap/web/pages/learning/submissionDeadline.jsp
Friday 11 Mar 2016
2:33 am

Andrey Balan

LDEV-3706 Updating jRating star images to suit the new theme

Options
    • -0
    • +9
    /lams_central/web/css/jquery.jRating.css
    • binary
    /lams_central/web/images/css/jquery.jRating-stars-hover.png
    • binary
    /lams_central/web/images/css/jquery.jRating-stars-odd.png
Thursday 10 Mar 2016
7:12 pm

Andrey Balan

LDEV-3706 Updating tag and its dynamically created equivalent

Options
    • -11
    • +15
    /lams_tool_preview/web/WEB-INF/tags/Rating.tag
    • -24
    • +35
    /lams_tool_preview/web/includes/css/learning.css
    • -9
    • +13
    /lams_tool_preview/web/pages/learning/learning.jsp
5:47 pm

Andrey Balan

LDEV-3721 Update Image Gallery learner to Bootstrap

Options
    • -2
    • +8
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
    • -0
    • +46
    /lams_tool_images/web/WEB-INF/tags/Alert.tag
    • -1
    • +1
    /lams_tool_images/web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -7
    • +15
    /lams_tool_images/web/WEB-INF/tags/DefineLater.tag
    • -0
    • +36
    /lams_tool_images/web/WEB-INF/tags/Page.tag
    • -11
    • +15
    /lams_tool_images/web/WEB-INF/tags/Rating.tag
    • -0
    • +53
    /lams_tool_images/web/WEB-INF/tags/TSTable.tag
    • -0
    • +12
    /lams_tool_images/web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +3
    /lams_tool_images/web/common/header.jsp
    • -5
    • +5
    /lams_tool_images/web/common/messages.jsp
    • -8
    • +9
    /lams_tool_images/web/pages/learning/definelater.jsp
    • -5
    • +1
    /lams_tool_images/web/pages/learning/finish.jsp
    • -71
    • +55
    /lams_tool_images/web/pages/learning/learning.jsp
    • -36
    • +35
    /lams_tool_images/web/pages/learning/notebook.jsp
    • -16
    • +16
    /lams_tool_images/web/pages/learning/parts/addimage.jsp
  16. … 4 more files in changeset.
12:44 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3716: Tweaked colours to match and switched images to font awesome

Options
    • -8
    • +1
    /lams_tool_assessment/web/includes/css/assessment.css
    • -48
    • +42
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -5
    • +1
    /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/numerical.jsp
    • -17
    • +6
    /lams_tool_assessment/web/pages/learning/parts/ordering.jsp
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp
    • -4
    • +4
    /lams_tool_assessment/web/pages/learning/parts/truefalse.jsp
Wednesday 09 Mar 2016
3:41 pm

erniegx <ernieg@gmail.com>

LDEV-3679: timeago and tablesorter with bootstrap

Options
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/DateUtil.java
11:03 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3713: Adding tag to define the Table for a Tablesorter

Options
    • -0
    • +53
    /lams_central/web/WEB-INF/tags/TSTable.tag
    • -1
    • +5
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
11:01 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3706: Fixing flow of screen and ensuring the lock message refers to the correct button name.

Options
    • -2
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -2
    • +1
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    /lams_tool_preview/web/WEB-INF/tags/TSTable.tag
    • -16
    • +18
    /lams_tool_preview/web/pages/learning/learning.jsp
    • -9
    • +1
    /lams_tool_preview/web/pages/learning/notebook.jsp
    • -12
    • +12
    /lams_tool_preview/web/pages/learning/results.jsp
9:56 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3719: Mass user creation optimisation: Creates users in database rather than creating a lot of user objects.

Options
    • -0
    • +5
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java
    • -2
    • +41
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
    • -26
    • +9
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
9:21 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3719: Mass user creation optimisation: Creates users in database rather than creating a lot of user objects.

Options
    • -0
    • +5
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/PeerreviewUserDAO.java
    • -2
    • +42
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java
    • -27
    • +9
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
8:50 am

erniegx <ernieg@gmail.com>

LDEV-3679: timeago and tablesorter with bootstrap

Options
    • -3
    • +4
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java
    • -0
    • +53
    /lams_tool_laqa/web/WEB-INF/tags/TSTable.tag
    • -0
    • +4
    /lams_tool_laqa/web/WEB-INF/tlds/lams/lams.tld
    • -44
    • +20
    /lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp
8:27 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-3708: Unable to start a single activity lesson for a tool deployed after initial run as it was trying to find the learning_activity via the toolId when it should have been using the libraryId

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -2
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +1
    /lams_central/web/groupHeader.jsp
    • -2
    • +4
    /lams_central/web/includes/javascript/groupDisplay.js
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java