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 11 Jun 2020
2:38 pm

Marcin Cieslak

LDEV-5039 Do not hide QB after question add. Make AE questions collapse.

Options
    • -5
    • +13
    ./web/authoring/template/comms.jsp
    • -1
    • +1
    ./web/authoring/template/tbl/appex.jsp
    • -8
    • +2
    ./web/authoring/template/tbl/tbl.jsp
    • -3
    • +7
    ./web/authoring/template/tool/assessmcq.jsp
    • -3
    • +7
    ./web/authoring/template/tool/assessment.jsp
Friday 05 Jun 2020
1:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4886 Automated tests for v4.0

Options
    • -1
    • +1
    ./web/authoring/template/tbl/tbl.jsp
    • -20
    • +32
    ./web/includes/javascript/main.js
    • -3
    • +5
    ./web/main.jsp
    • -1
    • +1
    ./web/passwordChangeContent.jsp
    • -2
    • +2
    ./web/passwordChangeOkContent.jsp
    • -2
    • +2
    ./web/profile/editprofile.jsp
    • -1
    • +1
    ./web/profile/portrait.jsp
    • -5
    • +5
    ./web/profile/profile.jsp
    • -1
    • +2
    ./web/questions/questionChoice.jsp
    • -1
    • +1
    ./web/questions/questionFile.jsp
  11. … 10 more files in changeset.
11:11 am

Marcin Cieslak

LDEV-5036 Do not prematurely map resource ID to a LAMS lesson

Options
    • -29
    • +33
    ./src/java/org/lamsfoundation/lams/web/controller/LtiController.java
Wednesday 03 Jun 2020
2:58 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Options
    • -1
    • +3
    ./web/includes/javascript/ckconfig_custom.js
2:58 pm

Marcin Cieslak

LDEV-3774 Make sure that height is a string in CKEDITOR callback

Options
    • -1
    • +3
    ./web/includes/javascript/ckconfig_custom.js
3:38 am

Ernie Ghiglione

LDEV-5034: remove debug

Options
    • -1
    • +0
    ./web/forgotPasswordChange.jsp
Tuesday 02 Jun 2020
11:01 am

Marcin Cieslak

DEMO-5 Add Google SSO integration to CSRF Guard

Options
    • -0
    • +3
    ./conf/security/Owasp.CsrfGuard.properties
Monday 01 Jun 2020
9:19 am

Marcin Cieslak

LDEV-5025 Allow leaving comments even after user rated

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Rating.tag
  2. … 31 more files in changeset.
Friday 29 May 2020
1:22 pm

Marcin Cieslak

LDEV-5025 Fix page reloading, not from cache

Options
    • -11
    • +4
    ./web/includes/javascript/rating.js
  2. … 1 more file in changeset.
12:39 pm

Marcin Cieslak

LDEV-4925 Fix new lines on learner results page in Peer Review

Options
    • -1
    • +1
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 31 more files in changeset.
Wednesday 27 May 2020
9:28 am

Marcin Cieslak

LDEV-5052 Fix page reloading, not from cache

Options
    • -2
    • +5
    ./web/includes/javascript/rating.js
  2. … 1 more file in changeset.
9:12 am

Marcin Cieslak

LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

Options
    • -1
    • +2
    ./web/WEB-INF/tags/Rating.tag
    • -38
    • +43
    ./web/includes/javascript/rating.js
  3. … 33 more files in changeset.
Tuesday 26 May 2020
6:51 pm

Marcin Cieslak

LDEV-5052 Refresh page and scroll to comments on rating

Options
    • -4
    • +13
    ./web/WEB-INF/tags/Rating.tag
    • -0
    • +12
    ./web/includes/javascript/rating.js
  3. … 32 more files in changeset.
Thursday 21 May 2020
8:46 am

Marcin Cieslak

LDEV-5025 Allow Assessment other groups' answer rating and commenting

Options
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/web/RatingServlet.java
    • -6
    • +20
    ./web/includes/javascript/rating.js
  3. … 10 more files in changeset.
8:44 am

Marcin Cieslak

LDEV-5030 Sanitise user names for initial Etherpad content

Options
    • -1
    • +4
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Wednesday 20 May 2020
8:39 am

Marcin Cieslak

LDEV-5029 Make IRA question collapsible in TBL template

Options
    • -1
    • +1
    ./web/authoring/template/tbl/appex.jsp
    • -0
    • +4
    ./web/authoring/template/tbl/tbl.jsp
    • -6
    • +9
    ./web/authoring/template/tool/mcquestion.jsp
Tuesday 19 May 2020
7:58 pm

Marcin Cieslak

LDEV-5024 Fix layout issues in TBL template

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +1
    ./web/authoring/template/tbl/appex.jsp
    • -6
    • +11
    ./web/authoring/template/tbl/tbl.jsp
5:00 pm

Marcin Cieslak

LDEV-5024 Import QB questions to AE in TBL template

Options
    • -4
    • +7
    ./src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -9
    • +46
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +4
    ./web/authoring/template/comms.jsp
    • -0
    • +20
    ./web/authoring/template/tbl/appex.jsp
    • -17
    • +29
    ./web/authoring/template/tbl/tbl.jsp
  6. … 2 more files in changeset.
11:35 am

Marcin Cieslak

LDEV-5024 Close QB panel after importing a question

Options
    • -4
    • +6
    ./web/authoring/template/tbl/tbl.jsp
Monday 18 May 2020
8:01 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Options
    • -2
    • +162
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +164
    ./conf/language/lams/ApplicationResources_no_NO.properties
  3. … 1 more file in changeset.
7:56 am

Ernie Ghiglione

LDEV-4745 adding labels for Greek and Norwegian

Options
    • -2
    • +162
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +164
    ./conf/language/lams/ApplicationResources_no_NO.properties
6:45 am

Marcin Cieslak

LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Sunday 17 May 2020
12:11 am

Ernie Ghiglione

LDEV-4967 include appropriate contentType

Options
    • -1
    • +1
    ./web/loadVars.jsp
Friday 15 May 2020
12:53 pm

Marcin Cieslak

LDEV-4996 Adjust Etherpad autogrow feature

Options
    • -2
    • +2
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 31 more files in changeset.
Thursday 14 May 2020
1:27 pm

Marcin Cieslak

LDEV-5024 Import question from QB to TBL template wizard

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +39
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -3
    • +58
    ./web/authoring/template/tbl/tbl.jsp
11:24 am

Marcin Cieslak

LDEV-5024 Add "question from bank" button to TBL template wizard

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    ./web/authoring/template/tbl/tbl.jsp
Monday 11 May 2020
12:14 pm

Marcin Cieslak

LDEV-4997 Renormalize line endings with git

Options
    • -42
    • +42
    ./.classpath
    • -623
    • +623
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
    • -283
    • +283
    ./src/java/org/lamsfoundation/lams/web/ProfileController.java
    • -790
    • +790
    ./src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -37
    • +37
    ./web/WEB-INF/tags/ImgButtonWrapper.tag
    • -1483
    • +1483
    ./web/ckeditor/CHANGES.md
    • -1420
    • +1420
    ./web/ckeditor/LICENSE.md
    • -207
    • +207
    ./web/ckeditor/contents.css
    • -11
    • +11
    ./web/ckeditor/plugins/bootstrapTabs/README.md
    • -32
    • +32
    ./web/ckeditor/plugins/bootstrapTabs/sample/bootstrapTabs.html
    • -20
    • +20
    ./web/ckeditor/plugins/colordialog/dialogs/colordialog.css
    • -45
    • +45
    ./web/ckeditor/plugins/copyformatting/styles/copyformatting.css
    • -43
    • +43
    ./web/ckeditor/plugins/emojione/README.md
    • -5500
    • +5500
    ./web/ckeditor/plugins/emojione/styles/emojione-awesome.css
    • -17
    • +17
    ./web/ckeditor/plugins/emojione/styles/emojione.css
  16. … 406 more files in changeset.
12:05 pm

Marcin Cieslak

LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

Options
    • -0
    • +67
    ./src/java/org/lamsfoundation/lams/web/EtherpadController.java
  2. … 8 more files in changeset.
Wednesday 06 May 2020
1:21 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190119.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190723.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/web/WEB-INF/tags/ImgButtonWrapper.tag

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

Options
    • -0
    • +2
    ./conf/security/Owasp.CsrfGuard.properties
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  4. … 28 more files in changeset.
Monday 04 May 2020
11:35 am

Marcin Cieslak

LDEV-5015 Replace MCQ with Assessment as iRA in TBL template

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -6
    • +8
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java
  3. … 1 more file in changeset.