lams-github / lams_central / src

java

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 20 Oct 2017
4:15 am

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
    ./org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishController.java
    • -0
    • +108
    ./org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java
  3. … 66 more files in changeset.
Friday 13 Oct 2017
8: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
    ./org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -34
    • +17
    ./org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -1
    • +2
    ./org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -1
    • +8
    ./org/lamsfoundation/lams/authoring/web/AuthoringAction.java
  5. … 5 more files in changeset.
Monday 09 Oct 2017
9: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
    ./org/lamsfoundation/lams/web/SessionListener.java
  2. … 2 more files in changeset.
4:23 pm

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
    ./org/lamsfoundation/lams/web/SessionListener.java
  2. … 3 more files in changeset.
Wednesday 04 Oct 2017
8: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
    ./org/lamsfoundation/lams/authoring/service/AuthoringService.java
  2. … 1 more file in changeset.
Tuesday 03 Oct 2017
10:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4423 Additional portrait entries

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

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Gradebook calculations and UI support weighting

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

Marcin Cieslak

LDEV-4415 Allow removing weights from saved LD

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

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4427 System Admin can delete profile pictures

Options
    • -0
    • +66
    ./org/lamsfoundation/lams/web/PortraitSaveAction.java
  2. … 5 more files in changeset.
Tuesday 12 Sep 2017
6: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
    ./org/lamsfoundation/lams/web/PortraitSaveAction.java
  2. … 2 more files in changeset.
Saturday 09 Sep 2017
4:42 pm

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
    ./org/lamsfoundation/lams/security/UniversalLoginModule.java
Friday 08 Sep 2017
12:22 pm

Marcin Cieslak

LDEV-4415 Add front end for weighted outputs

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/authoring/ObjectExtractor.java
  2. … 14 more files in changeset.
Wednesday 30 Aug 2017
7: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
    ./org/lamsfoundation/lams/web/tag/PortraitTag.java
  2. … 73 more files in changeset.
7: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
    ./org/lamsfoundation/lams/web/tag/PortraitTag.java
  2. … 74 more files in changeset.
2:30 am

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
    ./org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -42
    • +13
    ./org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -33
    • +32
    ./org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
  4. … 16 more files in changeset.
Saturday 26 Aug 2017
4:04 pm

Marcin Cieslak

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

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/web/HomeAction.java
    • -0
    • +4
    ./org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +1
    ./org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +1
    ./org/lamsfoundation/lams/web/action/LtiAction.java
    • -1
    • +1
    ./org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -1
    • +1
    ./org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
  8. … 27 more files in changeset.
Wednesday 23 Aug 2017
2:54 am

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
    ./org/lamsfoundation/lams/web/IndexAction.java
  2. … 1 more file in changeset.
Friday 18 Aug 2017
3:46 am

Andrey Balan

LDEV-4407 Move lams_contentrepository exceptions to the proper package

lams_contentrepository's exception classes were moved to

contentrepository.exception package.

(To access exceptions' earlier history use Eclipse's Show in History

feature or run 'git log --follow ./path/to/file')

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/web/HomeAction.java
    • -1
    • +1
    ./org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +1
    ./org/lamsfoundation/lams/web/action/LtiAction.java
    • -1
    • +1
    ./org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -1
    • +1
    ./org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
    • -1
    • +1
    ./org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
  8. … 60 more files in changeset.
Thursday 10 Aug 2017
12:28 am

Marcin Cieslak

LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

Options
    • -4
    • +6
    ./org/lamsfoundation/lams/authoring/IObjectExtractor.java
    • -198
    • +183
    ./org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -18
    • +18
    ./org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -4
    • +6
    ./org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -46
    • +34
    ./org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -61
    • +60
    ./org/lamsfoundation/lams/comments/web/CommentAction.java
    • -8
    • +10
    ./org/lamsfoundation/lams/rest/LearningDesignRestServlet.java
    • -20
    • +13
    ./org/lamsfoundation/lams/rest/RestServlet.java
    • -5
    • +6
    ./org/lamsfoundation/lams/rest/ToolContentRestServlet.java
    • -4
    • +4
    ./org/lamsfoundation/lams/rest/ToolRestManager.java
    • -8
    • +10
    ./org/lamsfoundation/lams/web/FindUserLessonsAction.java
    • -18
    • +13
    ./org/lamsfoundation/lams/web/HomeAction.java
    • -29
    • +32
    ./org/lamsfoundation/lams/web/IndexAction.java
    • -8
    • +9
    ./org/lamsfoundation/lams/web/NotificationAction.java
    • -55
    • +57
    ./org/lamsfoundation/lams/web/OrganisationGroupAction.java
  16. … 121 more files in changeset.
Monday 07 Aug 2017
7:16 pm

Marcin Cieslak

LDEV-4402 Remove Lucene library

It has only been used for Pedagogical Planner filter feature, which is

not used by clients anyway

Options
    • -178
    • +15
    ./org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
  2. … 8 more files in changeset.
6:23 pm

Marcin Cieslak

LDEV-4402 Remove obsolete XPP3 and XMLPull libraries

The libraries have been used by earlier versions of XStream. They are

not needed for latest XStream and Java 6+.

Deserialized classes must implement a no-arg constructor.

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
  2. … 12 more files in changeset.
Thursday 03 Aug 2017
11:42 pm

Andrey Balan

LDEV-4398 Enlarge the smallest portrait size to 35px

Also accommodate for this change on main and profile pages.

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/web/PortraitSaveAction.java
  2. … 3 more files in changeset.
5:44 am

Andrey Balan

LDEV-4398 Use imgscalr library for image resizing

Besides, switch to using only PNG files in order to prevent image

quality loosing.

Options
    • -33
    • +30
    ./org/lamsfoundation/lams/web/PortraitSaveAction.java
  2. … 1 more file in changeset.
Wednesday 02 Aug 2017
8:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Clean up comments and debugging

Options
    • -1
    • +0
    ./org/lamsfoundation/lams/web/tag/PortraitTag.java
  2. … 1 more file in changeset.
Monday 31 Jul 2017
11:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Portrait tag and javascript to display portraits

A new tag and javascript file shows the user portraits in one of 4 sizes

and either square or round. If no portrait exists a generic coloured

user icon is used. Portraits shown in Forum and Noticeboard Comments.

Options
    • -0
    • +199
    ./org/lamsfoundation/lams/web/tag/PortraitTag.java
  2. … 53 more files in changeset.
Friday 28 Jul 2017
3:08 am

Andrey Balan

LDEV-4380 Replace portrait capturing Flash widget with WebRTC

In order to completely eradicate Flash, we can use WebRTC which seems to

be working OK in newer browsers.

Options
    • -57
    • +52
    ./org/lamsfoundation/lams/web/PortraitSaveAction.java
  2. … 7 more files in changeset.
Friday 21 Jul 2017
9:40 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

LDEV-4377 - Show timezones to select order alphabetically

Options
    • -288
    • +292
    ./org/lamsfoundation/lams/web/ProfileAction.java
  2. … 1 more file in changeset.
Wednesday 19 Jul 2017
6:30 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

Options
    • -10
    • +37
    ./org/lamsfoundation/lams/web/tag/CssTag.java
  2. … 156 more files in changeset.
3:18 am

Marcin Cieslak

LDEV-4382 Allow NULL group UIID in Live Edit

Having NULL group UIID seems like a common situation. There is even an

old comment explaining why is that. Object extractor should be ready for

such situation.

Options
    • -1691
    • +1691
    ./org/lamsfoundation/lams/authoring/ObjectExtractor.java
Monday 17 Jul 2017
2:02 pm

Marcin Cieslak

LDEV-4195 Fix class cast exception

Input for assigning course groups to lesson groups can be either

grouping or branching. We need to detect both situations, otherwise we

get class cast exceptions.

Also adjust layout.

Options
    • -676
    • +672
    ./org/lamsfoundation/lams/web/OrganisationGroupAction.java
  2. … 2 more files in changeset.