lams-github / lams_central / web

includes

Clone Tools

Stats

Commits this week: 0
Total Committers: 25
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
Thursday 18 Jul 2019
12:51 pm

Andrey Balan

LDEV-4836 Cope with random questions

* Properly set content_folder_id for old and new QB questions

* Prepare for recalculate marks after edit in monitor

Options
    • -0
    • +44
    ./javascript/qb-search.js
  2. … 14 more files in changeset.
Friday 12 Jul 2019
11:21 pm

Andrey Balan

LDEV-4836 Change authoring to accommodate importing questions from QB

Options
    • -0
    • +9
    ./javascript/bootstrap-toggle.js
    • -0
    • +135
    ./javascript/qb-option.js
    • -0
    • +80
    ./javascript/qb-question.js
  4. … 74 more files in changeset.
Wednesday 03 Jul 2019
9:25 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4834

# Conflicts:

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

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

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

# lams_central/web/includes/javascript/ckconfig_custom.js

# lams_central/web/main.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.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/controller/LearningController.java

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

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

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

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

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

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

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

Options
    • -6
    • +1
    ./javascript/ckconfig_custom.js
  2. … 54 more files in changeset.
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
    • -15
    • +22
    ./javascript/authoring/authoringGeneral.js
    • -1
    • +14
    ./javascript/dialog.js
  3. … 93 more files in changeset.
Wednesday 05 Jun 2019
10:17 am

Marcin Cieslak

LDEV-4828 Add QB collections link on index page

Options
    • -0
    • +4
    ./javascript/openUrls.js
  2. … 3 more files in changeset.
Monday 29 Apr 2019
11:31 pm

Andrey Balan

LDEV-4765 Further UI improvements

* True/False type of questions now use bootstrap-toggle widget

* Update jqeuryvalidate plugin. And make it show bootstrap-like warnings

* Disable autocomplete for all form inputs

* A few other minor fixes

Options
    • -4
    • +4
    ./javascript/jquery.validate.js
  2. … 12 more files in changeset.
10:22 am

Marcin Cieslak

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

Options
    • -0
    • +1
    ./javascript/main.js
Thursday 25 Apr 2019
9:13 pm

Andrey Balan

LDEV-4811 Solve the problem of working with several open monitor dialogs

Options
    • -1
    • +14
    ./javascript/dialog.js
    • -0
    • +1
    ./javascript/main.js
  3. … 1 more file in changeset.
Wednesday 24 Apr 2019
11:01 pm

Andrey Balan

LDEV-4814 Update free-jqGrid to the latest 4.15.5 version

Options
    • -4
    • +4
    ./javascript/free.jquery.jqgrid.min.js
  2. … 1 more file in changeset.
12:24 am

Andrey Balan

LDEV-4805 Finally switch to using free-jqGrid

Options
    • -531
    • +0
    ./javascript/jquery.jqGrid.js
    • -168
    • +0
    ./javascript/jquery.jqGrid.locale-en.js
  3. … 26 more files in changeset.
Tuesday 16 Apr 2019
11:28 pm

Andrey Balan

LDEV-4765 UI improvements

* Show CKEditor placeholder properly in cases when it's initially not

blank

* Proper transition on expanding/collapsing options

Options
    • -5
    • +11
    ./javascript/ckconfig_custom.js
  2. … 3 more files in changeset.
Friday 12 Apr 2019
6:16 pm

Marcin Cieslak

LDEV-4804 Prevent Add Lesson button from being double clicked

Options
    • -0
    • +2
    ./javascript/addLesson.js
  2. … 1 more file in changeset.
Wednesday 03 Apr 2019
12:38 am

Andrey Balan

LDEV-4765 Further work on this feature

* shrinking and expanding question options on selecting them

* improved placeholder for CKEditor

* arranged questions' Settings tab items

Options
    • -2
    • +18
    ./javascript/ckconfig_custom.js
  2. … 18 more files in changeset.
Wednesday 27 Mar 2019
12:57 pm

Marcin Cieslak

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

Options
    • -45
    • +45
    ./javascript/authoring/authoringProperty.js
  2. … 2 more files in changeset.
12:55 pm

Marcin Cieslak

LDEV-4792 Rewrite authoring spinners from jQuery UI to plain HTML 5

Options
    • -45
    • +45
    ./javascript/authoring/authoringProperty.js
  2. … 1 more file in changeset.
Tuesday 26 Mar 2019
7:56 pm

Andrey Balan

Merge branch 'master' into develop

Options
    • -6
    • +12
    ./javascript/authoring/authoringGeneral.js
    • -0
    • +2
    ./javascript/authoring/authoringProperty.js
  3. … 1 more file in changeset.
7:52 pm

Andrey Balan

LDEV-4797 Remove isGateActivityCompletionBased flag in case schedule gate doesn't have preceding activity

Options
    • -6
    • +12
    ./javascript/authoring/authoringGeneral.js
    • -0
    • +2
    ./javascript/authoring/authoringProperty.js
  3. … 1 more file in changeset.
Friday 22 Mar 2019
8:14 pm

Andrey Balan

LDEV-4791 Fix link to delete course grouping controller

Options
    • -1
    • +1
    ./javascript/orgGrouping.js
Wednesday 13 Mar 2019
2:20 pm

Marcin Cieslak

LDEV-4788 All learning outcomes are now global

Options
    • -4
    • +3
    ./javascript/main.js
    • -9
    • +8
    ./javascript/outcome.js
  3. … 20 more files in changeset.
12:38 pm

Marcin Cieslak

LDEV-4787 Fix incorrect spacing when copying activities in authoring

Options
    • -2
    • +2
    ./javascript/authoring/authoringMenu.js
  2. … 5 more files in changeset.
Thursday 07 Mar 2019
10:11 pm

Andrey Balan

LDEV-4751 Fix the issue of CKEditor not opening properly sometimes

(cherry picked from commit e7ead50c9d81d481127f232f4851c0cd56047639)

Options
    • -5
    • +1
    ./javascript/ckconfig_custom.js
  2. … 1 more file in changeset.
10:11 pm

Andrey Balan

LDEV-4751 Fix the issue of CKEditor not opening properly sometimes

Options
    • -5
    • +1
    ./javascript/ckconfig_custom.js
  2. … 1 more file in changeset.
Tuesday 26 Feb 2019
12:12 am

Andrey Balan

LDEV-4777 Initial implementation of question bank search feature

Options
    • -0
    • +107
    ./javascript/jquery.highlight.js
  2. … 10 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
    ./javascript/progressBar.js
  2. … 122 more files in changeset.
Friday 22 Feb 2019
12:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Gradebook and jqGrid restyled.

Options
    • -4
    • +4
    ./javascript/free.jquery.jqgrid.min.js
  2. … 50 more files in changeset.
Thursday 21 Feb 2019
4:32 pm

Marcin Cieslak

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

Options
    • -3
    • +3
    ./javascript/authoring/authoringGeneral.js
4:31 pm

Marcin Cieslak

LDEV-4780 Properly detect if authoring is in a frame

Options
    • -3
    • +3
    ./javascript/authoring/authoringGeneral.js
11:31 am

Marcin Cieslak

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

Options
    • -9
    • +10
    ./javascript/authoring/authoringGeneral.js
11:25 am

Marcin Cieslak

LDEV-4780 Use callbak to resize iframe instead of load detection

When iframe with LD for importing activities gets loaded, the SVG is not

ready yet and reports false height. Instead of detecting when it is

ready, authoring JS code in the iframe reports height when it loads

completely to its parent frame.

Options
    • -9
    • +10
    ./javascript/authoring/authoringGeneral.js
Thursday 14 Feb 2019
9:09 am

Marcin Cieslak

LDEV-4771 Remove close activity authoring confirmation screen

The JSP that controls the close action stays as it works differently in

various environments (authoring, monitoring, IE). It is just run

immediately instead of waiting for button click.

Options
    • -10
    • +14
    ./javascript/authoring/authoringActivity.js
  2. … 25 more files in changeset.