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
Monday 10 Jul 2017
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.
Monday 03 Apr 2017
3:28 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4290 Removed caching of progress bar messages as it makes the language first used stick for all users.

Options
    • -15
    • +11
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
Friday 24 Mar 2017
8:57 am

erniegx <ernieg@gmail.com>

LDEV-4285: change icon for restart lesson

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
2:58 am

Marcin Cieslak

LDEV-4288: Archive gradebook on lesson retry. Remove activity content on lesson retry.

Options
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java
    • -4
    • +13
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
  3. … 14 more files in changeset.
Monday 20 Mar 2017
5:18 pm

erniegx <ernieg@gmail.com>

LDEV-4283: Change the refreshing auto time from 5 mins to 1 min

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +2
    ./web/layout/groupWaitLayout.jsp
4:34 pm

Marcin Cieslak

LDEV-4284: Get a parameter value from form, not an object which is not present as request attribute anymore.

Options
    • -2
    • +2
    ./web/layout/groupWaitLayout.jsp
Friday 17 Mar 2017
12:57 pm

Marcin Cieslak

LDEV-4278: Put and get activity ID from form since it is not present in request anymore.

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java
    • -0
    • +1
    ./web/WEB-INF/struts-config.xml
    • -9
    • +5
    ./web/grouping/wait.jsp
Wednesday 15 Mar 2017
3:35 pm

Marcin Cieslak

LDEV-4272: Do not allow in LAMS any HTTP methods other than GET or POST.

Options
    • -0
    • +4
    ./web/WEB-INF/web.xml
  2. … 34 more files in changeset.
Tuesday 14 Mar 2017
9:56 pm

Marcin Cieslak

LDEV-4272: Check if learner progress belongs to the logged in user.

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
Tuesday 07 Mar 2017
6:05 pm

Marcin Cieslak

LDEV-4260: Make sure that lesson corresponds to the activity.

Options
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
Monday 06 Mar 2017
8:40 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4240: Consistent upload widget: making the button and file name area smaller.

Options
    • -2
    • +2
    ./web/WEB-INF/tags/FileUpload.tag
  2. … 31 more files in changeset.
Thursday 02 Mar 2017
6:36 pm

Marcin Cieslak

LDEV-4180: Remove obsolete properties.

Options
    • -1
    • +0
    ./build.properties
  2. … 6 more files in changeset.