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
Friday 08 Nov 2019
4:24 pm

Marcin Cieslak

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

Conflicts:

lams_central/web/includes/javascript/authoring/authoringActivity.js

Options
    • -2
    • +8
    ./javascript/authoring/authoringActivity.js
    • -1
    • +1
    ./javascript/authoring/authoringMenu.js
  3. … 1 more file in changeset.
Wednesday 06 Nov 2019
9:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4887 Adding id, classes to make automated testing faster

Options
    • -1
    • +1
    ./javascript/authoring/authoringActivity.js
    • -1
    • +1
    ./javascript/authoring/authoringMenu.js
  3. … 7 more files in changeset.
Tuesday 05 Nov 2019
4:53 am

Marcin Cieslak

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

Options
    • -9
    • +10
    ./javascript/main.js
4:51 am

Marcin Cieslak

LDEV-4898 Fix race condition when generating a LD SVG

Options
    • -9
    • +10
    ./javascript/main.js
Monday 04 Nov 2019
4:10 pm

Marcin Cieslak

LDEV-4893 Current activity opens in a pop up in monitor progress bar

Options
    • -1
    • +3
    ./javascript/progressBar.js
Friday 25 Oct 2019
8:50 pm

Andrey Balan

LDEV-4879 Create lesson in subgroups at one go

Options
    • -1
    • +8
    ./javascript/addLesson.js
  2. … 4 more files in changeset.
Sunday 13 Oct 2019
2:42 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4877 Bootstrap tourist replaced tour for Bootstrap 3.4.1

Options
    • -22
    • +0
    ./javascript/bootstrap-tour.min.js
    • -0
    • +12
    ./javascript/bootstrap-tourist.min.js
  3. … 7 more files in changeset.
Saturday 12 Oct 2019
4:07 am

Andrey Balan

LDEV-4877 Upgrade bootstrap library to version 3.4.1

* bootstrap-slider to 10.6.2

* bootstrap-tour to 0.12.0

Options
    • -3
    • +3
    ./javascript/bootstrap-slider.js
    • -2
    • +2
    ./javascript/bootstrap-tour.min.js
    • -4
    • +3
    ./javascript/bootstrap.min.js
  4. … 3 more files in changeset.
Wednesday 09 Oct 2019
2:12 am

Marcin Cieslak

LKC-221 Rearrange and regenerate LD SVG after activities were modified

Options
    • -3
    • +7
    ./javascript/authoring/authoringGeneral.js
Saturday 05 Oct 2019
6:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -24
    • +26
    ./javascript/qb-option.js
  2. … 75 more files in changeset.
Saturday 21 Sep 2019
10:57 pm

Marcin Cieslak

LDEV-4871 Fix query string building when requesting a print page

Options
    • -7
    • +14
    ./javascript/orgGroup.js
Thursday 29 Aug 2019
5:57 pm

Marcin Cieslak

LDEV-4853 Add info that treeview library has been customised for LAMS

Options
    • -0
    • +5
    ./javascript/bootstrap-treeview.js
12:59 am

Marcin Cieslak

LDEV-4853 Fix a minor issue with empty folder display

Options
    • -4
    • +4
    ./javascript/learning-design-treeview.js
Monday 26 Aug 2019
9:48 pm

Marcin Cieslak

LDEV-4853 Make locks on read-only folders red.

Options
    • -1
    • +1
    ./javascript/learning-design-treeview.js
  2. … 1 more file in changeset.
2:58 pm

Marcin Cieslak

LDEV-4853 Add comments to code. Adjust layout. Minor fixes.

Options
    • -9
    • +24
    ./javascript/addLesson.js
    • -3
    • +1
    ./javascript/authoring/authoringGeneral.js
    • -42
    • +43
    ./javascript/learning-design-treeview.js
  4. … 1 more file in changeset.
2:02 pm

Marcin Cieslak

LDEV-4853 Rewrite YUI folder tree in Add Lesson dialog to bootstrap

Initial YUI clean up.

Fix minor issues.

Options
    • -100
    • +30
    ./javascript/addLesson.js
    • -1
    • +2
    ./javascript/authoring/authoringGeneral.js
    • -6
    • +9
    ./javascript/learning-design-treeview.js
    • -23
    • +0
    ./javascript/yui/animation-min.js
    • -7
    • +0
    ./javascript/yui/json-min.js
    • -12
    • +0
    ./javascript/yui/treeview-min.js
    • -14
    • +0
    ./javascript/yui/yahoo-dom-event.js
  8. … 22 more files in changeset.
Sunday 25 Aug 2019
11:09 pm

Marcin Cieslak

LDEV-4853 Rewrite YUI folder tree in LD authoring to bootstrap

Options
    • -3241
    • +3204
    ./javascript/authoring/authoringGeneral.js
    • -59
    • +0
    ./javascript/authoring/authoringMenu.js
    • -0
    • +1425
    ./javascript/bootstrap-treeview.js
    • -0
    • +145
    ./javascript/learning-design-treeview.js
  5. … 3 more files in changeset.
Wednesday 24 Jul 2019
4:44 am

Andrey Balan

LDEV-4836 Advanced search on authoring basic tab

* "Random questions" page in authoring. Add "Select all questions"

button + collections dropdown

Options
    • -0
    • +9
    ./javascript/bootstrap-select.js
    • -14
    • +19
    ./javascript/qb-search.js
  3. … 13 more files in changeset.
Thursday 18 Jul 2019
6: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.
Saturday 13 Jul 2019
5:21 am

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.
Thursday 04 Jul 2019
3:25 am

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
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
    • -15
    • +22
    ./javascript/authoring/authoringGeneral.js
    • -1
    • +14
    ./javascript/dialog.js
  3. … 93 more files in changeset.
Wednesday 05 Jun 2019
4:17 pm

Marcin Cieslak

LDEV-4828 Add QB collections link on index page

Options
    • -0
    • +4
    ./javascript/openUrls.js
  2. … 3 more files in changeset.
Tuesday 30 Apr 2019
5:31 am

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.
Monday 29 Apr 2019
4:22 pm

Marcin Cieslak

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

Options
    • -0
    • +1
    ./javascript/main.js
Friday 26 Apr 2019
3:13 am

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.
Thursday 25 Apr 2019
5:01 am

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.
Wednesday 24 Apr 2019
6: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.
Wednesday 17 Apr 2019
5:28 am

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.
Saturday 13 Apr 2019
12:16 am

Marcin Cieslak

LDEV-4804 Prevent Add Lesson button from being double clicked

Options
    • -0
    • +2
    ./javascript/addLesson.js
  2. … 1 more file in changeset.