lams-github / lams_central

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
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 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-INF/tags/OutcomeAuthor.tag
    • -1
    • +2
    ./addLesson.jsp
    • -12
    • +12
    ./authoring/authoring.jsp
    • -14
    • +59
    ./authoring/template/tool/assessmcq.jsp
    • -5
    • +30
    ./authoring/template/tool/assessment.jsp
    • -5
    • +5
    ./authoring/template/tool/assessoption.jsp
    • -8
    • +1
    ./authoring/template/tool/mcoption.jsp
    • -25
    • +73
    ./authoring/template/tool/mcquestion.jsp
    • -6
    • +34
    ./css/_authoring_base.scss
    • -1
    • +13
    ./css/_learner_base.scss
    • -15
    • +22
    ./includes/javascript/authoring/authoringGeneral.js
    • -1
    • +14
    ./includes/javascript/dialog.js
    • -3
    • +1
    ./main.jsp
    • -39
    • +10
    ./outcome/outcomeEdit.jsp
    • -48
    • +21
    ./outcome/outcomeManage.jsp
  16. … 80 more files in changeset.
11:22 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

Options
    • -6
    • +34
    ./css/_authoring_base.scss
  2. … 2 more files in changeset.
Thursday 13 Jun 2019
5:40 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 QTI Import window appears centered on screen.

Options
    • -1
    • +3
    ./authoring/template/comms.jsp
11:15 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Fixed incompatibility between x-editable and jquery-validation

Options
    • -0
    • +20
    ./authoring/template/comms.jsp
    • -14
    • +5
    ./authoring/template/tbl/appex.jsp
    • -12
    • +3
    ./authoring/template/tool/assessmcq.jsp
    • -19
    • +10
    ./authoring/template/tool/assessment.jsp
    • -19
    • +11
    ./authoring/template/tool/mcquestion.jsp
9:45 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Application Exercise functionality completed, can edit titles

Options
    • -10
    • +9
    ./authoring/template/comms.jsp
    • -19
    • +45
    ./authoring/template/tbl/appex.jsp
    • -39
    • +16
    ./authoring/template/tbl/tbl.jsp
    • -6
    • +34
    ./authoring/template/tool/assessmcq.jsp
    • -6
    • +34
    ./authoring/template/tool/assessment.jsp
    • -2
    • +38
    ./authoring/template/tool/mcquestion.jsp
    • -6
    • +34
    ./css/_authoring_base.scss
  8. … 10 more files in changeset.
Sunday 09 Jun 2019
3:22 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Multiple App Exercises with multiple Questions, QTI import

Options
    • -28
    • +36
    ./authoring/template/comms.jsp
    • -0
    • +57
    ./authoring/template/tbl/appex.jsp
    • -21
    • +63
    ./authoring/template/tbl/tbl.jsp
    • -14
    • +17
    ./authoring/template/tool/assessmcq.jsp
    • -5
    • +9
    ./authoring/template/tool/assessment.jsp
    • -2
    • +2
    ./authoring/template/tool/assessmentQTI.jsp
    • -5
    • +5
    ./authoring/template/tool/assessoption.jsp
    • -2
    • +2
    ./authoring/template/tool/assessredooption.jsp
    • -1
    • +1
    ./authoring/template/tool/mcquestionQTI.jsp
  10. … 6 more files in changeset.
Thursday 06 Jun 2019
5:42 pm

Marcin Cieslak

LDEV-4828 Rewrite layout to bootstrap grid. Add comments. Minor fixes.

Options
    • -66
    • +115
    ./qb/collection.jsp
  2. … 2 more files in changeset.
4:31 pm

Marcin Cieslak

LDEV-4828 Allow collection unsharing on QB collections page

Options
    • -1
    • +24
    ./qb/collection.jsp
  2. … 1 more file in changeset.
4:23 pm

Marcin Cieslak

LDEV-4828 Allow question copy and collection sharing in QB

Options
    • -3
    • +45
    ./qb/collection.jsp
  2. … 5 more files in changeset.
3:31 pm

Marcin Cieslak

LDEV-4828 Add "Remove collection" button to QB collections page

Options
    • -26
    • +52
    ./qb/collection.jsp
  2. … 2 more files in changeset.
12:14 am

Marcin Cieslak

LDEV-4828 Add "Add question" button to QB collections page

Options
    • -2
    • +52
    ./qb/collection.jsp
  2. … 5 more files in changeset.
Wednesday 05 Jun 2019
11:12 pm

Marcin Cieslak

LDEV-4828 Add "Add collection" button on QB collection page

Options
    • -0
    • +45
    ./qb/collection.jsp
  2. … 1 more file in changeset.
10:17 pm

Marcin Cieslak

LDEV-4828 Add remove button to QB collections

Options
    • -33
    • +41
    ./qb/collection.jsp
  2. … 6 more files in changeset.
8:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4829 Activities removable in build, RAT and AE have QTI Import

Options
    • -4
    • +18
    ./authoring/template/comms.jsp
    • -11
    • +72
    ./authoring/template/tbl/tbl.jsp
    • -5
    • +28
    ./authoring/template/tool/assessmcq.jsp
    • -2
    • +4
    ./authoring/template/tool/assessment.jsp
    • -0
    • +29
    ./authoring/template/tool/assessmentQTI.jsp
    • -8
    • +1
    ./authoring/template/tool/mcoption.jsp
    • -23
    • +43
    ./authoring/template/tool/mcquestion.jsp
    • -0
    • +22
    ./authoring/template/tool/mcquestionQTI.jsp
    • -0
    • +1
    ./authoring/template/tool/mcredooption.jsp
    • -1
    • +2
    ./questions/questionChoice.jsp
    • -0
    • +1
    ./questions/questionFile.jsp
  12. … 7 more files in changeset.
4:17 pm

Marcin Cieslak

LDEV-4828 Add QB collections link on index page

Options
    • -0
    • +4
    ./includes/javascript/openUrls.js
    • -331
    • +339
    ./main.jsp
  3. … 2 more files in changeset.
3:55 pm

Marcin Cieslak

LDEV-4828 Multiselect in QB collection jqGrid

Options
    • -5
    • +98
    ./qb/collection.jsp
  2. … 1 more file in changeset.
3:52 pm

Marcin Cieslak

LDEV-4828 Fix a CSS link on QB stats page

Options
    • -285
    • +285
    ./qb/stats.jsp
2:56 pm

Marcin Cieslak

LDEV-4828 Paging and search in QB collections jqGrid

Options
    • -4
    • +4
    ./qb/collection.jsp
  2. … 10 more files in changeset.
1:12 pm

Marcin Cieslak

LDEV-4828 Initial implementation of QB collections front end

Options
    • -0
    • +77
    ./qb/collection.jsp
  2. … 5 more files in changeset.
Thursday 30 May 2019
8:08 am

Andrey Balan

LDEV-4826 Move import/export QTI questions feature to QB

Options
    • -0
    • +56
    ./questions/importExport.jsp
  2. … 1 more file in changeset.
Wednesday 29 May 2019
10:20 pm

Marcin Cieslak

LDEV-4825 Show links to activity monitoring on QB stats page

Also fix displaying QB stats in tools' monitoring pages.

Options
    • -2
    • +15
    ./qb/stats.jsp
  2. … 9 more files in changeset.
Tuesday 28 May 2019
4:02 am

Marcin Cieslak

LDEV-4825 Calculate and display question indexes on stats page

Options
    • -9
    • +24
    ./qb/stats.jsp
  2. … 9 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-INF/tags/OutcomeAuthor.tag
  2. … 35 more files in changeset.
5:23 am

Andrey Balan

LDEV-4818 Add title property to MCQ questions

Options
    • -1
    • +1
    ./qb/search.jsp
  2. … 35 more files in changeset.
Monday 13 May 2019
8:35 pm

Andrey Balan

LDEV-4777 Show question details for all question types

Options
    • -11
    • +68
    ./qb/qbQuestionDetails.jsp
    • -43
    • +47
    ./qb/search.jsp
  3. … 3 more files in changeset.
6:54 pm

Marcin Cieslak

LDEV-4746 Use changed property name in JSP (maxMark instead of mark)

Options
    • -1
    • +1
    ./qb/stats.jsp
Saturday 11 May 2019
5:59 am

Andrey Balan

LDEV-4777 Search QB interface is now available in Assessment tool

Options
    • -1
    • +1
    ./qb/qbQuestionDetails.jsp
    • -37
    • +43
    ./qb/search.jsp
  3. … 13 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
    ./includes/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
    ./includes/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
    ./includes/javascript/dialog.js
    • -0
    • +1
    ./includes/javascript/main.js
  3. … 1 more file in changeset.