lams-github / lams_central / src / java / org

lamsfoundation

Clone Tools

Stats

Commits this week: 0
Total Committers: 26
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 22 Dec 2017
9:39 pm

Andrey Balan

LDEV-4492 Fix wrong casting activityDAO to ActivityDAO

It has to be IActivityDAO instead.

Options
    • -38
    • +24
    ./lams/web/planner/PedagogicalPlannerAction.java
Tuesday 19 Dec 2017
1:47 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -1
    • +1
    ./lams/authoring/web/AuthoringAction.java
    • -0
    • +1
    ./lams/web/OrganisationGroupAction.java
    • -1
    • +1
    ./lams/web/action/LtiAction.java
  4. … 43 more files in changeset.
Thursday 30 Nov 2017
6:53 pm

Andrey Balan

LDEV-4478 Make sure user has GROUP_MANAGER role

When displaying GRADEBOOK_MONITOR_ORGANISATION_URL we need to make

sure user has GROUP_MANAGER role

Options
    • -18
    • +29
    ./lams/web/GradebookServlet.java
Wednesday 29 Nov 2017
9:26 pm

Andrey Balan

LDEV-4479 Switch portrait images format to JPG

As long as JPG files are much more compact and we expect a lot of

them to be stored in LAMS (users' portraits primarily), there is

a need to switch to JPG.

Options
    • -7
    • +7
    ./lams/web/PortraitSaveAction.java
  2. … 4 more files in changeset.
Monday 27 Nov 2017
12:30 pm

Marcin Cieslak

LDEV-4469 Implement portrait batch upload servlet

Options
    • -18
    • +19
    ./lams/web/PortraitSaveAction.java
  2. … 6 more files in changeset.
12:29 pm

Marcin Cieslak

LDEV-4469 Remove obsolete file

Options
    • -165
    • +0
    ./lams/util/PortraitUtils.java
Tuesday 21 Nov 2017
12:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457 Create groupings based on file upload

Options
    • -0
    • +1
    ./lams/web/OrganisationGroupAction.java
  2. … 15 more files in changeset.
Tuesday 07 Nov 2017
9:57 am

Marcin Cieslak

LDEV-4453 Fix method calls after signature changes

Options
    • -1
    • +1
    ./lams/authoring/web/AuthoringAction.java
    • -1
    • +1
    ./lams/web/action/LtiAction.java
    • -2
    • +2
    ./lams/webservice/xml/LessonManagerServlet.java
  4. … 1 more file in changeset.
Thursday 02 Nov 2017
12:51 am

Andrey Balan

LDEV-4451 Move ConfidenceLevels to the tools finally

ConfidenceLevels should be stored at the tools levels as otherwise it's

hard to keep questions hashes updated in lams_central.

Options
    • -80
    • +0
    ./lams/web/ConfidenceLevelServlet.java
  2. … 12 more files in changeset.
Thursday 26 Oct 2017
1:17 am

Andrey Balan

LDEV-4451 Allow learners to choose confidence levels

Add advanced option in Assessment/MCQ - 'Store Confidences'.

If this option is ON, then in learning show sliders which will allow

choosing confidence levels. Display stored levels in learning and

monitoring.

Options
    • -0
    • +80
    ./lams/web/ConfidenceLevelServlet.java
  2. … 29 more files in changeset.
Tuesday 24 Oct 2017
3:53 pm

Marcin Cieslak

LDEV-4366 Disable learner's button when Kumalive is not started

Options
    • -26
    • +37
    ./lams/web/DisplayGroupAction.java
  2. … 4 more files in changeset.
Monday 23 Oct 2017
6:05 pm

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on organisation level

Options
    • -2
    • +3
    ./lams/web/DisplayGroupAction.java
  2. … 7 more files in changeset.
5:34 pm

Marcin Cieslak

LDEV-4447 Toggle Kumalive feature on sysadmin level

Options
    • -5
    • +13
    ./lams/web/DisplayGroupAction.java
  2. … 6 more files in changeset.
Thursday 19 Oct 2017
10:15 pm

Marcin Cieslak

LDEV-4440 Add a test library which does not reference Struts

After full LAMS migration to Spring MVC it will become

3rdParty.userlibraries

Options
    • -0
    • +183
    ./lams/authoring/web/LamsAuthoringFinishController.java
    • -0
    • +108
    ./lams/web/planner/PedagogicalPlannerActivitySpringForm.java
  3. … 66 more files in changeset.
Friday 13 Oct 2017
2:01 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

Options
    • -26
    • +17
    ./lams/authoring/ObjectExtractor.java
    • -34
    • +17
    ./lams/authoring/service/AuthoringService.java
    • -1
    • +2
    ./lams/authoring/service/IAuthoringService.java
    • -1
    • +8
    ./lams/authoring/web/AuthoringAction.java
  5. … 5 more files in changeset.
Monday 09 Oct 2017
3:14 pm

Marcin Cieslak

LDEV-4293 Tune session log out

Make sure mapping login->session is cleared in certain situations.

Check if a session already exists for the given login. If so, invalidate

one of the sessions.

Options
    • -1
    • +5
    ./lams/web/SessionListener.java
  2. … 2 more files in changeset.
10:23 am

Marcin Cieslak

LDEV-4293 Rewrite session invalidation mechanism

Server-side non-current session invalidation does not work well on

clustered WildFly 10. It breaks Infinispan distributed session cache and

makes a logged out user clear LAMS cookies, otherwise he/she gets a

blank screen. See WFLY-7281 and WFLY-7229.

So instead of invalidating a session we mark it for invalidation. The

next time the user tries to use it, the session gets invalidated and the

user gets an error screen (not a very clean solution, but more effective

than another filter which would nicely redirect the user to logout

screen).

This solution seems to work nicely if both browsers interact with the

same node. Since we use distributed session for failover rather than

replication, it should be OK.

Options
    • -17
    • +6
    ./lams/web/SessionListener.java
  2. … 3 more files in changeset.
Wednesday 04 Oct 2017
2:56 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Lesson marks always recalculated after Live Edit

Also tries to respect any teacher modified lesson marks when

activity marks are changed by doing a 'take the old marks off

and add the new mark on' calculation for weighting.

Options
    • -3
    • +4
    ./lams/authoring/service/AuthoringService.java
  2. … 1 more file in changeset.
Tuesday 03 Oct 2017
4:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4423 Additional portrait entries

Options
    • -1
    • +1
    ./lams/web/tag/PortraitTag.java
  2. … 10 more files in changeset.
Wednesday 27 Sep 2017
8:30 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Gradebook calculations and UI support weighting

Options
    • -0
    • +1
    ./lams/authoring/authoringApplicationContext.xml
    • -1
    • +13
    ./lams/authoring/service/AuthoringService.java
    • -1
    • +2
    ./lams/authoring/service/IAuthoringService.java
    • -1
    • +8
    ./lams/authoring/web/AuthoringAction.java
  5. … 13 more files in changeset.
Tuesday 26 Sep 2017
5:50 pm

Marcin Cieslak

LDEV-4415 Allow removing weights from saved LD

Options
    • -1
    • +3
    ./lams/authoring/ObjectExtractor.java
  2. … 1 more file in changeset.
Monday 25 Sep 2017
2:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4427 System Admin can delete profile pictures

Options
    • -0
    • +66
    ./lams/web/PortraitSaveAction.java
  2. … 5 more files in changeset.
Tuesday 12 Sep 2017
12:53 am

Andrey Balan

LDEV-4419 Add widget for cropping portrait photos

Added widget that allows cropping the image to a standardised size for

webcam and image uploads (in order to make it squarish).

Options
    • -6
    • +0
    ./lams/web/PortraitSaveAction.java
  2. … 2 more files in changeset.
Saturday 09 Sep 2017
10:42 am

Marcin Cieslak

LDEV-4293 Skip isSysAdmin check when there is no session

The code that checks if user is sysadmin depends on HTTP session being

present in SessionManager. It is normally present as the authentication

request goes through SsoHandler which initiates the session. It is not

the case, though, when session gets replicated and UniversalLoginModule

is accessed directly.

The fix skips the check in no session is present, which means that

sysadmin will need to authenticate same as regular user, which is OK for

this edge situation. Session failover still works.

Options
    • -6
    • +10
    ./lams/security/UniversalLoginModule.java
Friday 08 Sep 2017
6:22 am

Marcin Cieslak

LDEV-4415 Add front end for weighted outputs

Options
    • -1
    • +1
    ./lams/authoring/ObjectExtractor.java
  2. … 14 more files in changeset.
Wednesday 30 Aug 2017
1:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -30
    • +67
    ./lams/web/tag/PortraitTag.java
  2. … 73 more files in changeset.
1:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -30
    • +67
    ./lams/web/tag/PortraitTag.java
  2. … 74 more files in changeset.
Tuesday 29 Aug 2017
8:30 pm

Marcin Cieslak

LDEV-4415 Add tool output weight. Rewrite activity evaluations.

Activity evaluations have been implemented as a list, even though always

only the first element is meaningful. They were rewritten as one-to-one

association with Activity. The primary key is activity ID now instead of

DB generated UID.

Weight column was added.

Server version was bumped so a filter can pick up activityEvaluations ->

evaluation field rename when importing older LDs.

A convention without date was used for server version as it seems good

enough.

Unnecessary versions of clients were removed from configuration table as

they server the abandoned Flash authoring.

Options
    • -28
    • +19
    ./lams/authoring/ObjectExtractor.java
    • -42
    • +13
    ./lams/authoring/service/AuthoringService.java
    • -33
    • +32
    ./lams/webservice/xml/LessonManagerServlet.java
  4. … 16 more files in changeset.
Saturday 26 Aug 2017
10:04 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -1
    • +1
    ./lams/web/HomeAction.java
    • -0
    • +4
    ./lams/web/IndexAction.java
    • -1
    • +1
    ./lams/web/OrganisationGroupAction.java
    • -1
    • +1
    ./lams/web/action/LtiAction.java
    • -1
    • +1
    ./lams/web/planner/PedagogicalPlannerAction.java
    • -1
    • +1
    ./lams/workspace/service/IWorkspaceManagementService.java
    • -1
    • +1
    ./lams/workspace/service/WorkspaceManagementService.java
  8. … 27 more files in changeset.
Tuesday 22 Aug 2017
8:54 pm

Andrey Balan

LDEV-4374 Hide search widget if there is less than 10 courses

If the number of active courses that user has access to is less

than 10 - we don't display search widget.

Options
    • -0
    • +4
    ./lams/web/IndexAction.java
  2. … 1 more file in changeset.