lams-github

lams_tool_forum

Clone Tools

Stats

Commits this week: 0
Total Committers: 29
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 17 Aug 2018
1:19 pm

Marcin Cieslak

Merge from master to include x-editable

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
  2. … 5 more files in changeset.
Thursday 16 Aug 2018
10:49 pm

Marcin Cieslak

LDEV-4644 Add outcomes in authoring in all tools

Options
    • -1
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +155
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +2
    ./web/jsps/authoring/advance.jsp
  5. … 115 more files in changeset.
Monday 13 Aug 2018
2:35 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

English, Spanish and Greek.

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -10
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  5. … 16 more files in changeset.
Friday 10 Aug 2018
12:42 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Fixed learning

Options
    • -22
    • +19
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
    • -5
    • +5
    ./web/jsps/learning/edit.jsp
    • -2
    • +2
    ./web/jsps/learning/message/bodyarea.jsp
    • -1
    • +1
    ./web/jsps/learning/message/topicform.jsp
    • -4
    • +4
    ./web/jsps/learning/reply.jsp
Thursday 09 Aug 2018
6:08 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Fixed authoring - changed way of setting content type, fixed monitoring - correct paths at update marks

Options
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
    • -9
    • +11
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java
    • -1
    • +1
    ./web/jsps/learning/message/topiceditform.jsp
    • -1
    • +1
    ./web/jsps/learning/message/topicreplyform.jsp
    • -1
    • +1
    ./web/jsps/monitoring/statisticpart.jsp
    • -2
    • +1
    ./web/jsps/monitoring/updatemarks.jsp
Wednesday 08 Aug 2018
11:34 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Marks at monitoring fixed

Options
    • -1
    • +0
    ./web/jsps/learning/reply.jsp
    • -1
    • +1
    ./web/jsps/monitoring/updatemarks.jsp
9:58 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 monitoring migration in progress

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
    • -1
    • +1
    ./web/jsps/authoring/message/create.jsp
    • -3
    • +3
    ./web/jsps/authoring/parts/msgattachment.jsp
    • -1
    • +1
    ./web/jsps/learning/message/topicform.jsp
    • -1
    • +1
    ./web/jsps/learning/message/topicreplyform.jsp
    • -1
    • +1
    ./web/jsps/monitoring/statisticpart.jsp
    • -61
    • +83
    ./web/jsps/monitoring/updatemarks.jsp
    • -101
    • +124
    ./web/jsps/monitoring/viewmarks.jsp
4:04 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Forum - changes at monitoring, new way to download marks, added spring's errors

Options
    • -1
    • +1
    ./.classpath
    • -15
    • +15
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java
    • -9
    • +6
    ./src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
    • -1
    • +1
    ./web/jsps/authoring/message/edit.jsp
    • -1
    • +1
    ./web/jsps/authoring/pedagogicalPlannerForm.jsp
    • -1
    • +1
    ./web/jsps/learning/message/bodyarea.jsp
    • -1
    • +1
    ./web/jsps/learning/message/topiceditform.jsp
    • -2
    • +2
    ./web/jsps/learning/message/topicform.jsp
    • -2
    • +2
    ./web/jsps/learning/message/topicreplyform.jsp
    • -1
    • +1
    ./web/jsps/learning/notebook.jsp
    • -1
    • +1
    ./web/jsps/learning/reply.jsp
    • -0
    • +9
    ./web/jsps/monitoring/editactivity.jsp
    • -5
    • +14
    ./web/jsps/monitoring/summary.jsp
4:43 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Forum migration in progress

Options
    • -20
    • +20
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
    • -4
    • +3
    ./src/java/org/lamsfoundation/lams/tool/forum/web/forms/MessageForm.java
    • -3
    • +3
    ./web/jsps/authoring/basic.jsp
    • -8
    • +8
    ./web/jsps/authoring/message/create.jsp
    • -6
    • +6
    ./web/jsps/authoring/message/edit.jsp
    • -1
    • +1
    ./web/jsps/authoring/parts/msgattachment.jsp
    • -2
    • +2
    ./web/jsps/learning/edit.jsp
    • -8
    • +6
    ./web/jsps/learning/message/bodyarea.jsp
Tuesday 07 Aug 2018
7:15 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Authoring and learning in progress

Options
    • -0
    • +43
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
    • -3
    • +3
    ./web/jsps/authoring/addCondition.jsp
    • -3
    • +3
    ./web/jsps/authoring/basic.jsp
    • -2
    • +2
    ./web/jsps/authoring/conditions.jsp
    • -1
    • +1
    ./web/jsps/authoring/message/topiclist.jsp
    • -2
    • +3
    ./web/jsps/learning/message/bodyarea.jsp
    • -3
    • +3
    ./web/jsps/learning/notebook.jsp
    • -1
    • +1
    ./web/jsps/learning/reply.jsp
    • -1
    • +1
    ./web/jsps/learning/viewforum.jsp
    • -2
    • +4
    ./web/jsps/learning/viewtopic.jsp
    • -1
    • +10
    ./web/jsps/monitoring/viewactivity.jsp
3:03 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of Forum started - controllers, no tiles and no struts

Options
    • -13
    • +19
    ./.externalToolBuilders/SASS_lams_tool_forum.launch
    • -0
    • +23
    ./src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20180806.sql
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
    • -90
    • +0
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/AdminAction.java
    • -1001
    • +0
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
    • -477
    • +0
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringConditionAction.java
    • -48
    • +0
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java
    • -1290
    • +0
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
    • -909
    • +0
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
    • -0
    • +69
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/AdminController.java
    • -0
    • +384
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringConditionController.java
    • -0
    • +958
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/AuthoringController.java
    • -0
    • +68
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/ClearSessionController.java
    • -0
    • +1125
    ./src/java/org/lamsfoundation/lams/tool/forum/web/controller/LearningController.java
  16. … 71 more files in changeset.
Wednesday 18 Jul 2018
9:02 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_build/conf/j2ee/jboss-deployment-structure.xml

lams_build/lib/lams/lams.jar

lams_build/liblist.txt

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

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

Options
    • -35
    • +40
    ./src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -119
    • +20
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
    • -99
    • +20
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
  4. … 24 more files in changeset.
Saturday 07 Jul 2018
10:17 pm

Andrey Balan

LDEV-4621 Release marks auto pushes marks to gradebook now

* Release marks needs to be a "state" within the tool rather than

something that is transient. If this option is marks are already

released, then marks entered in Forum monitor should be auto pushed to

monitor and disclosed to students via forum learner.

* Also once you release marks you should not be able to unrelease them.

* Log mark released event

Options
    • -8
    • +0
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.hbm.xml
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20180707.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java
    • -4
    • +16
    ./src/java/org/lamsfoundation/lams/tool/forum/dto/SessionDTO.java
    • -21
    • +0
    ./src/java/org/lamsfoundation/lams/tool/forum/persistence/ForumReport.java
    • -35
    • +40
    ./src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
    • -100
    • +20
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
    • -21
    • +39
    ./web/jsps/monitoring/summary.jsp
    • -37
    • +43
    ./web/jsps/monitoring/viewmarks.jsp
10:15 pm

Andrey Balan

LDEV-4621 Minor code formatting

Options
    • -4
    • +0
    ./src/java/org/lamsfoundation/lams/tool/forum/persistence/Message.java
    • -119
    • +20
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
    • -21
    • +16
    ./web/jsps/learning/message/msgviewwrapper.jsp
    • -2
    • +1
    ./web/jsps/learning/message/topicview.jsp
    • -18
    • +16
    ./web/jsps/learning/viewtopic.jsp
Monday 25 Jun 2018
11:13 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4603 Delete preview lessons with ratings now works

Options
    • -0
    • +20
    ./src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20180625.sql
  2. … 3 more files in changeset.
Sunday 24 Jun 2018
8:41 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.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/web/action/McMonitoringAction.java

lams_tool_mindmap/.classpath

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

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
  2. … 23 more files in changeset.
Friday 25 May 2018
12:03 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4590 Rating stars left can never be more than 5 stars

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
  2. … 3 more files in changeset.
Tuesday 22 May 2018
3:04 pm

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
    • -16
    • +8
    ./conf/language/lams/ApplicationResources.properties
    • -16
    • +8
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -22
    • +14
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 46 more files in changeset.
Monday 21 May 2018
11:10 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 25 more files in changeset.
7:03 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: updating labels

Mainly Spanish and a little bit of Greek and Norwegian

Options
    • -14
    • +18
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_no_NO.properties
  3. … 37 more files in changeset.
Friday 18 May 2018
6:43 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

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

lams_build/lib/lams/lams.jar

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

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

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

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.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_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

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

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

Options
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
  2. … 22 more files in changeset.
Thursday 10 May 2018
2:56 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating missing labels and Greek

Options
    • -6
    • +8
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
  4. … 13 more files in changeset.
Wednesday 09 May 2018
1:59 pm

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.
Tuesday 08 May 2018
7:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Students can post anonymously in Forum

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
    • -0
    • +6
    ./web/jsps/authoring/advance.jsp
    • -4
    • +31
    ./web/jsps/learning/message/bodyarea.jsp
    • -10
    • +35
    ./web/jsps/learning/message/msgview.jsp
    • -5
    • +34
    ./web/jsps/learning/message/topiclist.jsp
    • -1
    • +19
    ./web/jsps/monitoring/parts/advanceOptions.jsp
  9. … 1 more file in changeset.
Thursday 03 May 2018
7:26 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20180425.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20180525.sql
  3. … 38 more files in changeset.
Monday 30 Apr 2018
12:40 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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

Options
    • -0
    • +17
    ./src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.
Monday 09 Apr 2018
9: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.
Monday 02 Apr 2018
11:17 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054 updating labels

Updating labels in bulk mainly English, Greek and Norwegian

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 56 more files in changeset.
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
    ./src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -4
    • +8
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
  4. … 81 more files in changeset.
Thursday 22 Mar 2018
1:55 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4533 Exception details are hidden as per system config

Options
    • -7
    • +15
    ./web/error.jsp
  2. … 34 more files in changeset.