lams-github / lams_tool_forum / src

java

Clone Tools

Stats

Commits this week: 0
Total Committers: 24
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
Saturday 24 Mar 2018
2:12 am

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
    • -9
    • +13
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -4
    • +8
    ./org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
  4. … 81 more files in changeset.
Monday 05 Mar 2018
8: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
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
  2. … 34 more files in changeset.
6:40 pm

Marcin Cieslak

LDEV-4523 Tools remove mark rather than clear it on user content delete

Options
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
  2. … 4 more files in changeset.
Thursday 22 Feb 2018
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -8
    • +12
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/forum/service/IForumService.java
    • -4
    • +8
    ./org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
  4. … 63 more files in changeset.
Tuesday 06 Feb 2018
12:17 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
  2. … 62 more files in changeset.
Saturday 03 Feb 2018
5:16 am

Andrey Balan

LDEV-4407 Other projects stop depending on lams_gradebook

* GradebookService interfaces are redefined now:

- IGradebookService is going to be used by core modules.

- IGradebookFullService is used inside of lams_gradebook only and

nowhere else, as it contains lams_gradebook's internal logic and

classes.

* Introduce CommonContants.java which contains for now common

constants that used to be located in GradebookConstants.java

* Tools stop using gradebookService directly, but rather through

ILamsToolService's method updateGradebookUserActivityMark()

* Move GradebookUserActivityArchive and GradebookUserLessonArchive

to lams_gradebook

Options
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
    • -12
    • +2
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
  3. … 55 more files in changeset.
Friday 02 Feb 2018
5:41 am

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
    ./org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
    • -12
    • +1
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
  3. … 57 more files in changeset.
Friday 26 Jan 2018
9: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
    • -3
    • +2
    ./org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
  2. … 78 more files in changeset.
7: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
    • -3
    • +0
    ./org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
    • -42
    • +0
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -2
    • +0
    ./org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java
  5. … 74 more files in changeset.
Tuesday 19 Dec 2017
8: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
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
  2. … 45 more files in changeset.
Thursday 02 Nov 2017
8:14 am

Andrey Balan

LDEV-4451 Implement ToolSessionManager.getConfidenceLevels() in all tools

This method allows Scratchie to query available confidence levels from

the tools that can provide it. Actually, only Assessment and MCQ will

implement it for real, all other tools will implements it as "return

null;".

Options
    • -0
    • +6
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
  2. … 28 more files in changeset.
Monday 09 Oct 2017
5:08 pm

Marcin Cieslak

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

Conflicts:

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.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/web/actions/LearningWebsocketServer.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.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/web/action/MonitoringAction.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/MonitoringAction.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
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -0
    • +6
    ./org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
  3. … 28 more files in changeset.
Wednesday 30 Aug 2017
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +3
    ./org/lamsfoundation/lams/tool/forum/persistence/IForumUserDAO.java
    • -1
    • +9
    ./org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumUserDao.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
    • -0
    • +6
    ./org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
  6. … 69 more files in changeset.
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

Options
    • -1
    • +3
    ./org/lamsfoundation/lams/tool/forum/persistence/IForumUserDAO.java
    • -1
    • +9
    ./org/lamsfoundation/lams/tool/forum/persistence/hibernate/ForumUserDao.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
    • -0
    • +6
    ./org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
  6. … 70 more files in changeset.
10:17 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4416 Validation for max rating and posts allows 0

The validation on the back end for the max ratings and max posts

in a thread was not allowing for the special 0 case. Also cleaned

up some javascript errors in monitoring.

Options
    • -12
    • +0
    ./org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
  2. … 1 more file in changeset.
Saturday 26 Aug 2017
4:04 pm

Marcin Cieslak

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

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -5
    • +5
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
  2. … 33 more files in changeset.
Friday 18 Aug 2017
3:46 am

Andrey Balan

LDEV-4407 Move lams_contentrepository exceptions to the proper package

lams_contentrepository's exception classes were moved to

contentrepository.exception package.

(To access exceptions' earlier history use Eclipse's Show in History

feature or run 'git log --follow ./path/to/file')

Options
    • -5
    • +5
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
  2. … 66 more files in changeset.
Thursday 10 Aug 2017
12:28 am

Marcin Cieslak

LDEV-4402 Substitute Gson and Apache JSON with Jackson

Jackson is a top JSON library shipped with WF10.

Apache JSON resides in an ancient library which we do not need for

anything else.

We use GSon only for serializing Java objects to JSON, which Jackson can

do too.

Options
    • -39
    • +38
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -35
    • +34
    ./org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
    • -14
    • +15
    ./org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
  4. … 133 more files in changeset.
Monday 31 Jul 2017
11:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Portrait tag and javascript to display portraits

A new tag and javascript file shows the user portraits in one of 4 sizes

and either square or round. If no portrait exists a generic coloured

user icon is used. Portraits shown in Forum and Noticeboard Comments.

Options
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
  2. … 53 more files in changeset.
Friday 07 Jul 2017
4:45 pm

Marcin Cieslak

LDEV-4371 Allow always keeping learner posts in Forum

Options
    • -0
    • +24
    ./org/lamsfoundation/lams/tool/forum/dbupdates/patch20170707.sql
    • -200
    • +200
    ./org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml
    • -0
    • +58
    ./org/lamsfoundation/lams/tool/forum/persistence/ForumConfigItem.java
    • -1594
    • +1613
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -464
    • +467
    ./org/lamsfoundation/lams/tool/forum/service/IForumService.java
    • -0
    • +90
    ./org/lamsfoundation/lams/tool/forum/web/actions/AdminAction.java
    • -0
    • +39
    ./org/lamsfoundation/lams/tool/forum/web/forms/AdminForm.java
  8. … 4 more files in changeset.
Wednesday 19 Apr 2017
3:43 pm

Marcin Cieslak

LDEV-3982: Bring back user-defined conditions which have been mistakenly removed. Fix Forum conditions saving.

Options
    • -13
    • +14
    ./org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java
  2. … 3 more files in changeset.
Tuesday 04 Apr 2017
8:27 pm

Andrey Balan

LDEV-4300 Audit logs when activity is modified in monitor

Options
    • -0
    • +5
    ./org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -0
    • +7
    ./org/lamsfoundation/lams/tool/forum/service/IForumService.java
    • -0
    • +3
    ./org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
  4. … 86 more files in changeset.
Friday 31 Mar 2017
2:31 am

Andrey Balan

LDEV-4291 Move getAccessMode method to WebUtil

Options
    • -20
    • +0
    ./org/lamsfoundation/lams/tool/forum/util/ForumWebUtils.java
    • -19
    • +2
    ./org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
  3. … 29 more files in changeset.
Tuesday 28 Mar 2017
1:28 am

Andrey Balan

LDEV-4286 Show authoring advanced tab on re-editing content from monitor

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
    • -41
    • +29
    ./org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
  3. … 11 more files in changeset.
Wednesday 08 Mar 2017
2:26 pm

Marcin Cieslak

LDEV-4261: Remove version properties from entities. Remove management of optimistic locking failures as they never happen.

Options
    • -0
    • +14
    ./org/lamsfoundation/lams/tool/forum/dbupdates/patch20170308.sql
    • -16
    • +1
    ./org/lamsfoundation/lams/tool/forum/persistence/ForumToolSession.java
  3. … 8 more files in changeset.
Monday 06 Mar 2017
9:25 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4248: Fixing the file delete. Had been broken when the screen was bootstrapped.

Options
    • -4
    • +3
    ./org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
  2. … 2 more files in changeset.
Monday 27 Feb 2017
10:00 pm

Marcin Cieslak

LDEV-4180: Make DB patches produce up-to-date structure during build instead of applying multiple patches. Get rid of unnecessary tables and keys. Modify boolean columns to tinyint(1) Simplify patches where possible.

Options
    • -0
    • +39
    ./org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101.sql
  2. … 223 more files in changeset.
6:11 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4237: Include label informing the max size file LDEV-4241: File upload validation LDEV-4240: Consistent upload widget Using new tags and the shared javascript code to create consistency across tools for the look and validation behaviour of file upload.

Options
    • -6
    • +0
    ./org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
  2. … 21 more files in changeset.
Monday 20 Feb 2017
9:11 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4237: Adding file size help text to authoring and learner new post, and updating the reply to use different formatting.

Options
    • -0
    • +6
    ./org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
    • -6
    • +7
    ./org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
  3. … 4 more files in changeset.
Monday 13 Feb 2017
3:48 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

LDEV-4218: Making the monitor entered messages a different colour. Fixed the marking screen so that it does not show the learner progress bar - had the wrong page type for the layout.

Options
    • -0
    • +14
    ./org/lamsfoundation/lams/tool/forum/dbupdates/patch20160213.sql
    • -0
    • +20
    ./org/lamsfoundation/lams/tool/forum/persistence/Message.java
    • -0
    • +8
    ./org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
  4. … 6 more files in changeset.