lams-github

lams_central

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
Thursday 21 Feb 2019
11:32 pm

Marcin Cieslak

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

Options
    • -3
    • +3
    ./web/includes/javascript/authoring/authoringGeneral.js
11:31 pm

Marcin Cieslak

LDEV-4780 Properly detect if authoring is in a frame

Options
    • -3
    • +3
    ./web/includes/javascript/authoring/authoringGeneral.js
11:29 pm

Marcin Cieslak

LDEV-4776 Let monitors see course gradebook for their lessons

Group manager sees all lessons in a course. Monitor sees only ones he is

a monitor in.

Options
    • -7
    • +0
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
  2. … 6 more files in changeset.
6:31 pm

Marcin Cieslak

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

Options
    • -9
    • +10
    ./web/includes/javascript/authoring/authoringGeneral.js
6:25 pm

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
    ./web/includes/javascript/authoring/authoringGeneral.js
Wednesday 20 Feb 2019
9:54 pm

Marcin Cieslak

LDEV-4731 Re-enable users who were disable before if they are in CSV

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
9:43 pm

Marcin Cieslak

LDEV-4731 Disable learners who are not in any course anymore

Options
    • -0
    • +26
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
11:58 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Main page restyled.

Options
    • -11
    • +13
    ./conf/scss/_lams_variables.scss
    • -10
    • +12
    ./conf/scss/_lams_variables_purple.scss
    • -1
    • +6
    ./web/css/_learner_base.scss
    • -332
    • +181
    ./web/css/_main_base.scss
    • -12
    • +10
    ./web/favoriteOrganisations.jsp
    • -9
    • +9
    ./web/group.jsp
    • -3
    • +5
    ./web/groupContents.jsp
    • -6
    • +6
    ./web/groupHeader.jsp
    • -21
    • +17
    ./web/main.jsp
    • -4
    • +4
    ./web/notificationsprivate.jsp
Friday 15 Feb 2019
12:08 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Togglebutton and checkbox css functional

Options
    • -15
    • +17
    ./build.xml
    • -840
    • +0
    ./conf/scss/_bootstrap-variables.scss
    • -1
    • +1
    ./conf/scss/material-kit.scss
    • -10
    • +15
    ./conf/scss/material-kit/_checkboxes.scss
    • -9
    • +14
    ./conf/scss/material-kit/_togglebutton.scss
    • -3
    • +4
    ./web/WEB-INF/tags/Page.tag
    • -2
    • +7
    ./web/WEB-INF/tags/headItems.tag
    • -17
    • +17
    ./web/css/material-kit-blue-primary.css
    • -14043
    • +8462
    ./web/css/material-kit.css
    • -338
    • +0
    ./web/css/material-kit.css.map
    • -21
    • +0
    ./web/css/material-kit.min.css
  12. … 72 more files in changeset.
Thursday 14 Feb 2019
4:09 pm

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
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_ar_JO.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_cs_CZ.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_cy_GB.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_da_DK.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_es_MX.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_id_ID.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_ko_KR.properties
  16. … 11 more files in changeset.
11:53 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
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_ar_JO.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_cs_CZ.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_cy_GB.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_da_DK.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_es_MX.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_id_ID.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_ko_KR.properties
  16. … 11 more files in changeset.
11:21 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'develop' into LDEV-4759

# Conflicts:

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

Options
    • -0
    • +5
    ./web/css/_inlineeditor.scss
  2. … 3 more files in changeset.
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/authoring/template/tool/assessmcq.jsp
    • -1
    • +1
    ./web/authoring/template/tool/assessoption.jsp
    • -1
    • +1
    ./web/authoring/template/tool/mcoption.jsp
    • -1
    • +1
    ./web/authoring/template/tool/mcquestion.jsp
    • -0
    • +11
    ./web/css/_learner_base.scss
    • -15
    • +10
    ./web/includes/javascript/monitorToolSummaryAdvanced.js
    • -1
    • +1
    ./web/notificationsprivate.jsp
    • -2
    • +2
    ./web/orgGroup.jsp
    • -1
    • +1
    ./web/policyConsents.jsp
  16. … 377 more files in changeset.
Wednesday 13 Feb 2019
6:39 pm

Marcin Cieslak

LDEV-4731 Use email as user login

Options
    • -8
    • +11
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
Tuesday 12 Feb 2019
10:35 pm

Andrey Balan

LDEV-4770 CKEditor's content use display:block instead of inline-block

Content in CKEditor is by default displayed using display: inline-block,

however, this CSS property doesn't get applied in real life. Which

creates a discrepancy between the way content displayed inside the

editor and later on outside of it.

Options
    • -0
    • +5
    ./web/css/_inlineeditor.scss
9:06 pm

Marcin Cieslak

LDEV-4772 Fix properties dialog position in authoring after first drag

Options
    • -0
    • +7
    ./web/includes/javascript/authoring/authoringProperty.js
6:58 am

Andrey Balan

LDEV-4762 Add drag and drop for answers in ordering question type

(cherry picked from commit 21e3286385ca1c464997e9792460b7712d23dcdd)

Options
    • -0
    • +3
    ./web/includes/javascript/Sortable.js
  2. … 7 more files in changeset.
6:58 am

Andrey Balan

LDEV-4762 Add drag and drop for answers in ordering question type

Options
    • -0
    • +3
    ./web/includes/javascript/Sortable.js
  2. … 7 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
    • -0
    • +1
    ./conf/scss/_lams_variables.scss
    • -0
    • +1
    ./conf/scss/_lams_variables_purple.scss
    • -9
    • +10
    ./web/WEB-INF/tags/Tab.tag
    • -1
    • +14
    ./web/css/_learner_base.scss
    • -2
    • +2
    ./web/css/bootstrap-tour.min.css
    • -2
    • +2
    ./web/includes/javascript/bootstrap-tour.min.js
    • -1
    • +1
    ./web/includes/javascript/bootstrap.tabcontroller.js
    • -3
    • +6
    ./web/includes/javascript/chart.js
    • -1
    • +1
    ./web/includes/javascript/portrait.js
    • -3
    • +3
    ./web/main.jsp
    • -2
    • +1
    ./web/mainTour.jsp
  12. … 33 more files in changeset.
3:23 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4769 Updating Greek

Options
    • -2
    • +91
    ./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
    • -36
    • +34
    ./conf/scss/_lams_variables.scss
    • -36
    • +34
    ./conf/scss/_lams_variables_purple.scss
    • -2
    • +2
    ./web/WEB-INF/tags/SimplePanel.tag
    • -212
    • +228
    ./web/css/_main_base.scss
    • -11
    • +12
    ./web/main.jsp
  6. … 31 more files in changeset.
9:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Choice of colour schemes blue or purple

Options
    • -0
    • +65
    ./build.xml
    • -5
    • +17
    ./conf/scss/_lams_variables.scss
    • -2
    • +115
    ./conf/scss/_lams_variables_purple.scss
    • -0
    • +67
    ./conf/scss/material-kit-blue-primary.scss
    • -0
    • +39
    ./conf/scss/material-kit/_variables-blue.scss
    • -0
    • +11
    ./conf/scss/material-kit/variables/_brand-blue.scss
    • -1
    • +1
    ./web/css/defaultHTML_learner.scss
    • -0
    • +12490
    ./web/css/material-kit-blue-primary.css
    • -1
    • +1
    ./web/css/purple_learner.scss
4:52 am

Andrey Balan

LDEV-4765 Apply new UI to other question types

Options
    • -0
    • +6
    ./web/includes/javascript/jquery-ui.slider.js
  2. … 23 more files in changeset.
Wednesday 06 Feb 2019
11:04 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Panels are now cards.

Options
    • -13
    • +1
    ./conf/scss/_lams_variables.scss
    • -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
    • -1
    • +2
    ./web/addLesson.jsp
    • -0
    • +1
    ./web/authoring/authoring.jsp
    • -3
    • +3
    ./web/authoring/template/grouping.jsp
    • -4
    • +4
    ./web/authoring/template/tool/assessmcq.jsp
    • -4
    • +4
    ./web/authoring/template/tool/assessment.jsp
    • -4
    • +4
    ./web/authoring/template/tool/mcquestion.jsp
    • -4
    • +4
    ./web/comments/msgview.jsp
    • -6
    • +6
    ./web/comments/new.jsp
    • -10
    • +774
    ./web/css/_learner_base.scss
  16. … 492 more files in changeset.
Monday 04 Feb 2019
4:40 pm

Marcin Cieslak

LDEV-4767 Move logout logging to higher level methods

This way we know what triggered logout: manual logout, sysadmin or

duplicate session in another browser.

Timeout logout will be silent.

Options
    • -3
    • +16
    ./src/java/org/lamsfoundation/lams/web/HomeController.java
    • -22
    • +6
    ./src/java/org/lamsfoundation/lams/web/SessionListener.java
  3. … 2 more files in changeset.
Friday 01 Feb 2019
11:06 pm

Marcin Cieslak

LDEV-4731 Adjust parser code for current code state on master

Options
    • -3
    • +12
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
11:01 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-4731' into LDEV-4731

Options
    • -1
    • +12
    ./web/WEB-INF/web.xml
10:55 pm

Marcin Cieslak

LDEV-4731, LDEV-4761 Create users and orgs via integrated server

Provisioned users will authenticate through Azure using SAML. They need

to go through an integrated server, so they need to be already

provisioned as external users.

Options
    • -52
    • +72
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
10:02 pm

Marcin Cieslak

LDEV-4767 Add login and logout event logs

Options
    • -4
    • +22
    ./src/java/org/lamsfoundation/lams/web/SessionListener.java
  2. … 4 more files in changeset.
10:38 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4759 Authoring and monitoring tabs working

Options
    • -4
    • +17
    ./conf/scss/_lams_variables.scss
    • -1
    • +6
    ./conf/scss/material-kit/_responsive.scss
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/tag/HelpTag.java
    • -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/addLesson.jsp
    • -1
    • +1
    ./web/authoring/authoring.jsp
    • -1
    • +1
    ./web/authoring/template/header.jsp
    • -1
    • +1
    ./web/css/_authoring_base.scss
    • -0
    • +5
    ./web/css/_learner_base.scss
    • -3
    • +3
    ./web/css/_main_base.scss
    • -5
    • +5
    ./web/css/_progressBar_base.scss
  16. … 301 more files in changeset.