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
Monday 02 Jun 2008
3:51 pm

lfoxton

- Added options in advanced tab, as well as persistance entries in the Gmap object

- Add state-saving for the Gmap, so when the teacher saves teh map, it appears exactly as it was before when they go back, ie map type, zoom, location

- Fixed up language strings in application.properties

- All non-cosmetic authoring tasks so far are completed

Options
    • -9
    • +104
    /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
    • -1
    • +24
    /lams_tool_gmap/conf/language/lams/ApplicationResources.properties
    • -3
    • +26
    /lams_tool_gmap/db/sql/create_lams_tool_gmap.sql
    • -1
    • +1
    /lams_tool_gmap/db/sql/table-schema.sql
    • -8
    • +8
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dto/GmapDTO.java
    • -13
    • +175
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java
    • -1
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -2
    • +25
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -1
    • +1
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
    • -5
    • +115
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java
    • -0
    • +1
    /lams_tool_gmap/web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +8
    /lams_tool_gmap/web/includes/javascript/authoring.js
    • -25
    • +33
    /lams_tool_gmap/web/includes/javascript/mapFunctions.js
    • -4
    • +80
    /lams_tool_gmap/web/pages/authoring/advanced.jsp
    • -2
    • +5
    /lams_tool_gmap/web/pages/authoring/authoring.jsp
    • -12
    • +15
    /lams_tool_gmap/web/pages/authoring/basic.jsp
    • -0
    • +3
    /lams_tool_gmap/web/pages/authoring/headItems.jsp
2:25 pm

fmalikoff

LDEV-1786: On very rare occasions, we've had Hibernate try to save the branching entries before saving the branching activity which throws an exception as the branch_activity_id is null. So force any branching activities to save first.

Options
    • -0
    • +9
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
2:25 pm

Andrey Balan

LDEV-1794 Change cross image for - (dash)

Options
    • binary
    /lams_central/web/images/dash.gif
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
12:49 pm

Andrey Balan

LDEV-1795 Locked when finished message

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:44 pm

Andrey Balan

LDEV-1794 Change cross image for - (dash)

Options
    • binary
    /lams_tool_task/web/includes/images/dash.jpeg
    • -2
    • +2
    /lams_tool_task/web/pages/learning/parts/itemlist.jsp
12:37 pm

Andrey Balan

LDEV-1793 Change "Completed" to checkbox image

Options
    • binary
    /lams_tool_task/web/includes/images/empty_checkbox.jpeg
    • -1
    • +1
    /lams_tool_task/web/pages/learning/parts/itemlist.jsp
11:59 am

Andrey Balan

LDEV-1792 Authoring word and minor changes

Options
    • -13
    • +11
    /lams_tool_task/conf/language/lams/ApplicationResources.properties
    • -13
    • +11
    /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
    • -13
    • +11
    /lams_tool_task/conf/language/rams/ApplicationResources.properties
    • -13
    • +11
    /lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_task/db/sql/create_lams_tool_taskList.sql
    • -2
    • +2
    /lams_tool_task/web/pages/authoring/instructions.jsp
    • -2
    • +2
    /lams_tool_task/web/pages/authoring/parts/instructionfilelist.jsp
11:13 am

Andrey Balan

LDEV-1511 Ensure all tables in LAMS are InnoDB tables

done for the Task Tool

Options
    • -10
    • +10
    /lams_tool_task/db/sql/create_lams_tool_taskList.sql
9:08 am

lfoxton

Added title field to the marker object

added sidebar to the view

Options
    • -0
    • +8
    /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml
    • -1
    • +1
    /lams_tool_gmap/db/sql/create_lams_tool_gmap.sql
    • -1
    • +1
    /lams_tool_gmap/db/sql/table-schema.sql
    • -0
    • +19
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
    • -0
    • +3
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -1
    • +2
    /lams_tool_gmap/web/includes/javascript/authoring.js
    • -27
    • +110
    /lams_tool_gmap/web/includes/javascript/mapFunctions.js
    • -5
    • +21
    /lams_tool_gmap/web/pages/authoring/basic.jsp
    • -3
    • +1
    /lams_tool_gmap/web/pages/authoring/headItems.jsp
    • -10
    • +0
    /lams_tool_gmap/web/pages/authoring/map.jsp
Friday 30 May 2008
5:13 pm

Andrey Balan

LDEV-1718 Reorganize learning page

* The page needs to understand about tool sessions/groups. Learners should only see the comments and files added by members of their group (ie tool session) when the activity is grouped. Similarly, Learners should only see the tasks from authoring plus tasks added by members of their group.

Options
    • -1
    • +1
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ReflectDTO.java
    • -0
    • +43
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TasListItemDTO.java
    • -0
    • +8
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java
    • -72
    • +83
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
    • -2
    • +48
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java
    • -1
    • +1
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
    • -0
    • +36
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java
    • -1
    • +1
    /lams_tool_task/web/pages/learning/parts/commentlist.jsp
    • -1
    • +1
    /lams_tool_task/web/pages/learning/parts/filelist.jsp
3:53 pm

fmalikoff

Tweaking some wording

Options
    • -6
    • +8
    /lams_tool_task/conf/language/lams/ApplicationResources.properties
    • -6
    • +6
    /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
2:56 pm

jliew

Updating Norwegian

Options
    • -2
    • +2
    /lams_admin/conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    /lams_central/conf/flashxml/lams/learner/no_NO_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/monitoring/no_NO_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/wizard/no_NO_dictionary.xml
    • -2
    • +2
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_chat/conf/language/lams/ApplicationResources_no_NO.properties
    • -5
    • +5
    /lams_tool_forum/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_larsrc/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_nb/conf/language/lams/ApplicationResources_no_NO.properties
    • -3
    • +3
    /lams_tool_sbmt/conf/language/lams/ApplicationResources_no_NO.properties
    • -3
    • +3
    /lams_tool_scribe/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +2
    /lams_tool_survey/conf/language/lams/ApplicationResources_no_NO.properties
    • -3
    • +3
    /lams_tool_vote/conf/language/lams/ApplicationResources_no_NO.properties
2:49 pm

jliew

Updating English

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_dictionary.xml
    • -7
    • +7
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -7
    • +8
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
2:40 pm

jliew

Updating Norwegian, English

Options
    • -4
    • +4
    /lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +6
    /lams_tool_laqa/conf/language/lams/ApplicationResources_no_NO.properties
2:36 pm

jliew

Updating English

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_AU_dictionary.xml
1:42 pm

mseaton

LDEV-1777 Moved start in monitor button to left side.

Options
    • -3
    • +3
    /lams_central/web/includes/javascript/openUrls.js
    • -2
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardView.as
    • binary
    /lams_monitoring/web/lams_wizard.swf
    • binary
    /lams_monitoring/web/lams_wizard_library.swf
11:50 am

mseaton

LDEV-1780 Preventing default conditions (names) being editable in the conditiosn dialog.

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -2
    • +13
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as
    • -2
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
11:42 am

lfoxton

Code for google map tool

Now can save markers in authoring, they are redisplayed on the map

Options
    • -3
    • +8
    /lams_tool_gmap/.classpath
    • -1
    • +1
    /lams_tool_gmap/build.xml
    • -3
    • +2
    /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/Gmap.hbm.xml
    • -66
    • +7
    /lams_tool_gmap/conf/hibernate/mappings/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.hbm.xml
    • -4
    • +1
    /lams_tool_gmap/db/sql/create_lams_tool_gmap.sql
    • -7
    • +1
    /lams_tool_gmap/db/sql/table-schema.sql
    • -0
    • +12
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/IGmapMarkerDAO.java
    • -0
    • +20
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dao/hibernate/GmapMarkerDAO.java
    • -1
    • +7
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/gmapApplicationContext.xml
    • -4
    • +58
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/Gmap.java
    • -141
    • +46
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/model/GmapMarker.java
    • -1
    • +17
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
    • -1
    • +8
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
    • -10
    • +95
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
    • -0
    • +22
    /lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/forms/AuthoringForm.java
  16. … 9 more files in changeset.
11:24 am

Andrey Balan

LDEV-1708 Monitoring should support grouping

some small fixes

Options
    • -0
    • +2
    /lams_tool_task/conf/xdoclet/struts-actions.xml
    • -3
    • +3
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java
    • -3
    • +3
    /lams_tool_task/web/pages/learning/parts/itemdetails.jsp
10:36 am

jliew

LDEV-1788 customise text to use alternative text for optional sequences as opposed to optional activities.

Options
    • -0
    • +3
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +40
    /lams_learning/web/optionsActivity.jsp
10:20 am

mseaton

LDEV-1779 Added message text to bottom of dialog (as dynamic textfield with wrapping). May need some style improvements.

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as
8:43 am

fmalikoff

LDEV-1774: No longer set up tool sessions for any child activities as may that breaks on any children that are in a sequence.

Options
    • -22
    • +22
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
Thursday 29 May 2008
4:17 pm

Andrey Balan

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

export fixed

Options
    • -1
    • +2
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java
    • -0
    • +72
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/GroupSummary.java
    • -18
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ItemSummary.java
    • -13
    • +3
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/Summary.java
    • -4
    • +5
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java
    • -87
    • +79
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
    • -3
    • +4
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
    • -30
    • +35
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java
    • -3
    • +3
    /lams_tool_task/web/pages/export/exportportfolio.jsp
    • -0
    • +143
    /lams_tool_task/web/pages/export/itemsummary.jsp
    • -109
    • +0
    /lams_tool_task/web/pages/export/summaryTask.jsp
    • -3
    • +3
    /lams_tool_task/web/pages/monitoring/itemsummary.jsp
3:18 pm

jliew

LDEV-1642 display different note if there's a maximum no. of activities involved

Options
    • -1
    • +11
    /lams_learning/web/optionsActivity.jsp
3:16 pm

mseaton

LDEV-1756 Hide steppers when not a schedule type and reset values correctly.

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

jliew

Updating English

Options
    • -5
    • +6
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -5
    • +6
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
3:07 pm

jliew

Updating English, Norwegian

Options
    • -23
    • +23
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -23
    • +23
    /lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_tool_laqa/conf/language/lams/ApplicationResources_no_NO.properties
12:46 pm

Andrey Balan

LDEV-1708 Monitoring now supports groupping

(Export should be reorganized after this)

Options
    • -0
    • +4
    /lams_tool_task/conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +4
    /lams_tool_task/conf/language/rams/ApplicationResources.properties
    • -0
    • +4
    /lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_tool_task/conf/xdoclet/struts-actions.xml
    • -3
    • +2
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java
    • -0
    • +163
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ItemSummary.java
    • -83
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TaskSummary.java
    • -145
    • +0
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TaskSummaryItem.java
    • -5
    • +5
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java
    • -109
    • +110
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
    • -10
    • +9
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
    • -30
    • +30
    /lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java
    • -1
    • +1
    /lams_tool_task/web/pages/learning/parts/itemlist.jsp
    • -0
    • +167
    /lams_tool_task/web/pages/monitoring/itemsummary.jsp
  16. … 3 more files in changeset.
10:17 am

jliew

LDEV-1775 don't display struts errors on instructions tab - leave them on the edit tab

Options
    • -1
    • +0
    /lams_tool_laqa/web/monitoring/Instructions.jsp
Wednesday 28 May 2008
4:17 pm

jliew

LDEV-1773 add minimum no. of waiting learners to sync gate open condition

Options
    • -3
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SynchGateActivityStrategy.java