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
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.
8:32 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4305 Using the standard upload widget and validation for user/role/organisation upload - added method to check for .xls extension.

Options
    • -0
    • +15
    ./web/includes/javascript/upload.js
Tuesday 13 Jun 2017
1:03 pm

Marcin Cieslak

After migration clean up

Options
    • -2
    • +0
    ./.cvsignore
    • -0
    • +2
    ./.gitignore
    • -1
    • +0
    ./web/images/.cvsignore
    • -1
    • +0
    ./web/images/icons/.cvsignore
    • -1
    • +0
    ./web/images/license/.cvsignore
  6. … 310 more files in changeset.
Friday 09 Jun 2017
11:21 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4352: Adding mark charts to Monitoring for Scratchie and MCQ. Moved more to the css file to be shared across tools.

Options
    • -0
    • +9
    ./web/css/chart.css
Monday 29 May 2017
9:14 am

erniegx <ernieg@gmail.com>

LDEV-4054: Updating Greek

Options
    • -3
    • +6
    ./conf/language/lams/ApplicationResources_el_GR.properties
9:13 am

erniegx <ernieg@gmail.com>

LDEV-4341: adding labels from i18n

Options
    • -3
    • +8
    ./conf/language/lams/ApplicationResources.properties
    • -5
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
Wednesday 24 May 2017
1:42 pm

Marcin Cieslak

LDEV-4332: Send websocket ping after 3 minutes of idleness so the connection does not get cut because of idle timeout.

Options
    • -4
    • +28
    ./web/WEB-INF/tags/Page.tag
  2. … 39 more files in changeset.
12:17 am

Andrey Balan

LDEV-4348 Stop marking users that haven't completed the lesson as finished when syncing marks

Options
    • -31
    • +22
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
Wednesday 17 May 2017
9:17 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-2999 Include a rating option for reviewed resources (authored only). To make the grouped rating of authored resources work properly, session id was added to the rating and rating comments tables and all code using the shared jRating script and shared ratings updated to store the session code. DB script updates existing rating, rating comment records.

Options
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/web/RatingServlet.java
    • -37
    • +49
    ./web/includes/javascript/rating.js
  3. … 13 more files in changeset.
4:58 am

Andrey Balan

LDEV-4342 Prevent disappearing of dialogs on subsequent opening of them

Options
    • -0
    • +12
    ./web/includes/javascript/dialog.js
Tuesday 16 May 2017
4:09 am

Andrey Balan

LDEV-4341 1) Add advanced settings that will contain Save button 2) If there are *no* course groupings - jump directly to the create groups page

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +7
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -3
    • +10
    ./web/css/orgGroup.css
    • -0
    • +5
    ./web/includes/javascript/orgGroup.js
    • -9
    • +15
    ./web/orgGroup.jsp
2:10 am

Andrey Balan

LDEV-4339 Prevent exception on adding course grouping with non-unique name * Also added a few enhancements like support for saving groupings on pressing Enter key and hiding warning once it's fixed rather than after pressing Save button

Options
    • -15
    • +2
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -2
    • +35
    ./web/includes/javascript/orgGroup.js
    • -4
    • +11
    ./web/orgGroup.jsp
Saturday 13 May 2017
2:29 pm

Marcin Cieslak

LDEV-4332: Refresh page or reconnect websocket only on abnormal close and not on navigation.

Options
    • -4
    • +6
    ./web/WEB-INF/tags/Page.tag
  2. … 35 more files in changeset.
1:55 pm

Marcin Cieslak

LDEV-4255, LDEV-4256: Remove unnecessary "debugger" directive

Options
    • -2
    • +0
    ./web/includes/javascript/openUrls.js