lams-github

lams_learning

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
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
Tuesday 25 Jul 2017
1:05 am

Marcin Cieslak

LDEV-4366 Introduce rubrics to Kumalive

Options
    • -3
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml
    • -0
    • +28
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveRubric.hbm.xml
    • -0
    • +26
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumaliveScore.hbm.xml
    • -1
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +102
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java
    • -56
    • +118
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -12
    • +9
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java
    • -0
    • +88
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java
    • -0
    • +78
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java
    • -0
    • +44
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -0
    • +142
    ./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -4
    • +24
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -7
    • +0
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
  16. … 15 more files 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
    • -2
    • +2
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +12
    ./web/WEB-INF/tlds/lams/lams.tld
    • -78
    • +0
    ./web/css/nprogress.scss
    • -4
    • +0
    ./web/css/presence.scss
    • -1
    • +1
    ./web/grouping/show.jsp
    • -1
    • +0
    ./web/includes/javascript/nprogress.js
    • -1
    • +1
    ./web/includes/javascript/presence.js
    • -4
    • +4
    ./web/loadToolActivity.jsp
    • -1
    • +0
    ./web/presenceChat.jsp
  10. … 148 more files in changeset.
Tuesday 18 Jul 2017
2:01 pm

Marcin Cieslak

LDEV-4366 Send ping every few idle minutes

Options
    • -1
    • +34
    ./web/includes/javascript/kumalive.js
12:56 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4383: Gates title are not displayed to learners

Forgot to remove c tag from file

Options
    • -1
    • +0
    ./web/gate/permissionGateContent.jsp
12:54 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4383: Gates title are not displayed to learners

Adding gates description to a separate jsp and then include it to all gate types

Options
    • -4
    • +4
    ./web/gate/conditionGateContent.jsp
    • -0
    • +15
    ./web/gate/gateDescription.jsp
    • -3
    • +3
    ./web/gate/permissionGateContent.jsp
    • -4
    • +2
    ./web/gate/scheduleGateContent.jsp
    • -3
    • +1
    ./web/gate/synchGateContent.jsp
Wednesday 12 Jul 2017
1:11 pm

Marcin Cieslak

LDEV-4366 Make icons smaller on small devices

Options
    • -37
    • +80
    ./web/css/kumalive.scss
    • -6
    • +6
    ./web/includes/javascript/kumalive.js
12:25 pm

Marcin Cieslak

LDEV-4366 Fix checking if current user raised hand

Options
    • -4
    • +5
    ./web/includes/javascript/kumalive.js
Tuesday 11 Jul 2017
6:37 pm

Marcin Cieslak

LDEV-4366 Make Kumalive responsive and SASSy

Options
    • -0
    • +166
    ./web/css/kumalive.scss
    • -10
    • +10
    ./web/includes/javascript/kumalive.js
    • -17
    • +16
    ./web/kumalive.jsp
  4. … 1 more file in changeset.
5:41 pm

Marcin Cieslak

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

Options
    • -162
    • +0
    ./web/css/kumalive.css
11:36 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels i18n

Mainly Norwegian, Greek and English

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -37
    • +19
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 49 more files in changeset.
Monday 10 Jul 2017
6:53 pm

Marcin Cieslak

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

Options
    • -2
    • +2
    ./web/includes/javascript/kumalive.js
  2. … 4 more files in changeset.
6:17 pm

Marcin Cieslak

LDEV-4366 Allow multiple score per learner per Kumalive

Fix showing user login as a div title for teachers.

Options
    • -7
    • +1
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml
    • -13
    • +20
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -12
    • +2
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java
    • -4
    • +1
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -1
    • +1
    ./web/includes/javascript/kumalive.js
  8. … 2 more files in changeset.
12:45 pm

Marcin Cieslak

LDEV-4366 Show "Finish speaking" button only to teachers

Options
    • -2
    • +4
    ./web/includes/javascript/kumalive.js
10:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -0
    • +1
    ./.gitignore
    • -4
    • +0
    ./web/css/main.css
    • -63
    • +0
    ./web/css/nprogress.css
    • -75
    • +0
    ./web/css/presence.css
  5. … 39 more files in changeset.
Thursday 06 Jul 2017
5:48 pm

Marcin Cieslak

LDEV-4366 Add a working version of Kumalive

Options
    • -1
    • +22
    ./conf/language/lams/ApplicationResources.properties
    • -44
    • +310
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -5
    • +39
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -7
    • +83
    ./web/css/kumalive.css
    • -100
    • +497
    ./web/includes/javascript/kumalive.js
    • -12
    • +49
    ./web/kumalive.jsp
  12. … 4 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_learning.launch
    • -1
    • +2
    ./.gitignore
    • -0
    • +9
    ./.project
    • -147
    • +2
    ./web/css/main.css
    • -27
    • +16
    ./web/css/nprogress.css
    • -0
    • +78
    ./web/css/nprogress.scss
    • -65
    • +46
    ./web/css/presence.css
    • -0
    • +96
    ./web/css/presence.scss
  9. … 151 more files in changeset.
Wednesday 28 Jun 2017
11:58 am

Marcin Cieslak

LDEV-4366 Prototype Kumalive front and back ends

Options
    • -0
    • +4
    ./build.xml
    • -3
    • +3
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +222
    ./src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -12
    • +32
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -0
    • +86
    ./web/css/kumalive.css
    • -0
    • +169
    ./web/includes/javascript/kumalive.js
    • -0
    • +58
    ./web/kumalive.jsp
  12. … 8 more files in changeset.
Sunday 25 Jun 2017
12:03 am

Marcin Cieslak

LDEV-4366 Add database and Hibernate layer for Kumalive.

Options
    • -0
    • +34
    ./conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/Kumalive.hbm.xml
    • -0
    • +29
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -0
    • +32
    ./src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +95
    ./src/java/org/lamsfoundation/lams/learning/kumalive/model/Kumalive.java
  5. … 1 more file in changeset.
Tuesday 13 Jun 2017
1:03 pm

Marcin Cieslak

After migration clean up

Options
    • -2
    • +0
    ./.cvsignore
    • -0
    • +2
    ./.gitignore
    • -2
    • +0
    ./web/.cvsignore
  4. … 312 more files in changeset.
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
    • -28
    • +51
    ./web/WEB-INF/tags/Page.tag
    • -53
    • +87
    ./web/includes/javascript/presence.js
  3. … 38 more files in changeset.
12:08 pm

Marcin Cieslak

LDEV-4252: Use another collection type instead of synchronisation.

Options
    • -43
    • +38
    ./src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
Tuesday 23 May 2017
6:38 pm

Andrey Balan

LDEV-4346 Log LessonMarkPushedToIntegrations event even in cases when BB lesson's Gradecenter option is turned OFF

Options
    • -1
    • +1
    ./web/lessonComplete.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
    • +7
    ./web/WEB-INF/tags/Page.tag
  2. … 35 more files in changeset.
1:27 am

Andrey Balan

LDEV-4343 Remove obsolete "style" attribute from CssTag

Options
    • -9
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
  2. … 56 more files in changeset.
Friday 05 May 2017
4:03 am

Andrey Balan

LDEV-4335 Change the address bar color in Android's Chrome

Options
    • -0
    • +1
    ./web/WEB-INF/tags/Head.tag
  2. … 31 more files in changeset.
Thursday 04 May 2017
9:33 pm

Marcin Cieslak

LDEV-4332: Refresh page when a tool websocket gets closed. Re-init Command websocket when it gets closed. Rename websockets in JS code to ensure name uniqueness within the page.

Options
    • -0
    • +6
    ./web/WEB-INF/tags/Page.tag
  2. … 36 more files in changeset.
Thursday 27 Apr 2017
12:40 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-2999: Allow learner to change their rating (when using the tag entry) and tweaking how the retry configuration is set up on initialisation.

Options
    • -1
    • +6
    ./web/WEB-INF/tags/Rating.tag
  2. … 8 more files in changeset.
Thursday 13 Apr 2017
12:48 pm

erniegx <ernieg@gmail.com>

LDEV-4054: Updating Greek, Spanish

Options
    • -36
    • +18
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_es_ES.properties
Wednesday 12 Apr 2017
2:02 am

Andrey Balan

LDEV-4312 Handle unsuccessful mark submission to integrated servers

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -0
    • +81
    ./src/java/org/lamsfoundation/lams/learning/web/LogLessonMarkPushedToIntegrationsServlet.java
    • -0
    • +13
    ./web/WEB-INF/web.xml
    • -15
    • +29
    ./web/lessonComplete.jsp
  5. … 3 more files in changeset.
Monday 10 Apr 2017
2:40 pm

Marcin Cieslak

LDEV-4175: Remove unncessary synchronisations and commented out code.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 1 more file in changeset.