lams-github

lams_tool_lamc

Clone Tools

Stats

Commits this week: 0
Total Committers: 27
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 10 Aug 2018
12:36 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 New paths at learning

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180724.sql
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -2
    • +2
    ./web/authoring/BasicContent.jsp
    • -1
    • +1
    ./web/authoring/pedagogicalPlannerForm.jsp
    • -1
    • +0
    ./web/learning/AnswersContent.jsp
    • -10
    • +8
    ./web/learning/ViewAnswers.jsp
Thursday 09 Aug 2018
6:09 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Changed way of setting content type

Options
    • -5
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -8
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
12:22 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 migration of multiple choice - learning, in progress

Options
    • -6
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -0
    • +1
    ./web/learning/AnswersContent.jsp
Wednesday 08 Aug 2018
8:24 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 changes at learning

Options
    • -2
    • +7
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -1
    • +1
    ./web/learning/AnswersContent.jsp
8:10 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 lamc update

Options
    • -57
    • +6
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -7
    • +7
    ./web/authoring/AuthoringTabsHolder.jsp
    • -4
    • +4
    ./web/authoring/BasicContent.jsp
    • -6
    • +6
    ./web/authoring/editQuestionBox.jsp
    • -8
    • +8
    ./web/learning/AnswersContent.jsp
    • -3
    • +2
    ./web/learning/Notebook.jsp
    • -3
    • +3
    ./web/learning/submissionDeadline.jsp
5:51 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Remove struts leftovers

Options
    • -3
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McApplicationException.java
    • -11
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java
    • -186
    • +0
    ./web/WEB-INF/tlds/lams/lams.tld
5:41 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 js changes at jsp files

Options
    • -8
    • +8
    ./web/authoring/AuthoringTabsHolder.jsp
    • -4
    • +4
    ./web/authoring/BasicContent.jsp
    • -15
    • +10
    ./web/authoring/editQuestionBox.jsp
Friday 03 Aug 2018
12:04 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of Multiple Choice in progress

Options
    • -1
    • +1
    ./.classpath
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -4
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/form/McLearningForm.java
    • -336
    • +0
    ./web/WEB-INF/struts-config.xml
    • -212
    • +0
    ./web/WEB-INF/tlds/struts/struts-bean-el.tld
    • -382
    • +0
    ./web/WEB-INF/tlds/struts/struts-bean.tld
    • -3302
    • +0
    ./web/WEB-INF/tlds/struts/struts-html-el.tld
    • -3302
    • +0
    ./web/WEB-INF/tlds/struts/struts-html.tld
    • -382
    • +0
    ./web/WEB-INF/tlds/struts/struts-logic-el.tld
    • -652
    • +0
    ./web/WEB-INF/tlds/struts/struts-logic.tld
    • -3171
    • +0
    ./web/WEB-INF/tlds/struts/struts-nested.tld
    • -343
    • +0
    ./web/WEB-INF/tlds/struts/struts-tiles-el.tld
    • -344
    • +0
    ./web/WEB-INF/tlds/struts/struts-tiles.tld
    • -41
    • +0
    ./web/WEB-INF/web.xml
  16. … 7 more files in changeset.
Wednesday 01 Aug 2018
10:51 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration of Chat - controllers, no tiles and no struts

Options
    • -1
    • +1
    ./web/monitoring/Edit.jsp
  2. … 68 more files in changeset.
Friday 27 Jul 2018
8:55 pm

Marcin Cieslak

Merge Asia's Image Gallery

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/web/form/McLearningForm.java
    • -21
    • +28
    ./src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
    • -5
    • +4
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +0
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -31
    • +30
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -9
    • +6
    ./web/WEB-INF/tags/CommentsAuthor.tag
    • -3
    • +4
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +0
    ./web/WEB-INF/tags/Rating.tag
    • -1
    • +0
    ./web/WEB-INF/tags/StyledRating.tag
    • -1
    • +0
    ./web/WEB-INF/tags/TabBody.tag
    • -1
    • +0
    ./web/WEB-INF/tags/TabBodyArea.tag
    • -52
    • +39
    ./web/WEB-INF/tags/TextSearch.tag
    • -23
    • +9
    ./web/WEB-INF/web.xml
    • -17
    • +16
    ./web/authoring/AdvancedContent.jsp
    • -9
    • +10
    ./web/authoring/AuthoringTabsHolder.jsp
  16. … 62 more files in changeset.
8:01 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Migration in progress

Options
    • -3
    • +4
    ./web/authoring/AuthoringTabsHolder.jsp
  2. … 17 more files in changeset.
Thursday 26 Jul 2018
12:19 am

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 fixed McController

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
Wednesday 25 Jul 2018
3:07 pm

Joanna Mielczarek <amielczarek.web@gmail.com>

LDEV-4440 Started migration of Multiple Choices

Options
    • -0
    • +23
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180724.sql
    • -44
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java
    • -766
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java
    • -775
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -262
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningStarterAction.java
    • -454
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -178
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringStarterAction.java
    • -181
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McPedagogicalPlannerAction.java
    • -123
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McStarterAction.java
    • -128
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/TblMonitoringAction.java
    • -0
    • +65
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/ClearSessionController.java
    • -0
    • +826
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java
    • -0
    • +851
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McLearningController.java
    • -0
    • +555
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java
    • -0
    • +183
    ./src/java/org/lamsfoundation/lams/tool/mc/web/controller/McPedagogicalPlannerController.java
  16. … 38 more files in changeset.
Saturday 21 Jul 2018
11:18 pm

Andrey Balan

LDEV-4493 Fix MCQ ped planner

Options
    • -2
    • +16
    ./src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java
    • -0
    • +1
    ./web/authoring/pedagogicalPlannerForm.jsp
Thursday 19 Jul 2018
3:17 pm

Marcin Cieslak

Merge to lams31 after a vital commit to master

Options
    • -16
    • +6
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
  2. … 4 more files in changeset.
12:52 am

Andrey Balan

LDEV-4634 Update response in case answer hasn't been changed

Otherwise we end up loosing new values for confidence level and attempt

time.

Options
    • -16
    • +6
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
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
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -2
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  3. … 22 more files in changeset.
Saturday 23 Jun 2018
1:28 am

Marcin Cieslak

LDEV-4607 Confirm delete marks on output change in monitoring

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +8
    ./web/monitoring/parts/statsPart.jsp
  3. … 2 more files in changeset.
12:42 am

Marcin Cieslak

LDEV-4607 Remove marks on output change to "none" in monitoring

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -32
    • +31
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -5
    • +0
    ./web/monitoring/parts/statsPart.jsp
    • -1
    • +1
    ./web/monitoring/parts/toolOutput.jsp
  5. … 8 more files in changeset.
Tuesday 05 Jun 2018
11:33 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4596: Letters should also display when reviewing questions

Small layout fix

Options
    • -1
    • +1
    ./web/learning/ViewAnswers.jsp
11:07 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4596 Prefix letters shown on results and in monitoring

Options
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +19
    ./web/learning/ViewAnswers.jsp
    • -1
    • +6
    ./web/monitoring/parts/advanceQuestions.jsp
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
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -15
    • +15
    ./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
    • -8
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +8
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -105
    • +46
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -3
    • +8
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 34 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
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  4. … 20 more files in changeset.
Monday 14 May 2018
9:28 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4577: minor UI improvement

Adding a heading to feedback options in advanced tab authoring

Options
    • -1
    • +1
    ./web/authoring/AdvancedContent.jsp
8:44 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4577 Can now just show feedback without showing answers.

Options
    • -1
    • +9
    ./conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/pojos/McContent.hbm.xml
    • -4
    • +10
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180511.sql
    • -3
    • +13
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralLearnerFlowDTO.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/mc/dto/McGeneralMonitoringDTO.java
    • -3
    • +14
    ./src/java/org/lamsfoundation/lams/tool/mc/pojos/McContent.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/service/McService.java
    • -7
    • +12
    ./src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningStarterAction.java
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringStarterAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/mc/web/action/McStarterAction.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/tool/mc/web/form/McAuthoringForm.java
  16. … 4 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.
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
    • +18
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180425.sql
    • -18
    • +0
    ./src/java/org/lamsfoundation/lams/tool/mc/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
    • +18
    ./src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20180525.sql
  2. … 28 more files in changeset.