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
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
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
    • -0
    • +2
    ./.classpath
    • -4
    • +6
    ./src/java/org/lamsfoundation/lams/authoring/IObjectExtractor.java
    • -198
    • +183
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -18
    • +18
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -4
    • +6
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -46
    • +34
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -61
    • +60
    ./src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
    • -8
    • +10
    ./src/java/org/lamsfoundation/lams/rest/LearningDesignRestServlet.java
    • -20
    • +13
    ./src/java/org/lamsfoundation/lams/rest/RestServlet.java
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/rest/ToolContentRestServlet.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/rest/ToolRestManager.java
    • -8
    • +10
    ./src/java/org/lamsfoundation/lams/web/FindUserLessonsAction.java
    • -18
    • +13
    ./src/java/org/lamsfoundation/lams/web/HomeAction.java
    • -29
    • +32
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -8
    • +9
    ./src/java/org/lamsfoundation/lams/web/NotificationAction.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
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -13
    • +0
    ./web/includes/javascript/pedagogicalPlanner.js
  3. … 7 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
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
  2. … 12 more files in changeset.
3:03 pm

Marcin Cieslak

LDEV-4402 Get rid of LAMS customised session filter

This filter was implemented in 2005 and seems more like a workaround

than a feature we need. Especially that many of LAMS tools already use

the standard filter and they work OK.

Options
    • -1
    • +1
    ./web/WEB-INF/web.xml
  2. … 23 more files in changeset.
Saturday 05 Aug 2017
5:36 pm

Marcin Cieslak

LDEV-4400 Update dependecies to embedded libraries

WildFly 10 is shipped with newer versions of libraries that LAMS uses.

LAMS now points to proper JAR files. Following libraries were updated:

beanutils 1.8.3 -> 1.9.2

codec 1.9 -> 1.10

collection 3.2.1 -> 3.2.2

xerces 2.11.0.SP3 -> 2.11.0.SP4

httpclient 4.2.1 -> 4.5

httpcore 4.2.1 -> 4.4.1

wildfly-controller-client 8.2.1 -> 2.2.0 (probably naming convention was

changed)

jboss-dmr 1.2.0 -> 1.3.0

Hibernate 4.3.7 -> 5.0.10

log4j-jboss-logmanager 1.1.0 -> 1.1.2

jcl-over-slf4j 1.7.2 -> 1.7.7

undertow-core 1.1.8 -> 1.4.0

undertow-servlet 1.1.8 -> 1.4.0

javax.mail 1.5.0 -> 1.5.5

jboss-jstl 1.1.2 -> 1.1.3

jboss-logging 3.1.4 -> 3.3.0

remoting-jmx 2.0.0 -> 2.0.1

slf4j-api 1.7.2 -> 1.7.7

picketbox 4.0.21 -> 4.9.6

jboss-websocket-api 1.1.0 -> 1.1.1

joda-time 1.6.2 -> 2.7

Options
    • -12
    • +12
    ./.classpath
  2. … 47 more files in changeset.
2:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Sizing tweaks

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -0
    • +7
    ./web/css/_learner_base.scss
    • -2
    • +1
    ./web/main.jsp
  4. … 31 more files in changeset.
1:04 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Leader related tools use Portrait for leader

Created a tag LeaderDisplay to display the leader consistently

across tools.

Options
    • -0
    • +28
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +1
    ./web/css/_main_base.scss
  4. … 86 more files in changeset.
Friday 04 Aug 2017
9:56 pm

Andrey Balan

LDEV-4381 Removed requestSrc parameter

This parameter was responsible for passing integration server name to

LAMS which was used on closing authoring and refreshing integration

server page. It stopped working when authoring became Flash-less (as

there is not more "Close" button). And now we decided to finally remove

all its leftovers. This change also involves removal of

"isPostMessageToParent" parameter.

Options
    • -16
    • +0
    ./web/lti/addLesson.jsp
  2. … 1 more file in changeset.
5:42 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Tweaks to CSS and layouts for main page and portraits

Also deleted LESS files that are no longer needed

Options
    • -1
    • +1
    ./conf/scss/_bootstrap-variables.scss
    • -0
    • +10
    ./conf/scss/_lams_variables.scss
    • -0
    • +10
    ./conf/scss/_lams_variables_purple.scss
    • -2
    • +17
    ./conf/scss/_mixins.scss
    • -1
    • +1
    ./web/comments/msgview.jsp
    • -6
    • +7
    ./web/css/_learner_base.scss
    • -8
    • +9
    ./web/css/_main_base.scss
    • -219
    • +0
    ./web/less/defaultHTML_learner.less
    • -604
    • +0
    ./web/less/main.less
  10. … 1 more file 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
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
    • -1
    • +1
    ./web/css/_learner_base.scss
    • -0
    • +3
    ./web/css/_main_base.scss
    • -2
    • +2
    ./web/less/main.less
11:21 pm

Andrey Balan

LDEV-4397 Bootstrap launchlearner.jsp

Options
    • -24
    • +26
    ./web/launchlearner.jsp
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
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
    • -1
    • +1
    ./web/portrait.jsp
Wednesday 02 Aug 2017
8:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Clean up comments and debugging

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
    • -1
    • +0
    ./web/includes/javascript/portrait.js
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
    • +11
    ./conf/scss/_lams_variables.scss
    • -0
    • +9
    ./conf/scss/_lams_variables_purple.scss
    • -1
    • +19
    ./conf/scss/_mixins.scss
    • -0
    • +199
    ./src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
    • -0
    • +26
    ./web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +1
    ./web/comments/msgview.jsp
    • -0
    • +70
    ./web/css/_learner_base.scss
    • -3
    • +0
    ./web/css/_main_base.scss
    • -9
    • +260
    ./web/includes/font-awesome/css/font-awesome.css
    • -2
    • +2
    ./web/includes/font-awesome/css/font-awesome.min.css
    • binary
    ./web/includes/font-awesome/fonts/FontAwesome.otf
    • binary
    ./web/includes/font-awesome/fonts/fontawesome-webfont.eot
    • -652
    • +2668
    ./web/includes/font-awesome/fonts/fontawesome-webfont.svg
    • binary
    ./web/includes/font-awesome/fonts/fontawesome-webfont.ttf
    • binary
    ./web/includes/font-awesome/fonts/fontawesome-webfont.woff
  16. … 39 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
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -57
    • +52
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
    • binary
    ./web/includes/flash/webcam.swf
    • -197
    • +0
    ./web/includes/javascript/webcam.js
    • -0
    • +135
    ./web/includes/javascript/webrtc-capturestill.js
    • binary
    ./web/includes/sounds/shutter.mp3
    • -128
    • +97
    ./web/portrait.jsp
    • -11
    • +20
    ./web/profile.jsp
Thursday 27 Jul 2017
6:04 pm

Marcin Cieslak

LDEV-4392 Fix websocket close detection

Make sure there is only, well implemented one piece of code that detects

websocket close and optionally reconnects it.

Options
    • -6
    • +5
    ./web/WEB-INF/tags/Page.tag
  2. … 37 more files in changeset.