lams-github

lams_tool_notebook

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
Wednesday 04 Dec 2019
3:44 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_learning/conf/language/lams/ApplicationResources_el_GR.properties

# lams_monitoring/conf/language/lams/ApplicationResources.properties

# lams_monitoring/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_chat/conf/language/lams/ApplicationResources.properties

# lams_tool_chat/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_daco/conf/language/lams/ApplicationResources.properties

# lams_tool_daco/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_forum/conf/language/lams/ApplicationResources.properties

# lams_tool_forum/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_images/conf/language/lams/ApplicationResources.properties

# lams_tool_images/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources.properties

# lams_tool_imscc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

# lams_tool_larsrc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_leader/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_preview/conf/language/lams/ApplicationResources.properties

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
  2. … 35 more files in changeset.
Monday 02 Dec 2019
9:06 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 118 more files in changeset.
Thursday 14 Nov 2019
9:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Wednesday 13 Nov 2019
3:32 am

Andrey Balan

LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
  2. … 60 more files in changeset.
Monday 22 Jul 2019
10:47 pm

Marcin Cieslak

LDEV-4834 Use panel-less LO widget in QB question authoring

Options
    • -1
    • +14
    ./web/WEB-INF/tags/CKEditor.tag
    • -10
    • +33
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  3. … 69 more files in changeset.
Thursday 04 Jul 2019
11:48 pm

Marcin Cieslak

LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

Options
    • -10
    • +19
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 50 more files in changeset.
Friday 14 Jun 2019
1:11 pm

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
    • -4
    • +2
    ./web/pages/monitoring/monitoring.jsp
    • -62
    • +50
    ./web/pages/monitoring/summary.jsp
  4. … 92 more files in changeset.
Wednesday 15 May 2019
7: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.
Wednesday 24 Apr 2019
6:24 am

Andrey Balan

LDEV-4805 Finally switch to using free-jqGrid

Options
    • -4
    • +2
    ./web/pages/monitoring/monitoring.jsp
    • -62
    • +50
    ./web/pages/monitoring/summary.jsp
  3. … 26 more files in changeset.
Wednesday 27 Mar 2019
7: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 12 Mar 2019
10: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
3:13 pm

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.
10: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
5:18 pm

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
3:22 pm

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
7:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Gradebook and jqGrid restyled.

Options
    • -6
    • +19
    ./web/WEB-INF/tags/Page.tag
  2. … 50 more files in changeset.
Friday 15 Feb 2019
12:08 pm

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
10: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/pages/authoring/conditionList.jsp
    • -1
    • +1
    ./web/pages/monitoring/advanceOptions.jsp
    • -1
    • +1
    ./web/pages/monitoring/editActivity.jsp
    • -1
    • +1
    ./web/pages/monitoring/statisticpart.jsp
    • -3
    • +3
    ./web/pages/monitoring/summary.jsp
  12. … 381 more files in changeset.
Sunday 10 Feb 2019
8: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.
3:26 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4769: Updating Greek

Options
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_el_GR.properties
Thursday 07 Feb 2019
4:09 pm

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
11: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/pages/authoring/addCondition.jsp
    • -1
    • +1
    ./web/pages/authoring/conditionList.jsp
    • -4
    • +4
    ./web/pages/learning/notebook.jsp
    • -0
    • +1
    ./web/pages/monitoring/monitoring.jsp
    • -9
    • +9
    ./web/pages/monitoring/summary.jsp
  11. … 497 more files in changeset.
Friday 01 Feb 2019
10: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/pages/monitoring/monitoring.jsp
  7. … 310 more files in changeset.
Tuesday 29 Jan 2019
4:16 pm

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.
Sunday 27 Jan 2019
10:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEv-4759 Material Kit for Bootstrap 4 files installed into lams_central

Options
    • -1
    • +4
    ./web/WEB-INF/tags/Head.tag
    • -38
    • +30
    ./web/WEB-INF/tags/Page.tag
  3. … 262 more files in changeset.
Tuesday 08 Jan 2019
6:59 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4743 Squash/Update SQL scripts ready for LAMS 3.1 release

Options
    • -1
    • +1
    ./build.properties
    • -19
    • +0
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20140102.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20140716.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20150930.sql
    • -22
    • +0
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20151217.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20161123.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20170101.sql
    • -0
    • +49
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20170101_updateTo30.sql
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20190103.sql
  10. … 121 more files in changeset.
Friday 28 Dec 2018
2:51 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4739 Updating labels for notebook

Updating English, Greek, Norwegian and Spanish

Options
    • -6
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
Friday 21 Dec 2018
7:24 pm

Andrey Balan

LDEV-4678 Remove no longer needed @Autowired applicationContext

Options
    • -5
    • +0
    ./src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java
  2. … 20 more files in changeset.
4:47 am

Andrey Balan

LDEV-4678 WebUtil.putActivityPositionInRequestByToolSessionId transformed into service method

Also introduce ICommonToolService that will hold methods shared by all

tools.

Options
    • -10
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java
    • -1
    • +1
    ./web/pages/learning/notebook.jsp
    • -1
    • +1
    ./web/pages/learning/submissionDeadline.jsp
  6. … 138 more files in changeset.
2:05 am

Andrey Balan

LDEV-4678 Remove all ServiceProxy classes

Also get rid of LearningWebUtil.putActivityPositionInRequest(Long

activityId, HttpServletRequest request, ServletContext context) and

LearningWebUtil.getActivityMapping(ServletContext context) methods. As

it's better to invoke according service methods directly.

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
    • -20
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java
    • -10
    • +25
    ./src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
    • -81
    • +0
    ./src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookServiceProxy.java
    • -24
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/web/controller/LearningController.java
  6. … 47 more files in changeset.