lams

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 33
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 4,779,243
Net change in LoC this week: 0

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 07 Aug 2015
11:50 am

fionam

LDEV-3523: Added subtype to Learning Design

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
    • -15
    • +25
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -12
    • +23
    /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
    • -0
    • +7
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040043.sql
    • -2
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java
    • -1
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java
11:24 am

fionam

LDEV-3523: Added subtype to Learning Design

LDEV-3526: Switched webservice calls to POST.

Options
    • -0
    • +5
    /lams_bb_integration/RELEASE_NOTES.TXT
    • -1
    • +1
    /lams_bb_integration/build.xml
    • -1
    • +1
    /lams_bb_integration/WEB-INF/bb-manifest.xml
    • -2
    • +3
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsLearningDesignServlet.java
    • -9
    • +67
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java
Thursday 06 Aug 2015
1:46 am

Marcin Cieslak

LDEV-3525: Add the user to the course even if he/she is already authenticated and we just redirect him/her.

Options
    • -6
    • +6
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
1:45 am

Marcin Cieslak

LDEV-3525: Add the user to the course even if he/she is already authenticated and we just redirect him/her.

Options
    • -13
    • +13
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
1:44 am

Marcin Cieslak

LDEV-3514: Use postInterceptor instead of preInterceptor.

PreInterceptor apparently runs before Hibernate transaction gets created. When an exception in the proxied method occurs, the transaction is canceled and is not re-created when retry is attempted. This leads to "no session" or "read only transaction on write" errors.

PostInterceptor seems to work when the transaction is already created, so retries happen witin its scope.

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
    • -11
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java
    • -1
    • +5
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -1
    • +1
    /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml
    • -1
    • +1
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
  16. … 25 more files in changeset.
12:49 am

Marcin Cieslak

LDEV-3514: Use postInterceptor instead of preInterceptor.

PreInterceptor apparently runs before Hibernate transaction gets created. When an exception in the proxied method occurs, the transaction is canceled and is not re-created when retry is attempted. This leads to "no session" or "read only transaction on write" errors.

PostInterceptor seems to work when the transaction is already created, so retries happen witin its scope.

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
    • -11
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml
    • -6
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/web/filter/TransactionRetryInterceptor.java
    • -1
    • +5
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml
    • -1
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -2
    • +2
    /lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/bbbApplicationContext.xml
    • -2
    • +2
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml
  16. … 25 more files in changeset.
Wednesday 05 Aug 2015
5:04 am

Marcin Cieslak

LDEV-3525: Check if user re-authenticates with the same role.

Options
    • -1
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
4:56 am

Marcin Cieslak

LDEV-3525: Check if user re-authenticates with the same role.

Options
    • -4
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/web/LoginRequestServlet.java
Tuesday 04 Aug 2015
3:45 am

Marcin Cieslak

LDEV-3524: If min > max, set max to min.

Options
    • -8
    • +22
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
3:44 am

Marcin Cieslak

LDEV-3524: If min > max, set max to min.

Options
    • -8
    • +22
    /lams_tool_assessment/web/pages/authoring/parts/addessay.jsp
Monday 03 Aug 2015
6:16 pm

Marcin Cieslak

LDEV-3490: Fix activity title wrap in progress bar.

Options
    • -32
    • +31
    /lams_central/web/includes/javascript/progressBar.js
6:15 pm

Marcin Cieslak

LDEV-3490: Fix activity title wrap in progress bar.

Options
    • -32
    • +31
    /lams_central/web/includes/javascript/progressBar.js
Friday 31 Jul 2015
4:05 pm

Andrey Balan

LDEV-3522 Make adding justification textareas optional

Options
    • -0
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150731.sql
    • -1
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -1
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -7
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -1
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
    • -1
    • +1
    /lams_tool_assessment/web/pages/authoring/basic.jsp
    • -0
    • +7
    /lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
    • -5
    • +8
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -13
    • +15
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -1
    • +3
    /lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp
4:01 pm

Andrey Balan

file patch20150731.sql was added on branch lams2_head_wildfly on 2015-07-31 08:05:33 +0000

Options
    • -0
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150731.sql
4:01 pm

Andrey Balan

LDEV-3522 Make adding justification textareas optional

Options
    • -1
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20150731.sql
    • -1
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
    • -1
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/AuthoringAction.java
    • -7
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -1
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/form/AssessmentQuestionForm.java
    • -0
    • +7
    /lams_tool_assessment/web/pages/authoring/parts/addmarkhedging.jsp
    • -5
    • +8
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -13
    • +15
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -1
    • +3
    /lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp
3:16 pm

Andrey Balan

LDEV-3509 *Store blank burning questions. In this way other groups will see these empty burning questions. Besides, non-leaders will be able to move on once leader submits empty burning questions (and not after he's finished the activity)

*Fixed Students stuck in Scratchie when leader submits empty burning questions

Options
    • -8
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
3:14 pm

Andrey Balan

LDEV-3517 Prevent loosing new criterias on saving

Options
    • -5
    • +5
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
    • -7
    • +7
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaAction.java
3:06 pm

Andrey Balan

LDEV-3517 Added new methods for Peer Review tool

Options
    • -1
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingCriteriaDAO.java
    • -1
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java
    • -3
    • +24
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCriteriaDAO.java
    • -2
    • +69
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java
    • -2
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/rating/dto/ItemRatingCriteriaDTO.java
    • -1
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/rating/dto/ItemRatingDTO.java
    • -44
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/rating/dto/RatingDTO.java
    • -1
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java
    • -61
    • +132
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
3:05 pm

Andrey Balan

LDEV-3508 Fixed Emails sent from LAMS monitor have wrong sender specified

Options
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/events/DeliveryMethodMail.java
2:10 pm

Andrey Balan

LDEV-3480 Peer review feature for Q&A

* copy min words for the question feature to mobile version

Options
    • -4
    • +3
    /lams_tool_laqa/web/learning/mobile/AnswersContent.jsp
4:53 am

Andrey Balan

LDEV-3520 Show correct right/wrong icons after short answer and numeric type of questions regardless of the scored mark

Options
    • -2
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/numerical.jsp
    • -6
    • +7
    /lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp
1:01 am

Andrey Balan

LDEV-3522 Added justification textareas to the hedging marks question type

Options
    • -5
    • +18
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -19
    • +20
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -1
    • +15
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -1
    • +3
    /lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp
12:47 am

Andrey Balan

LDEV-3522 Added justification textareas to the hedging marks question type

Options
    • -2
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +18
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -19
    • +20
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -1
    • +15
    /lams_tool_assessment/web/pages/learning/parts/markhedging.jsp
    • -1
    • +3
    /lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp
Thursday 30 Jul 2015
9:22 am

fionam

LDEV-3510 Setting a position in the Blackboard content object allows the LAMS content to be moved in the list.

Options
    • -0
    • +3
    /lams_bb_integration/web/modules/start_lesson_proc.jsp
5:04 am

Andrey Balan

LDEV-3517 Added new methods for Peer Review tool

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java
    • -3
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
    • -2
    • +63
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java
    • -1
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/rating/dto/ItemRatingDTO.java
    • -1
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java
    • -1
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
5:02 am

Andrey Balan

LDEV-3517 Implemented Peer Review tool

Options
    • -129
    • +52
    /lams_tool_preview/conf/language/lams/ApplicationResources.properties
    • -115
    • +8
    /lams_tool_preview/conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +0
    /lams_tool_preview/conf/xdoclet/struts-actions.xml
    • -2
    • +2
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/PeerreviewConstants.java
    • -3
    • +1
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dto/GroupSummary.java
    • -2
    • +1
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/Peerreview.java
    • -2
    • +1
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewSession.java
    • -35
    • +1
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/model/PeerreviewUser.java
    • -1
    • +13
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/IPeerreviewService.java
    • -1
    • +28
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java
    • -7
    • +16
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/LearningAction.java
    • -56
    • +32
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java
    • -2
    • +1
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/form/PeerreviewForm.java
    • -8
    • +2
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/servlet/ExportServlet.java
    • -18
    • +0
    /lams_tool_preview/web/pages/export/exportportfolio.jsp
  16. … 3 more files in changeset.
Wednesday 29 Jul 2015
6:44 pm

fionam

LDEV-3521: Supporting an alternative URL for LAMS where needed for mixed https/http integrations.

Options
    • -0
    • +2
    /lams_bb_integration/RELEASE_NOTES.TXT
    • -0
    • +1
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsPluginUtil.java
    • -1
    • +29
    /lams_bb_integration/src/org/lamsfoundation/ld/integration/blackboard/LamsSecurityUtil.java
    • -0
    • +4
    /lams_bb_integration/web/admin/config.jsp
    • -2
    • +5
    /lams_bb_integration/web/admin/config_proc.jsp
    • -1
    • +3
    /lams_bb_integration/web/modules/start_lesson_proc.jsp
4:27 am

Marcin Cieslak

LDEV-3519: Course signup description to use CKEditor

Options
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java
    • -2
    • +7
    /lams_admin/web/signupmanagement/add.jsp
    • -4
    • +3
    /lams_central/web/signup/signup.jsp
4:25 am

Marcin Cieslak

LDEV-3519: Make DynaActionForm accessible in JSP page.

Options
    • -0
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java
    • -2
    • +2
    /lams_admin/web/signupmanagement/add.jsp
Tuesday 28 Jul 2015
3:54 am

Andrey Balan

LDEV-3520 Show correct right/wrong icons after short answer and numeric type of questions regardless of the scored mark

Options
    • -2
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/parts/numerical.jsp
    • -6
    • +7
    /lams_tool_assessment/web/pages/learning/parts/shortanswer.jsp