lams-github

lams_tool_larsrc

Clone Tools

Stats

Commits this week: 0
Total Committers: 25
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 25 Jun 2018
5:13 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4603 Delete preview lessons with ratings now works

Options
    • -1
    • +1
    ./web/pages/learning/learning.jsp
  2. … 3 more files in changeset.
Tuesday 05 Jun 2018
2:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4591 Show only the finished button when no instructions exist

Options
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
2:23 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4591 Show only the finished button when no instructions exist

Options
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +3
    ./web/pages/itemreview/instructionsnav.jsp
Tuesday 22 May 2018
9:04 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

Options
    • -7
    • +7
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 48 more files in changeset.
Monday 21 May 2018
1:03 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 38 more files in changeset.
Wednesday 09 May 2018
7:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -1
    • +6
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +22
    ./web/WEB-INF/tags/CommentsAuthor.tag
  3. … 91 more files in changeset.
Thursday 03 May 2018
1:26 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Rename dbupdate files as name is a month out.

Options
    • -0
    • +16
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180425.sql
    • -16
    • +0
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180525.sql
  3. … 38 more files in changeset.
Monday 30 Apr 2018
6:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4558 Expand DB Fields to support pictures pasted in CKEditor

Options
    • -0
    • +16
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.
Saturday 21 Apr 2018
12:33 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/web/SessionListener.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -7
    • +38
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
  3. … 19 more files in changeset.
Tuesday 10 Apr 2018
4:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4543 Can access resources from monitor with no sessions

Options
    • -0
    • +16
    ./.externalToolBuilders/SASS_lams_tool_larsrc.launch
    • -0
    • +1
    ./.gitignore
    • -0
    • +9
    ./.project
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -7
    • +38
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
    • -0
    • +27
    ./web/css/monitor.scss
    • -22
    • +26
    ./web/pages/monitoring/summary.jsp
Monday 09 Apr 2018
3:46 pm

Marcin Cieslak

LDEV-4540 Introduce hooks in command websockets

When a command is added, the JSON can contain "hookTrigger" and

"hookParams" attributes.

hookTrigger is just a string which uniquely identifies a page. If this

page set the same commandWebsocketHookTrigger, then command is consumed

and function defined on this page as commandWebsocketHook is run with

parameters taken from hookParams from JSON.

This way back end can tell exact page on front end to run any code it

defines itself.

Options
    • -0
    • +8
    ./web/WEB-INF/tags/Page.tag
  2. … 35 more files in changeset.
Friday 06 Apr 2018
4:15 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 Updating labels

Updating Greek

Options
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 5 more files in changeset.
Tuesday 03 Apr 2018
2:21 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 Updating labels

Updating mainly Norwegian with a dash of Español

Options
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 8 more files in changeset.
Monday 02 Apr 2018
5:17 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

Options
    • -5
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +8
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +15
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 52 more files in changeset.
Friday 23 Mar 2018
7:12 pm

Marcin Cieslak

Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

Options
    • -7
    • +18
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -3
    • +36
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
  3. … 82 more files in changeset.
Thursday 22 Mar 2018
6:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -8
    • +17
    ./web/error.jsp
  2. … 34 more files in changeset.
Monday 05 Mar 2018
1:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4522 Emojis not displaying correctly in monitoring

Also fixed some general escaping issues found while testing.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
  2. … 34 more files in changeset.
Thursday 22 Feb 2018
2:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 All Audit Log entries are now Log Event entries

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -7
    • +14
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
    • -6
    • +6
    ./web/pages/monitoring/summary.jsp
  7. … 60 more files in changeset.
Friday 16 Feb 2018
5:02 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4503 All http resources on a https server open in a popup

Options
    • -4
    • +0
    ./src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
    • -56
    • +0
    ./src/java/org/lamsfoundation/lams/tool/rsrc/util/ResourceWebUtils.java
    • -11
    • +29
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
Thursday 15 Feb 2018
4:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4514 Greek names appear in notification window correctly.

Also added some HTML escaping to the display of the leader's name

in tool messages.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/LeaderDisplay.tag
  2. … 33 more files in changeset.
Wednesday 07 Feb 2018
10:28 am

Marcin Cieslak

LDEV-4509 Allow zipped websites in Share Resources

Apparently on Windows zip file type is described differently than on

Unix.

Options
    • -1
    • +1
    ./web/pages/authoring/parts/addlearningobject.jsp
    • -3
    • +3
    ./web/pages/authoring/parts/addwebsite.jsp
Tuesday 06 Feb 2018
5:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4501 Tool context files no longer reference audit service.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
  2. … 62 more files in changeset.
Thursday 01 Feb 2018
10:41 pm

Andrey Balan

LDEV-4407 Tools to stop using learnerService

There is no need to have a separate ILearnerService designed

for tools only. As long as they require only one method from it

completeToolSession() which we can simply move to

ILamsToolService. After which we just remove learnerService

from the tools.

Options
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
    • -8
    • +1
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
  3. … 57 more files in changeset.
Friday 26 Jan 2018
2:09 pm

Andrey Balan

LDEV-4407 Tools and core to use learning classes from lams_common

Tools and core start using shared learning classes that were

recently moved from lams_learning to lams_common.

Remove any leftover dependencies on lams_learning.

Options
    • -1
    • +0
    ./.classpath
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
  3. … 77 more files in changeset.
12:24 am

Andrey Balan

LDEV-4407 Tools to use contentrepository classes from lams_common

Tools start using shared contentrepository classes that were

recently moved to lams_common from lams_contentrepository.

Remove any leftover dependencies on lams_contentrepository. Which

includes getting rid of getRepositoryLoginTicket() and some other

methods from tools services.

Options
    • -1
    • +0
    ./.classpath
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml
    • -12
    • +5
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java
    • -95
    • +2
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java
  6. … 73 more files in changeset.
Wednesday 24 Jan 2018
1:52 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4502: Google content shows in popup window

Options
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20180123.sql
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
Thursday 18 Jan 2018
6:51 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4413 Share Resources no longer requires a title

Options
    • -16
    • +0
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
  2. … 4 more files in changeset.
Friday 05 Jan 2018
3:27 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -0
    • +8
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.hbm.xml
    • -1
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dto/ResourceItemDTO.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dto/SessionDTO.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java
    • -0
    • +31
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ViewItemAction.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourceItemForm.java
    • -0
    • +5
    ./web/WEB-INF/struts-config.xml
    • -1
    • +27
    ./web/WEB-INF/tags/Comments.tag
    • -3
    • +2
    ./web/pages/authoring/parts/addfile.jsp
    • -3
    • +1
    ./web/pages/authoring/parts/addlearningobject.jsp
  16. … 51 more files in changeset.
3:26 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4421 Comments allowed for authored items in Share Resources

Options
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20171220.sql
    • -0
    • +7
    ./web/pages/authoring/parts/ratings.jsp
    • -0
    • +31
    ./web/pages/monitoring/comments.jsp
  4. … 1 more file in changeset.
Tuesday 19 Dec 2017
1:47 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/conf/domain.xml

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java
  2. … 45 more files in changeset.