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 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.
Tuesday 25 Jul 2017
8:05 pm

Marcin Cieslak

LDEV-4392 Control websocket reconnect

Do not reconnect if close happened immediately after open. Limit command

websocket reconnects.

Options
    • -4
    • +14
    ./web/WEB-INF/tags/Page.tag
  2. … 37 more files in changeset.
11:23 am

Marcin Cieslak

LDEV-4389 Replace a method not supported in IE 11

Options
    • -3
    • +3
    ./web/includes/javascript/authoring/authoringGeneral.js
10:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4390 Default style buttons in Purple theme have no blue outline.

Options
    • -0
    • +3
    ./web/css/purple_learner.scss
9:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4390 Purple Theme

Options
    • -0
    • +91
    ./conf/scss/_lams_variables_purple.scss
    • -0
    • +2
    ./web/css/purple_authoring.scss
    • -0
    • +2
    ./web/css/purple_chart.scss
    • -0
    • +11
    ./web/css/purple_jquery.jRating.scss
    • -0
    • +12
    ./web/css/purple_learner.scss
    • -0
    • +2
    ./web/css/purple_main.scss
    • -0
    • +2
    ./web/css/purple_progressBar.scss
    • -0
    • +2
    ./web/css/purple_treetable.scss
  9. … 2 more files in changeset.
1:05 am

Marcin Cieslak

LDEV-4366 Introduce rubrics to Kumalive

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/scss/_bootstrap-variables.scss
    • -0
    • +6
    ./web/groupHeader.jsp
    • -0
    • +17
    ./web/includes/javascript/main.js
    • -1
    • +1
    ./web/includes/javascript/openUrls.js
    • -0
    • +2
    ./web/main.jsp
  7. … 24 more files in changeset.
Monday 24 Jul 2017
12:52 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

English, Greek and Norwegian

Options
    • -33
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -33
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -33
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -35
    • +4
    ./conf/language/lams/ApplicationResources_no_NO.properties
Saturday 22 Jul 2017
5:26 pm

Marcin Cieslak

LDEV-3490 Limit activity title length

Options
    • -7
    • +7
    ./web/authoring/authoring.jsp
12:21 pm

Marcin Cieslak

LDEV-3490 Fix title breaking in progress bar

The progress bar is not displayed when its elements get created.

Javascript can not predict their dimensions. We need to create a dummy,

visible Snap paper, adjust elements there and only add the final version

to the real paper.

Options
    • -15
    • +23
    ./web/includes/javascript/progressBar.js
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
    ./src/java/org/lamsfoundation/lams/web/ProfileAction.java
  2. … 1 more file in changeset.
Thursday 20 Jul 2017
10:09 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 Removing css files that should now be ignored

Options
    • -7
    • +2
    ./.gitignore
    • -378
    • +0
    ./web/css/defaultHTML_authoring.css
    • -38
    • +0
    ./web/css/defaultHTML_chart.css
    • -101
    • +0
    ./web/css/defaultHTML_jquery.jRating.css
    • -488
    • +0
    ./web/css/defaultHTML_main.css
    • -107
    • +0
    ./web/css/defaultHTML_orgGroup.css
    • -60
    • +0
    ./web/css/defaultHTML_progressBar.css
    • -50
    • +0
    ./web/css/defaultHTML_treetable.css
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
    • -0
    • +840
    ./conf/scss/_bootstrap-variables.scss
    • -0
    • +79
    ./conf/scss/_lams_variables.scss
    • -0
    • +109
    ./conf/scss/_mixins.scss
    • -10
    • +37
    ./src/java/org/lamsfoundation/lams/web/tag/CssTag.java
    • -2
    • +2
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +12
    ./web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +1
    ./web/addLesson.jsp
    • -1
    • +1
    ./web/authoring/authoring.jsp
    • -2
    • +1
    ./web/comments/comments.jsp
    • -2
    • +2
    ./web/comments/topicview.jsp
    • -0
    • +480
    ./web/css/_authoring_base.scss
    • -0
    • +45
    ./web/css/_chart_base.scss
    • -0
    • +29
    ./web/css/_inlineeditor.scss
    • -0
    • +91
    ./web/css/_jquery.jRating_base.scss
    • -0
    • +957
    ./web/css/_learner_base.scss
  16. … 142 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
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
Tuesday 18 Jul 2017
1:31 pm

Marcin Cieslak

LDEV-4382 Fix JS data flow for Live Edit

Options
    • -2886
    • +2889
    ./web/includes/javascript/authoring/authoringGeneral.js
1:46 am

Marcin Cieslak

LDEV-3115 Fix a bug in branching type setting

Grouping was not cleared when branching was set from group-based to any

other.

Options
    • -1908
    • +1909
    ./web/includes/javascript/authoring/authoringProperty.js
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
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -0
    • +5
    ./web/css/authoring.scss
    • -1
    • +4
    ./web/css/orgGrouping.scss
Thursday 13 Jul 2017
1:33 pm

Marcin Cieslak

LDEV-4378 Use CSS for progress bar SVG elements

Options
    • -0
    • +36
    ./web/css/progressBar.scss
    • -35
    • +14
    ./web/includes/javascript/progressBar.js
Tuesday 11 Jul 2017
6:37 pm

Marcin Cieslak

LDEV-4366 Make Kumalive responsive and SASSy

Options
    • -1
    • +1
    ./conf/scss/_bootstrap-variables.scss
  2. … 3 more files in changeset.
11:36 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels i18n

Mainly Norwegian, Greek and English

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -45
    • +355
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 49 more files in changeset.
Monday 10 Jul 2017
9:05 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4372 Tooltips in Monitoring tabs no longer clash

Options
    • -0
    • +23
    ./web/css/defaultHTML_learner.scss
    • -12
    • +0
    ./web/css/progressBar.scss
    • -2
    • +2
    ./web/includes/javascript/progressBar.js
  4. … 6 more files in changeset.
6:53 pm

Marcin Cieslak

LDEV-4366 Open Kumalive in a pop up window rather than jQuery dialog

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -1
    • +1
    ./web/groupHeader.jsp
    • -19
    • +0
    ./web/includes/javascript/main.js
    • -243
    • +259
    ./web/includes/javascript/openUrls.js
  5. … 1 more file in changeset.
10:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 CSS Files removed if they are now generated files using SASS

Options
    • -0
    • +10
    ./.gitignore
    • -187
    • +0
    ./web/css/addLesson.css
    • -378
    • +0
    ./web/css/authoring.css
    • -38
    • +0
    ./web/css/chart.css
    • -634
    • +0
    ./web/css/defaultHTML_learner.css
    • -35
    • +0
    ./web/css/inlineeditor.css
    • -36
    • +0
    ./web/css/jquery.treetable.lams.css
    • -485
    • +0
    ./web/css/main.css
    • -117
    • +0
    ./web/css/orgGroup.css
    • -69
    • +0
    ./web/css/orgGrouping.css
    • -43
    • +0
    ./web/css/progressBar.css
  12. … 32 more files in changeset.
Thursday 06 Jul 2017
5:58 pm

Marcin Cieslak

LDEV-4366 Fix course header icons on index page

Options
    • -0
    • +1
    ./web/css/_main_base.scss
5:48 pm

Marcin Cieslak

LDEV-4366 Add a working version of Kumalive

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -13
    • +12
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -2
    • +26
    ./web/groupHeader.jsp
    • -2
    • +2
    ./web/includes/javascript/main.js
  5. … 11 more files in changeset.
Saturday 01 Jul 2017
11:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4367 SASS Used for CSS Development

First pass of converting our .css development to use SASS. Autobuild to

convert .scss to .css files has been set up for all projects where

target .css files were found. The overall ANT build has been modified

so the normal build will generate the .css files from .scss files. The

base variables are defined in lams_build/conf/sccs.

Options
    • -0
    • +16
    ./.externalToolBuilders/SASS_lams_central.launch
    • -1
    • +2
    ./.gitignore
    • -0
    • +9
    ./.project
    • -149
    • +98
    ./web/css/addLesson.css
    • -0
    • +239
    ./web/css/addLesson.scss
    • -287
    • +184
    ./web/css/authoring.css
    • -0
    • +482
    ./web/css/authoring.scss
    • -31
    • +25
    ./web/css/chart.css
    • -0
    • +47
    ./web/css/chart.scss
    • -516
    • +441
    ./web/css/defaultHTML_learner.css
    • -0
    • +736
    ./web/css/defaultHTML_learner.scss
    • -14
    • +13
    ./web/css/inlineeditor.css
    • -0
    • +38
    ./web/css/inlineeditor.scss
    • -24
    • +16
    ./web/css/jquery.treetable.lams.css
    • -0
    • +47
    ./web/css/jquery.treetable.lams.scss
  16. … 144 more files in changeset.
Wednesday 28 Jun 2017
11:58 am

Marcin Cieslak

LDEV-4366 Prototype Kumalive front and back ends

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java
    • -0
    • +18
    ./web/includes/javascript/main.js
    • -1
    • +3
    ./web/main.jsp
  5. … 15 more files in changeset.
Thursday 15 Jun 2017
1:38 pm

Marcin Cieslak

LDEV-4361 Remove Pedagocial Planner auto deployment

From now on the Planner has to be deployed manually using its "deploy"

Ant task.

Options
    • -13
    • +1
    ./build.xml
Wednesday 14 Jun 2017
4:56 pm

Marcin Cieslak

LDEV-4360 Adjust Ant build paths

Since public and private projects are not in the same dir now,

we need to make sure Ant commands point to proper resources.

Options
    • -2
    • +2
    ./build.xml
  2. … 2 more files in changeset.