lams-github

lams_tool_scratchie

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
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
Friday 28 Jul 2017
11:30 pm

Andrey Balan

LDEV-4032 Handle hiding of a Finish button for non-leaders properly

Finish button should be hidden from non-leader in case leader hasn't yet

submitted Notebook or burning questions.

Options
    • -1
    • +1
    ./web/pages/learning/questionlist.jsp
11:29 pm

Andrey Balan

LDEV-4032 Handle hiding of a Finish button for non-leaders properly

Finish button should be hidden from non-leader in case leader hasn't yet

submitted Notebook or burning questions

Options
    • -1
    • +1
    ./web/pages/learning/questionlist.jsp
12:21 pm

Marcin Cieslak

LDEV-4394 Do not show Finish button until Scratchie Leader finished the tool completely

This includes answering to burning questions.

Options
    • -30
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -7
    • +0
    ./web/pages/learning/questionlist.jsp
9:53 am

Marcin Cieslak

LDEV-4394 Make page reload and websocket close requests cross-node

Some requests have been sent only to websockets on current node. Now

they are detected in DB and run on all nodes.

Options
    • -12
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java
    • -17
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -10
    • +34
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -0
    • +1
    ./web/pages/learning/questionlist.jsp
  5. … 8 more files in changeset.
Thursday 27 Jul 2017
12: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
    • -12
    • +11
    ./web/pages/learning/questionlist.jsp
  3. … 36 more files in changeset.
Tuesday 25 Jul 2017
2: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
    • +7
    ./web/pages/learning/questionlist.jsp
  3. … 36 more files in changeset.
Thursday 20 Jul 2017
10:29 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4352: adding missing labels

Alright, these should be all now for this JIRA

Options
    • -8
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +9
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 2 more files in changeset.
Wednesday 19 Jul 2017
12: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
    • -1
    • +1
    ./web/pages/monitoring/monitoring.jsp
  4. … 154 more files in changeset.
Tuesday 11 Jul 2017
5:36 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels i18n

Mainly Norwegian, Greek and English

Options
    • -15
    • +29
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 52 more files in changeset.
Monday 10 Jul 2017
4: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
    • -29
    • +0
    ./web/includes/css/scratchie-learning.css
    • -10
    • +0
    ./web/includes/css/scratchie.css
  4. … 40 more files in changeset.
Saturday 01 Jul 2017
5: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_tool_scratchie.launch
    • -1
    • +2
    ./.gitignore
    • -0
    • +9
    ./.project
    • -1
    • +4
    ./build.properties
    • -50
    • +29
    ./web/includes/css/scratchie-learning.css
    • -0
    • +37
    ./web/includes/css/scratchie-learning.scss
    • -39
    • +8
    ./web/includes/css/scratchie.css
    • -0
    • +14
    ./web/includes/css/scratchie.scss
    • -3
    • +0
    ./web/pages/authoring/parts/additem.jsp
  10. … 150 more files in changeset.
Tuesday 13 Jun 2017
7:03 am

Marcin Cieslak

After migration clean up

Options
    • -2
    • +0
    ./.cvsignore
    • -0
    • +2
    ./.gitignore
    • -1
    • +0
    ./web/includes/images/.cvsignore
  4. … 312 more files in changeset.
Friday 09 Jun 2017
5:44 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4352: Adding mark charts to Monitoring for Scratchie and MCQ.

Options
    • -1
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -0
    • +41
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -0
    • +82
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/LeaderResultsDTO.java
    • -0
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +21
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +58
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
    • -0
    • +10
    ./web/WEB-INF/struts-config.xml
    • -2
    • +23
    ./web/pages/monitoring/monitoring.jsp
    • -0
    • +69
    ./web/pages/monitoring/parts/statisticpart.jsp
    • -59
    • +4
    ./web/pages/monitoring/statistic.jsp
Wednesday 24 May 2017
7:42 am

Marcin Cieslak

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

Options
    • -9
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -5
    • +28
    ./web/WEB-INF/tags/Page.tag
    • -7
    • +30
    ./web/pages/learning/questionlist.jsp
  4. … 37 more files in changeset.
Saturday 20 May 2017
5:03 am

Marcin Cieslak

LDEV-4332: Allow ping message from websocket.

Options
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
Saturday 13 May 2017
8:29 am

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
    • +5
    ./web/pages/learning/questionlist.jsp
  3. … 34 more files in changeset.
Friday 12 May 2017
7:27 pm

Andrey Balan

LDEV-4343 Remove obsolete "style" attribute from CssTag

Options
    • -9
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
    • -6
    • +3
    ./web/pages/authoring/pedagogicalPlannerForm.jsp
  3. … 55 more files in changeset.
Thursday 04 May 2017
10:03 pm

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.
3: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
    • -17
    • +23
    ./web/WEB-INF/tags/Page.tag
    • -2
    • +5
    ./web/pages/learning/questionlist.jsp
  3. … 35 more files in changeset.
3:31 pm

Marcin Cieslak

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

Options
    • -33
    • +21
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
  2. … 3 more files in changeset.
Thursday 27 Apr 2017
1:33 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. … 20 more files in changeset.
Thursday 20 Apr 2017
4:38 pm

Andrey Balan

LDEV-4322 Fix report by question layout issues

Options
    • -39
    • +48
    ./web/pages/monitoring/parts/itemSummary.jsp
    • -1
    • +0
    ./web/pages/monitoring/summary.jsp
Wednesday 19 Apr 2017
11:44 pm

Andrey Balan

LDEV-4319 Prevent disappearing of scratchie likes on sorting

Options
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -21
    • +27
    ./web/pages/learning/results.jsp
8:33 pm

Andrey Balan

LDEV-4318 Wrap properly burning question text. Also align number count to the right in monitor

Options
    • -1
    • +3
    ./web/pages/learning/results.jsp
    • -3
    • +10
    ./web/pages/monitoring/summary.jsp
Thursday 13 Apr 2017
7:03 am

erniegx <ernieg@gmail.com>

LDEV-4054: Updating Greek

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 18 more files in changeset.
Friday 07 Apr 2017
4:26 pm

Andrey Balan

LDEV-4286 * Edit Activity in monitoring page to be opened in a popup page * Move "Edit activity" buttons to the right

Options
    • -1
    • +1
    ./web/pages/monitoring/editactivity.jsp
  2. … 29 more files in changeset.
Tuesday 04 Apr 2017
2:27 pm

Andrey Balan

LDEV-4300 Audit logs when activity is modified in monitor

Options
    • -0
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
  4. … 86 more files in changeset.
Thursday 30 Mar 2017
8:31 pm

Andrey Balan

LDEV-4291 Move getAccessMode method to WebUtil

Options
    • -26
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
  2. … 30 more files in changeset.
Friday 24 Mar 2017
1: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.
Wednesday 15 Mar 2017
8:35 am

Marcin Cieslak

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

Options
    • -0
    • +10
    ./web/WEB-INF/web.xml
  2. … 34 more files in changeset.