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
Friday 06 Jun 2008
2:17 pm

fmalikoff

LDEV-1820: Less than wasn't working as the BranchCondition was expecting start value to be 0, and it was null. Now accepts null.

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java
2:07 pm

mseaton

LDEV-1819 Fixed condition as such to only disable existing branching activities and allow type to be changed for all new ones.

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
1:26 pm

dcarlier

LDEV-1761 Fixed branch label problem, now the numbers just increment

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -2
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -2
    • +32
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
11:59 am

lfoxton

Changing sql update scripts for vote, mc and forum so they have no multi-line commands, as the tooldeployer task in the updater seems to have difficulty with this. All commands changed to one-liners

Options
    • -2
    • +1
    /lams_tool_forum/db/sql/updatescripts/updateTo20080220.sql
    • -15
    • +6
    /lams_tool_lamc/db/sql/updatescripts/updateTo20070820.sql
    • -9
    • +2
    /lams_tool_vote/db/sql/updatescripts/updateTo20080326.sql
11:40 am

fmalikoff

LDEV-1817: Fixing up message on preview define later screen to be appropriate for branching.

Options
    • -0
    • +1
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
11:31 am

fmalikoff

LDEV-1817: Define later branching was breaking Preview. Now the preview hack allows it to be used with Random Grouping and this required regetting the grouping at one point to avoid a CGLIB class cast exception (hack on hack). Bleah.

The chosen grouping now works as I clear the number of groups before creating a group (and then allocating to a branch), otherwise I could run into the max number of branches test. Another hack.

Options
    • -5
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -7
    • +26
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -0
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
8:24 am

lfoxton

Authoring is working, you can submit new markers and they will appear again when you go back to them.

Options
    • -2
    • +8
    /lams_tool_gmap/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapAttachmentDAO.java
    • -1
    • +2
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapDAO.java
    • -0
    • +24
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java
    • -1
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapSessionDAO.java
    • -1
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapUserDAO.java
    • -1
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapAttachmentDAO.java
    • -1
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapDAO.java
    • -1
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapSessionDAO.java
    • -1
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapUserDAO.java
    • -1
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapAttachmentDTO.java
    • -2
    • +3
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -0
    • +24
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
    • -1
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapSessionDTO.java
    • -1
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapUserDTO.java
  16. … 27 more files in changeset.
Thursday 05 Jun 2008
12:18 pm

Andrey Balan

LDEV-1812

Condition Name --> Name

Options
    • -1
    • +1
    /lams_tool_task/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_task/conf/language/rams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties
12:08 pm

Andrey Balan

LDEV-1812

added conditions table header

and mark "There are no conditions"

Options
    • -0
    • +2
    /lams_tool_task/conf/language/lams/ApplicationResources.properties
    • -12
    • +28
    /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    /lams_tool_task/conf/language/rams/ApplicationResources.properties
    • -0
    • +2
    /lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties
    • -4
    • +19
    /lams_tool_task/web/pages/authoring/parts/conditionlist.jsp
11:58 am

mseaton

authoring update

Options
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
9:46 am

lfoxton

LDEV-1815 Resolved: Forgot password doesn't clear the record from the database, doesn't handle missing records

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +15
    /lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
Wednesday 04 Jun 2008
4:02 pm

mseaton

LDEV-1745 Improved level setting for active complex activities, and use of level values (parent's level and complexLevel value) to draw amount of dash's in title.

Options
    • -2
    • +1
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as
    • -7
    • +25
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as
    • binary
    /lams_learning/web/lams_learner.swf
    • binary
    /lams_monitoring/web/lams_monitoring.swf
    • binary
    /lams_monitoring/web/lams_monitoring_library.swf
2:35 pm

Andrey Balan

LDEV-1812 Condition tab should have a numbers on the left

Options
    • -0
    • +4
    /lams_tool_task/web/pages/authoring/parts/conditionlist.jsp
2:04 pm

Andrey Balan

LDEV-1803 Fixed preview mode and Monitor verify tasks

Options
    • -40
    • +42
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
    • -2
    • +5
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java
    • -1
    • +1
    /lams_tool_task/web/pages/learning/learning.jsp
    • -1
    • +2
    /lams_tool_task/web/pages/learning/parts/itemdetails.jsp
1:58 pm

mseaton

LDEV-1802 Removed labels.

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -6
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
1:54 pm

lfoxton

Advanced options implemented in learner, some fixes to hte display of the info maessages for the markers,

created by user is also displayed

Options
    • -0
    • +22
    /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml
    • -1
    • +3
    /lams_tool_gmap/db/sql/create_lams_tool_gmap.sql
    • -1
    • +5
    /lams_tool_gmap/db/sql/table-schema.sql
    • -6
    • +10
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -0
    • +110
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapMarkerDTO.java
    • -54
    • +46
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
    • -0
    • +2
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/util/GmapConstants.java
    • -14
    • +46
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -15
    • +13
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
    • -3
    • +6
    /lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
    • -12
    • +24
    /lams_tool_gmap/web/common/learnerheader.jsp
    • -0
    • +1
    /lams_tool_gmap/web/includes/javascript/authoring.js
    • -210
    • +53
    /lams_tool_gmap/web/includes/javascript/mapFunctions.js
    • -0
    • +114
    /lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js
    • -0
    • +92
    /lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js
    • -1
    • +2
    /lams_tool_gmap/web/pages/authoring/basic.jsp
    • -0
    • +1
    /lams_tool_gmap/web/pages/authoring/headItems.jsp
1:25 pm

mseaton

LDEV-1801 Fixed bug with condition in getDetails method.

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingDiagram.as
1:05 pm

mseaton

LDEV-1756 Fixed stepper value setting from calculated offset.

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -8
    • +29
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
    • -5
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
12:29 pm

fmalikoff

LDEV-1804: Tool urls on the Optional Activity page were missing the tool part - all there was was the lams part.

Options
    • -2
    • +7
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java
12:20 pm

erniegx <ernieg@gmail.com>

LDEV-1614: Of course, I made some spelling mistakes

Options
    • -3
    • +3
    /lams_www/conf/lams/news.html
12:19 pm

jliew

LDEV-1069 forgot to remove some old code

Options
    • -6
    • +0
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
12:17 pm

jliew

LDEV-1069 display error label in html page rather than in the spreadsheet by splitting preparation of spreadsheet from outputting of response

Options
    • -17
    • +15
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/ExportServlet.java
    • -23
    • +28
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
    • -1
    • +2
    /lams_tool_lamc/web/WEB-INF/struts-config.xml
12:11 pm

erniegx <ernieg@gmail.com>

Changing the red cross for a dash instead as apparently crosses send the wrong message (ask James for details :-)

Options
    • -2
    • +1
    /lams_tool_larsrc/web/pages/learning/learning.jsp
11:52 am

erniegx <ernieg@gmail.com>

LDEV-1614: Updating news.html for 2.1

Options
    • -20
    • +8
    /lams_www/conf/lams/news.html
11:48 am

erniegx <ernieg@gmail.com>

Changes to CSS for the login page. This makes better use of spacing in the login page

Options
    • -7
    • +8
    /lams_central/web/css/defaultHTML.css
    • -7
    • +8
    /lams_central/web/css/defaultHTML_rtl.css
11:29 am

jliew

LDEV-1069 fix error handling during spreadsheet preparation, and filled in missing label for the error message; fixed SummaryContent.jsp not filling in variable for 'download marks' link when not grouped

Options
    • -0
    • +1
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties
    • -14
    • +5
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
    • -2
    • +7
    /lams_tool_lamc/web/monitoring/SummaryContent.jsp
11:23 am

Andrey Balan

LDEV-1718 Reorganize learning page

fix for learner export

Options
    • -12
    • +1
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
11:13 am

Andrey Balan

LDEV-1708 Monitoring should support grouping

the tasks shown for a group are now exactly the tasks from authoring + the tasks added by members of that group.

Options
    • -17
    • +54
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
Tuesday 03 Jun 2008
7:17 pm

Andrey Balan

LDEV-1698 Learner's notebook entries not shown in monitoring

Options
    • -0
    • +1
    /lams_tool_task/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    /lams_tool_task/conf/language/rams/ApplicationResources.properties
    • -0
    • +1
    /lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties
    • -0
    • +20
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ItemSummary.java
    • -1
    • +2
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java
    • -3
    • +23
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
    • -8
    • +6
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
    • -27
    • +3
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java
    • -121
    • +126
    /lams_tool_task/web/pages/export/itemsummary.jsp
    • -38
    • +0
    /lams_tool_task/web/pages/export/reflection.jsp
3:24 pm

jliew

LDEV-1699 session flag for whether reflection was enabled was being called from wrong place; moved reflection to bottom of user entry instead of in the middle

Options
    • -12
    • +14
    /lams_tool_sbmt/web/export/exportportfolio.jsp