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 09 May 2006
9:45 am

fmalikoff

Fixed the keywork expansion

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/cache/CacheDebugListener.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/cache/CacheManager.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dao/IBaseDAO.java
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java
Monday 08 May 2006
3:24 pm

fmalikoff

Reversed changes to test1. Breaks the build on Shaun - special language test users can no longer be added.

Options
    • -39
    • +1
    /lams_common/db/sql/insert_users.sql
3:06 pm

fmalikoff

Added extra test organisation data for test1

Options
    • -1
    • +39
    /lams_common/db/sql/insert_users.sql
3:05 pm

fmalikoff

Added chat to the build, added the double vote parallel activity.

Options
    • -28
    • +117
    /lams_build/build.xml
3:04 pm

fmalikoff

Added double vote so that we can test vote running twice in one complex activity.

Options
    • -0
    • +27
    /lams_build/librarypackages/doublevote/deployLibrary.xml
    • -0
    • +6
    /lams_build/librarypackages/doublevote/language/ApplicationResources.properties
    • -0
    • +2
    /lams_build/librarypackages/doublevote/learninglibrary1_insert.sql
    • -0
    • +14
    /lams_build/librarypackages/doublevote/libraryActivity1_insert.sql
    • -0
    • +16
    /lams_build/librarypackages/doublevote/toolActivity1_insert.sql
    • -0
    • +16
    /lams_build/librarypackages/doublevote/toolActivity2_insert.sql
2:52 pm

steven

Bug fix from Fiona

Options
    • -10
    • +11
    /lams_tool_larsrc/conf/language/ApplicationResources.properties
    • -2
    • +5
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -2
    • +24
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
    • -1
    • +1
    /lams_tool_larsrc/web/pages/itemreview/mainframe.jsp
    • -1
    • +1
    /lams_tool_larsrc/web/pages/learning/learning.jsp
1:54 pm

fmalikoff

Temporary change to use userid from the request parameters.

Options
    • -12
    • +14
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
1:16 pm

mseaton

createTree method call change

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
1:15 pm

mseaton

Fixed algorithm to correctly create DTO tree.

Options
    • -33
    • +69
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/OrganisationDTOFactory.java
12:44 pm

asukkar

Added call to persist chatSession when a new jabber room is created.

Options
    • -3
    • +3
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java
12:42 pm

asukkar

Fixed bug in createJabberRoom method.

Options
    • -9
    • +11
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
12:41 pm

asukkar

Added setCreateDate to the static method newInstance

Options
    • -2
    • +5
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/model/Chat.java
12:39 pm

asukkar

Corrected HQL statement;

Options
    • -1
    • +1
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatUserDAO.java
12:38 pm

asukkar

Added new fields in session and user to store the jabber room and jabber id.

Options
    • -0
    • +9
    /lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatSession.hbm.xml
    • -0
    • +18
    /lams_tool_chat/conf/hibernate/mappings/org/lamsfoundation/lams/tool/chat/model/ChatUser.hbm.xml
    • -62
    • +54
    /lams_tool_chat/db/sql/create_lams_tool_chat.sql
12:35 pm

asukkar

Removed smack library from chat tool. The library is now included in the lams ear

Options
    • -3
    • +0
    /lams_tool_chat/build.xml
12:30 pm

asukkar

Added Smack XMPP client library.

Options
    • -0
    • +2
    /lams_build/3rdParty.userlibraries
    • -0
    • +2
    /lams_build/build.xml
    • -0
    • +6
    /lams_build/conf/j2ee/application.xml
    • binary
    /lams_build/lib/smack/smack.jar
    • binary
    /lams_build/lib/smack/smackx.jar
11:13 am

mseaton

remove class

Options
    • -221
    • +0
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/ls/Sequence.as
11:13 am

mseaton

current fla

Options
    • binary
    /lams_central/src/flash/lams_monitoring_v1.fla
11:07 am

fmalikoff

Switched to using the HTML noticeboard icon

Options
    • -1
    • +1
    /lams_tool_nb/db/sql/activity_insert.sql
    • binary
    /lams_tool_nb/web/images/icon_htmlnb.swf
10:43 am

mseaton

for comparision + new dialog class for selecting class

Options
    • -1
    • +11
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/Application.as
    • -0
    • +321
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/LessonManagerDialog.as
    • -5
    • +27
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/Organisation.as
    • -1
    • +2
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/User.as
10:42 am

mseaton

for comparision

Options
    • -31
    • +34
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as
    • -113
    • +201
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
7:57 am

fmalikoff

Added icon for the tool.

Options
    • binary
    /lams_tool_larsrc/web/images/icon_rsrc.swf
5:21 am

ozgurd

just added a column

Options
    • -1
    • +1
    /lams_tool_vote/web/monitoring/SummaryContent.jsp
1:42 am

ozgurd

Completed portfolio export for teachers and learners. Organized message resources.

Options
    • -2
    • +2
    /lams_tool_vote/conf/language/ApplicationResources.properties
    • -0
    • +2
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -12
    • +18
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java
    • -11
    • +9
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java
    • -22
    • +51
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
    • -0
    • +11
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java
    • -4
    • +30
    /lams_tool_vote/web/export/exportportfolio.jsp
    • -1
    • +4
    /lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp
    • -49
    • +53
    /lams_tool_vote/web/monitoring/SummaryContent.jsp
Sunday 07 May 2006
12:06 am

ozgurd

reorganized message resources

Options
    • -72
    • +6
    /lams_tool_vote/conf/language/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_vote/web/authoring/BasicContent.jsp
    • -1
    • +1
    /lams_tool_vote/web/export/exportportfolio.jsp
Saturday 06 May 2006
11:10 pm

ozgurd

Export Portfolio implementation. It is stable but not complete. Needs jsp generation for learner and teacher modes.

Options
    • -1
    • +1
    /lams_tool_vote/build.xml
    • -0
    • +1
    /lams_tool_vote/conf/language/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_vote/db/sql/tool_insert.sql
    • -0
    • +142
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java
    • -314
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportAction.java
    • -151
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportForm.java
    • -65
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteExportServlet.java
    • -34
    • +0
    /lams_tool_vote/web/WEB-INF/struts-config.xml
    • -2
    • +2
    /lams_tool_vote/web/WEB-INF/web.xml
    • -0
    • +42
    /lams_tool_vote/web/export/exportportfolio.jsp
    • -64
    • +0
    /lams_tool_vote/web/exportPortfolio.jsp
3:42 pm

ozgurd

Completed JFree Chart implemenation in the Learner and Monitoring modules. Pie chart is presented. User entered nominations are also taken into account.

Options
    • -0
    • +3
    /lams_tool_vote/conf/language/ApplicationResources.properties
    • -0
    • +2
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java
    • -0
    • +6
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/IVoteUsrAttemptDAO.java
    • -13
    • +43
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/dao/hibernate/VoteUsrAttemptDAO.java
    • -0
    • +6
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/IVoteService.java
    • -0
    • +45
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteServicePOJO.java
    • -5
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/AuthoringUtil.java
    • -5
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/LearningUtil.java
    • -0
    • +139
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java
    • -0
    • +127
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteChartGenerator.java
    • -38
    • +4
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
    • -13
    • +0
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningForm.java
    • -10
    • +2
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java
    • -47
    • +12
    /lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java
    • -0
    • +1
    /lams_tool_vote/web/WEB-INF/struts-config.xml
  16. … 3 more files in changeset.
Friday 05 May 2006
3:28 pm

psharma

*** empty log message ***

Options
    • binary
    /lams_central/src/flash/lams_monitoring.fla
    • binary
    /lams_central/src/flash/lams_monitoring_v1.fla
    • -1
    • +59
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as
    • -6
    • +22
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
    • -7
    • +118
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
    • -0
    • +143
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorTransition.as
    • -25
    • +53
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as
    • -50
    • +107
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
    • -0
    • +286
    /lams_central/src/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
2:59 pm

fmalikoff

Added chat id to the user table (for the jabber id)

Options
    • -0
    • +13
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/User.hbm.xml
    • -2287
    • +2294
    /lams_common/db/model/lams_11.clay
    • -0
    • +1
    /lams_common/db/sql/create_lams_11_tables.sql
    • -3
    • +3
    /lams_common/db/sql/insert_users.sql
    • -3
    • +3
    /lams_common/db/sql/insert_users_org_test.sql
    • -2
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java
1:40 pm

fmalikoff

Trying to getOrganisationByUserRole working

Options
    • binary
    /lams_build/lib/lams/lams-central.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +135
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/OrganisationDTOFactory.java
    • -12
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -0
    • +1
    /lams_central/test/java/org/lamsfoundation/lams/authoring/service/TestAuthoringService.java
    • -1
    • +3
    /lams_central/test/java/org/lamsfoundation/lams/authoring/web/TestAuthoringAction.java
    • -0
    • +1
    /lams_central/test/java/org/lamsfoundation/lams/workspace/service/BaseWorkspaceTest.java
    • -7
    • +45
    /lams_central/test/java/org/lamsfoundation/lams/workspace/service/TestWorkspaceManagement.java