lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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
Monday 25 Sep 2017
8:45 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into LDEV-4415

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
  2. … 1 more file in changeset.
8:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4427 System Admin can delete profile pictures

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +66
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
  3. … 4 more files in changeset.
Friday 22 Sep 2017
11:20 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4423 Adding portraits to Monitor screens

Portraits incorporated into general monitor screens such as the

email sending popup, journal viewing, grouping and learner

progress. Also fixed issues in journal viewing relating to

LDEV-4393.

Options
    • -0
    • +1
    ./web/css/_learner_base.scss
    • -2
    • +2
    ./web/css/orgGroup.scss
    • -0
    • +1
    ./web/emailuser.jsp
    • -4
    • +11
    ./web/includes/javascript/orgGroup.js
    • -0
    • +1
    ./web/orgGroup.jsp
  6. … 8 more files in changeset.
Monday 18 Sep 2017
8:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

Options
    • -5
    • +7
    ./web/WEB-INF/tags/StyledRating.tag
    • -0
    • +5
    ./web/css/_learner_base.scss
    • -0
    • +39
    ./web/includes/javascript/portrait.js
  4. … 42 more files in changeset.
Thursday 14 Sep 2017
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Wiki, DoKumaran

Options
    • -1
    • +1
    ./web/includes/javascript/portrait.js
  2. … 5 more files in changeset.
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Wiki, DoKumaran

Options
    • -1
    • +1
    ./web/includes/javascript/portrait.js
  2. … 5 more files in changeset.
Tuesday 12 Sep 2017
4:37 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4424: display larger portrait pic

Display a larger portrait picture when showing the profile options

Options
    • -2
    • +2
    ./web/profile.jsp
3:21 pm

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
    • -0
    • +250
    ./web/css/croppie.css
    • -0
    • +7
    ./web/includes/javascript/croppie.js
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
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
    • -7
    • +30
    ./web/includes/javascript/webrtc-capturestill.js
    • -27
    • +74
    ./web/portrait.jsp
Monday 11 Sep 2017
10:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

Options
    • -2
    • +3
    ./web/includes/javascript/portrait.js
  2. … 42 more files in changeset.
10:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

Options
    • -2
    • +3
    ./web/includes/javascript/portrait.js
  2. … 42 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
    ./src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java
Friday 08 Sep 2017
12:22 pm

Marcin Cieslak

LDEV-4415 Add front end for weighted outputs

Options
    • -0
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -3
    • +32
    ./web/authoring/authoring.jsp
    • -0
    • +28
    ./web/css/_authoring_base.scss
    • -7
    • +29
    ./web/includes/javascript/authoring/authoringActivity.js
    • -7
    • +122
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +5
    ./web/includes/javascript/authoring/authoringMenu.js
    • -1
    • +9
    ./web/includes/javascript/authoring/authoringProperty.js
  9. … 7 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
    ./src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +14
    ./web/css/_learner_base.scss
    • -7
    • +50
    ./web/includes/javascript/portrait.js
  5. … 70 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
    ./src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +14
    ./web/css/_learner_base.scss
    • -7
    • +50
    ./web/includes/javascript/portrait.js
  5. … 71 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
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -42
    • +13
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -33
    • +32
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
    • -3
    • +4
    ./web/includes/javascript/authoring/authoringActivity.js
    • -3
    • +3
    ./web/includes/javascript/authoring/authoringGeneral.js
  6. … 14 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
    ./src/java/org/lamsfoundation/lams/web/HomeAction.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -1
    • +1
    ./src/java/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
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -6
    • +8
    ./web/main.jsp
Tuesday 22 Aug 2017
9:49 pm

Andrey Balan

LDEV-4357 Disable "Move learner to" button when no users selected

The root problem was that diaplog's 'open' method wasn't called in case

dialog gets opened for the second time.

Options
    • -4
    • +4
    ./web/includes/javascript/dialog.js
Monday 21 Aug 2017
9:58 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395: Portrait will not tile and improved Generic spacing

Options
    • -4
    • +4
    ./web/css/_learner_base.scss
9:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395: Further tweaks to suit Forum changes

Options
    • -1
    • +1
    ./web/css/_learner_base.scss
8:29 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395: Portrait will not tile and improved Generic spacing

Options
    • -2
    • +5
    ./conf/scss/_mixins.scss
    • -4
    • +4
    ./web/css/_learner_base.scss
12:37 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4366 Portrait picture tweaks

Options
    • -2
    • +5
    ./conf/scss/_mixins.scss
    • -4
    • +4
    ./web/css/_learner_base.scss
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
    ./src/java/org/lamsfoundation/lams/web/HomeAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
  8. … 60 more files in changeset.
Wednesday 16 Aug 2017
4:58 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4399 Present entries in the order of least commented.

Also reapplied Bootstrap changes to tablesorter so that the sort

icons appear when a column is sorted.

Options
    • -1
    • +2
    ./web/includes/javascript/jquery.tablesorter-widgets.js
  2. … 4 more files in changeset.
3:11 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4395: modify message layout

Changed the message layout based on feedback

Options
    • -1
    • +4
    ./web/css/_learner_base.scss
  2. … 1 more file in changeset.
Sunday 13 Aug 2017
9:10 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4405 War deployment minifies Javascript files

Options
    • -2
    • +21
    ./build.xml
  2. … 5 more files in changeset.
Friday 11 Aug 2017
10:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4404 Tags and tlds match LAMS standard tags.

Customisation made to CKEditor tag removed and the new toolbar

set in the jsp rather than hardcoded in the tag.

Options
    • -2
    • +3
    ./web/includes/javascript/ckconfig_custom.js
  2. … 25 more files in changeset.
Thursday 10 Aug 2017
1:15 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4405: fixing white logo

Ooops... accidentally modified the white logo. Fixing it now.

Options
    • -2
    • +2
    ./web/images/svg/lams_logo_white.svg
9:09 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4405 minify .svg logo files

minify svg logo files

Options
    • -107
    • +4
    ./web/images/svg/lams_logo.svg
    • -106
    • +5
    ./web/images/svg/lams_logo_black.svg
    • -106
    • +4
    ./web/images/svg/lams_logo_white.svg