lams

lams_learning

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 20
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 32,912
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
Tuesday 14 Mar 2017
9:56 pm

Marcin Cieslak

LDEV-4272: Check if learner progress belongs to the logged in user.

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
Tuesday 07 Mar 2017
6:05 pm

Marcin Cieslak

LDEV-4260: Make sure that lesson corresponds to the activity.

Options
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
Monday 06 Mar 2017
8:37 am

fionam

LDEV-4240: Consistent upload widget: making the button and file name area smaller.

Options
    • -2
    • +2
    ./web/WEB-INF/tags/FileUpload.tag
  2. … 31 more files in changeset.
Thursday 02 Mar 2017
6:36 pm

Marcin Cieslak

LDEV-4180: Remove obsolete properties.

Options
    • -1
    • +0
    ./build.properties
  2. … 6 more files in changeset.
4:38 pm

Marcin Cieslak

LDEV-4252: Use another collection type instead of synchronisation.

Options
    • -16
    • +7
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
Wednesday 01 Mar 2017
8:09 pm

fionam

LDEV-4240: Consistent upload widget

Keeping the tag files consistent across LAMS.

Options
    • -6
    • +34
    ./web/WEB-INF/tags/FileUpload.tag
  2. … 3 more files in changeset.
Monday 27 Feb 2017
5:57 pm

fionam

LDEV-4237: Include label informing the max size file

LDEV-4241: File upload validation

LDEV-4240: Consistent upload widget

Creating tags and shared javascript code to create consistency across tools for the look and validation behaviour of file upload.

Options
    • binary
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -0
    • +56
    ./web/WEB-INF/tags/FileUpload.tag
    • -0
    • +17
    ./web/WEB-INF/tags/WaitingSpinner.tag
    • -0
    • +8
    ./web/WEB-INF/tlds/lams/lams.tld
  5. … 17 more files in changeset.
5:57 pm

fionam

file FileUpload.tag was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    ./web/WEB-INF/tags/FileUpload.tag
  2. … 5 more files in changeset.
5:57 pm

fionam

file WaitingSpinner.tag was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    ./web/WEB-INF/tags/WaitingSpinner.tag
  2. … 5 more files in changeset.
Wednesday 15 Feb 2017
1:06 pm

Marcin Cieslak

LDEV-4224: Pass IDs instead of objects into transactional methods so the objects are not cached and reused in subsequent retries.

Options
    • -26
    • +5
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -30
    • +23
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  4. … 1 more file in changeset.
Friday 03 Feb 2017
7:39 pm

Andrey Balan

LDEV-4155 In order to be able to use "history.back()" without any problems - using redirect in NotebookAction

Options
    • -31
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
    • -0
    • +5
    ./web/WEB-INF/struts-config.xml
7:37 pm

Andrey Balan

LDEV-4155 formatting

Options
    • -16
    • +22
    ./web/notebook/view.jsp
Wednesday 01 Feb 2017
11:12 am

fionam

LDEV-4206: Progress bar was missing in mobile format.

Options
    • -0
    • +1
    ./web/lessonComplete.jsp
Monday 30 Jan 2017
12:13 pm

Marcin Cieslak

LDEV-4187: Make sure that even after an exception is thrown, the Hibernate session is closed. Add extra logging to verify completeActivity() failures.

Options
    • -6
    • +10
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -14
    • +21
    ./src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
    • -67
    • +74
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  4. … 5 more files in changeset.
Tuesday 24 Jan 2017
9:27 pm

Marcin Cieslak

LDEV-4198: Re-committing Fiona's changes: Do not try to get the Floating Activity URL for the progress bar. It does not exist and just results in an error in the log. If isFloating = true then we have come from the progress bar, if isFloating = false we have come from elsewhere in the system and we should get the "broken progress" screen just in case LAMS does try to show to floating activity somewhere.

Options
    • -2
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
9:25 pm

Marcin Cieslak

LDEV-4175: Do not put DB entities (LearnerProgress, Activity) into request as this can cause problems. Better stick to IDs as parameters.

Options
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -8
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
    • -7
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -13
    • +10
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
    • -15
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -82
    • +14
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
Monday 23 Jan 2017
9:51 am

fionam

LDEV-4198: Do not try to get the Floating Activity URL for the progress bar. It does not exist and just results in an error in the log. If isFloating = true then we have come from the progress bar, if isFloating = false we have come from elsewhere in the system and we should get the "broken progress" screen just in case LAMS does try to show to floating activity somewhere.

Options
    • -2
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
Tuesday 17 Jan 2017
9:19 pm

Marcin Cieslak

LDEV-4187: Open new session on Presence Chat websocket thread run.

Options
    • -7
    • +10
    ./src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
Thursday 12 Jan 2017
2:45 pm

Marcin Cieslak

LDEV-4187: Add missing classpath entry to silence Eclipse error.

Options
    • -0
    • +5
    ./.classpath
Wednesday 11 Jan 2017
5:00 pm

fionam

LDEV-4187: Reprocess the learner progress for a lesson, basing any missing entries from data gathered from the related tool or system activity.

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -0
    • +184
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -0
    • +218
    ./src/java/org/lamsfoundation/lams/learning/web/RepopulateProgressMarksServlet.java
    • -0
    • +12
    ./web/WEB-INF/web.xml
5:00 pm

fionam

file RepopulateProgressMarksServlet.java was initially added on branch lams2_head_wildfly.

Options
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/learning/web/RepopulateProgressMarksServlet.java
Monday 09 Jan 2017
12:42 am

Marcin Cieslak

LDEV-4187: Delegate non-HTTP-request tasks to own threads. Open and close Hibernate session for each of such thread. Bind created session to context and thread. Close session at the end of thread execution.

Options
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
    • -26
    • +36
    ./src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
Thursday 05 Jan 2017
7:19 pm

Marcin Cieslak

LDEV-4187: Synchronise completeActivity() method again. Do not pull LearnerProgress from DB as the same object seems to be fetched fron cache anyway. Add extra logs for attempted->completed activity transition.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 1 more file in changeset.
Wednesday 28 Dec 2016
6:33 pm

Marcin Cieslak

LDEV-3765: Make sure all necessary objects still exist when unregistering an user.

Options
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
5:39 pm

Marcin Cieslak

LDEV-4175: Prevent a CompleteToolSession race exception caused by optimistic locking from canceling the whole transaction.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
Tuesday 27 Dec 2016
3:17 pm

fionam

LDEV-4161: Enhancements to Peer Review - tweaking the wording of the rating display.

Options
    • -7
    • +11
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 26 more files in changeset.
Saturday 24 Dec 2016
10:39 am

fionam

LDEV-4109: Updating tags across projects.

Options
    • -15
    • +44
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
  2. … 7 more files in changeset.
10:36 am

fionam

LDEV-4160: Convert any underscores to spaces so that long lesson names that only use underscores and not spaces will still wrap the lesson name.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Page.tag
  2. … 7 more files in changeset.
Friday 23 Dec 2016
3:19 pm

sanjana

LDEV-4119:Replace stepper

Options
    • -1
    • +1
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
  2. … 12 more files in changeset.
Thursday 15 Dec 2016
7:48 pm

Marcin Cieslak

LDEV-3292: Get rid of learner progress object juggling when compling an activity. It looked like there were several objects but all changes were done on the same one. It could also lead to two objects referencing the same row in DB which resulted in an exception while saving.

Options
    • -27
    • +19
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -9
    • +4
    ./src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -58
    • +21
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -5
    • +3
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java