lams-github

lams_learning

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
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 01 Jul 2019
12:43 pm

Marcin Cieslak

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

Options
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java
12:41 pm

Marcin Cieslak

LDEV-3839 Check on back end if a lesson can be restarted by a learner

Options
    • -4
    • +7
    ./src/java/org/lamsfoundation/lams/learning/web/controller/LearnerController.java
Friday 14 Jun 2019
7:11 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

Options
    • -5
    • +31
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 94 more files in changeset.
Wednesday 15 May 2019
1:10 pm

Marcin Cieslak

LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

Options
    • -3
    • +10
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 35 more files in changeset.
Sunday 14 Apr 2019
12:35 pm

Marcin Cieslak

LDEV-4801 Revert changes of FileDAO

They did not lead to fixing the problem and were actually unnecessary:

FileDAO does not use DB connections, so no need for transactions.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
  2. … 9 more files in changeset.
Sunday 07 Apr 2019
9:21 am

Marcin Cieslak

LDEV-4802 Make all DAO calls in content repository go through service

Some classes in content repository were using DAO methods directly,

without enveloping them in a transaction. Now they all go through

RepositoryService.

These methods need to start with "dao" prefix so they are not picked up

by CheckCredentialTicketBeforeAdvice.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
  2. … 9 more files in changeset.
Friday 05 Apr 2019
9:33 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -6
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -12
    • +30
    ./src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
9:19 pm

Andrey Balan

LDEV-4803 Remove branching warning when there's no need to warn

* Fix problem with HibernateProxy

* Change warning messages and their presentation

* Further enhancements to choose branching page markup

Options
    • -6
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +28
    ./src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
    • -8
    • +14
    ./src/java/org/lamsfoundation/lams/learning/web/form/OptionsActivityForm.java
    • -138
    • +125
    ./web/optionsActivity.jsp
10:56 am

Andrey Balan

Merge branch 'master' into develop

Options
    • -4
    • +0
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +20
    ./src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
    • -6
    • +13
    ./src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
9:36 am

Marcin Cieslak

LDEV-4802 Stop websocket threads even more gracefully

An exception can occur also when session gets open, not only when it

gets closed.

Options
    • -8
    • +11
    ./src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java
  2. … 7 more files in changeset.
12:32 am

Andrey Balan

LDEV-4800 Enhance markup

Options
    • -4
    • +6
    ./web/optionsActivity.jsp
12:32 am

Andrey Balan

LDEV-4800 Enhance markup

Options
    • -4
    • +6
    ./web/optionsActivity.jsp
Thursday 04 Apr 2019
11:43 pm

Andrey Balan

LDEV-4800 Proceed to the first incompleted activity in a branch, and not to simply the first one

Also display list of child activities for the completed branch, so user

can revisit completed activities.

Options
    • -4
    • +0
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -4
    • +21
    ./src/java/org/lamsfoundation/lams/learning/web/controller/DisplayOptionsActivityController.java
    • -7
    • +14
    ./src/java/org/lamsfoundation/lams/learning/web/controller/SequenceActivityController.java
    • -59
    • +60
    ./web/optionsActivity.jsp
Wednesday 27 Mar 2019
12:18 pm

Marcin Cieslak

LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +7
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  4. … 85 more files in changeset.
Tuesday 26 Mar 2019
5:57 pm

Andrey Balan

LDEV-4795 Fix gates' title messages

Also some code formatting.

Options
    • -11
    • +5
    ./web/gate/conditionGateContent.jsp
    • -13
    • +6
    ./web/gate/permissionGateContent.jsp
    • -14
    • +8
    ./web/gate/scheduleGateContent.jsp
    • -11
    • +6
    ./web/gate/synchGateContent.jsp
Tuesday 12 Mar 2019
3:41 pm

Marcin Cieslak

LDEV-4786 Allow creating learning outcomes on the fly

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  3. … 62 more files in changeset.
Thursday 28 Feb 2019
8:13 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Restyle File Upload widget, cleaned up comments in CSS files

Options
    • -3
    • +2
    ./web/WEB-INF/tags/FileUpload.tag
  2. … 34 more files in changeset.
3:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Autocomplete restyling, started Assessment updates

Options
    • -1
    • +0
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 43 more files in changeset.
Tuesday 26 Feb 2019
10:18 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Fixing responsive behaviour on front page and tabs.

Options
    • -5
    • +7
    ./web/WEB-INF/tags/Tabs.tag
  2. … 43 more files in changeset.
Monday 25 Feb 2019
8:22 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Tablesorter, Learner Progress Bar tweaked

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Alert.tag
    • -2
    • +1
    ./web/WEB-INF/tags/Page.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TSTable.tag
  4. … 120 more files in changeset.
Friday 22 Feb 2019
12:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Gradebook and jqGrid restyled.

Options
    • -6
    • +19
    ./web/WEB-INF/tags/Page.tag
    • -3
    • +3
    ./web/kumalive/kumaliveReport.jsp
    • -1
    • +1
    ./web/lessonComplete.jsp
  4. … 48 more files in changeset.
Friday 15 Feb 2019
5:08 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Togglebutton and checkbox css functional

Options
    • -3
    • +4
    ./web/WEB-INF/tags/Page.tag
    • -2
    • +7
    ./web/WEB-INF/tags/headItems.tag
  3. … 81 more files in changeset.
Thursday 14 Feb 2019
3:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 DateTimePicker and Accordians updated

Options
    • -5
    • +5
    ./web/WEB-INF/tags/AdvancedAccordian.tag
    • -9
    • +9
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -2
    • +2
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -8
    • +6
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
    • -4
    • +4
    ./web/WEB-INF/tags/TextSearch.tag
    • -0
    • +14
    ./web/WEB-INF/tags/headItems.tag
    • -1
    • +1
    ./web/branching/preview.jsp
    • -1
    • +1
    ./web/grouping/choose.jsp
    • -1
    • +1
    ./web/grouping/show.jsp
    • -2
    • +2
    ./web/notebook/viewall.jsp
  11. … 382 more files in changeset.
Sunday 10 Feb 2019
1:06 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Tour and portrait pop ups appear correctly.

Options
    • -9
    • +10
    ./web/WEB-INF/tags/Tab.tag
  2. … 43 more files in changeset.
8:23 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4769 Updating Greek

Options
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_el_GR.properties
Thursday 07 Feb 2019
9:09 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Main page functional

Options
    • -2
    • +2
    ./web/WEB-INF/tags/SimplePanel.tag
  2. … 35 more files in changeset.
Wednesday 06 Feb 2019
4:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Alert.tag
    • -2
    • +2
    ./web/WEB-INF/tags/DefineLater.tag
    • -36
    • +18
    ./web/WEB-INF/tags/Page.tag
    • -4
    • +4
    ./web/WEB-INF/tags/SimplePanel.tag
    • -1
    • +1
    ./web/WEB-INF/tags/headItems.tag
    • -4
    • +4
    ./web/gate/gateDescription.jsp
    • -1
    • +1
    ./web/grouping/choose.jsp
    • -3
    • +3
    ./web/grouping/show.jsp
    • -2
    • +2
    ./web/kumalive/kumalive.jsp
    • -2
    • +2
    ./web/kumalive/kumaliveRubrics.jsp
    • -5
    • +5
    ./web/notebook/view.jsp
    • -4
    • +4
    ./web/notebook/viewall.jsp
    • -1
    • +1
    ./web/optionsActivity.jsp
  14. … 494 more files in changeset.
Friday 01 Feb 2019
3:38 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Authoring and monitoring tabs working

Options
    • -2
    • +5
    ./web/WEB-INF/tags/Tab.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TabBody.tag
    • -1
    • +1
    ./web/WEB-INF/tags/TabBodyArea.tag
    • -36
    • +27
    ./web/WEB-INF/tags/Tabs.tag
    • -0
    • +1
    ./web/WEB-INF/tags/headItems.tag
    • -1
    • +1
    ./web/grouping/choose.jsp
    • -1
    • +1
    ./web/kumalive/kumalive.jsp
    • -1
    • +1
    ./web/kumalive/kumaliveReport.jsp
    • -1
    • +1
    ./web/kumalive/kumaliveRubrics.jsp
    • -1
    • +1
    ./web/lessonComplete.jsp
    • -1
    • +1
    ./web/presenceChat.jsp
  12. … 305 more files in changeset.
Wednesday 30 Jan 2019
1:44 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Upgraded bootstrap-tour, dialogs opening at appropriate size

Options
    • -1
    • +1
    ./web/css/kumalive.scss
  2. … 17 more files in changeset.
Tuesday 29 Jan 2019
9:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4760 Fixed spacing in authoring criteria entry panel

Options
    • -2
    • +4
    ./web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
  2. … 32 more files in changeset.