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
Friday 29 Jun 2018
3:03 am

Andrey Balan

LDEV-4605 Move profile related jsps to /web/profile/ folder

Options
    • -6
    • +6
    ./web/WEB-INF/struts-config.xml
    • -422
    • +0
    ./web/editprofile.jsp
    • -90
    • +0
    ./web/lessons.jsp
    • -236
    • +0
    ./web/portrait.jsp
    • -115
    • +0
    ./web/profile.jsp
    • -0
    • +422
    ./web/profile/editprofile.jsp
    • -0
    • +90
    ./web/profile/lessons.jsp
    • -0
    • +236
    ./web/profile/portrait.jsp
    • -0
    • +115
    ./web/profile/profile.jsp
2:26 am

Andrey Balan

Merge branch 'LDEV-4593'

Options
    • -0
    • +20
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +36
    ./web/WEB-INF/struts-config.xml
  4. … 3 more files in changeset.
2:18 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

* Remove "Create a new draft" functionality

* Add policy details page

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +12
    ./src/java/org/lamsfoundation/lams/web/ProfileAction.java
    • -0
    • +5
    ./web/WEB-INF/struts-config.xml
    • -0
    • +86
    ./web/profile/policyDetails.jsp
    • -4
    • +7
    ./web/profile/profilePolicyConsents.jsp
  6. … 5 more files in changeset.
Thursday 28 Jun 2018
6:54 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -39
    • +39
    ./web/policyConsents.jsp
  2. … 13 more files in changeset.
Sunday 24 Jun 2018
9:26 pm

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/lib/lams/lams-central.jar

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag

Options
    • -9
    • +9
    ./src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishController.java
  2. … 14 more files in changeset.
8:41 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

lams_tool_mindmap/.classpath

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

Options
    • -8
    • +14
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/RatingServlet.java
    • -30
    • +179
    ./src/java/org/lamsfoundation/lams/web/action/LtiAction.java
  4. … 21 more files in changeset.
Saturday 23 Jun 2018
8:23 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -0
    • +19
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +26
    ./src/java/org/lamsfoundation/lams/web/ProfileAction.java
    • -64
    • +23
    ./src/java/org/lamsfoundation/lams/web/action/PolicyConsentsAction.java
    • -0
    • +10
    ./web/WEB-INF/struts-config.xml
    • -48
    • +133
    ./web/policyConsents.jsp
    • -0
    • +7
    ./web/profile.jsp
    • -0
    • +104
    ./web/profile/profilePolicyConsents.jsp
  9. … 20 more files in changeset.
1:02 am

Marcin Cieslak

LDEV-4607 Show "no score" gradebook output option in authoring

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./web/authoring/authoring.jsp
    • -1
    • +1
    ./web/includes/javascript/authoring/authoringProperty.js
Wednesday 20 Jun 2018
7:20 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4601 Removing debugging

Options
    • -3
    • +1
    ./web/includes/javascript/addLesson.js
6:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4601 Tweaking date validation and display of scheduled dates

Options
    • -1
    • +3
    ./web/includes/javascript/addLesson.js
  2. … 1 more file in changeset.
Monday 18 Jun 2018
12:42 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4601 Schedule the end date when teacher creates a lesson.

Options
    • -2
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +10
    ./web/addLesson.jsp
    • -2
    • +2
    ./web/css/addLesson.scss
    • -3
    • +46
    ./web/includes/javascript/addLesson.js
  6. … 4 more files in changeset.
Friday 15 Jun 2018
11:27 am

Ernie Ghiglione <ernieg@gmail.com>

CLOUD-88: removing flash tutorial video

removing flash video replace it with youtube streaming instead

Options
    • -25
    • +2
    ./web/tutorialVideo.jsp
  2. … 2 more files in changeset.
1:59 am

Marcin Cieslak

LDEV-4600 Sanitise a parameter when changing password

Options
    • -1
    • +1
    ./web/forgotPasswordChange.jsp
Thursday 14 Jun 2018
1:53 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels in various projects

English, Spanish and Greek

Options
    • -5
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -15
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  5. … 10 more files in changeset.
Wednesday 13 Jun 2018
9:03 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4602 TBL Monitor launches a new window with a countdown timer

Options
    • binary
    ./web/includes/sounds/276607__mickleness__ringtone-foofaraw.mp3
    • binary
    ./web/includes/sounds/276607__mickleness__ringtone-foofaraw.ogg
    • binary
    ./web/includes/sounds/276607__mickleness__ringtone-foofaraw.wav
  4. … 4 more files in changeset.
Sunday 10 Jun 2018
11:47 pm

Marcin Cieslak

LDEV-4599 Add Zoom icon

Options
    • -0
    • +1
    ./web/includes/javascript/authoring/authoringActivity.js
Saturday 02 Jun 2018
10:40 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4594 Turn on/off the integration learner index page block

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -8
    • +14
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +36
    ./src/java/org/lamsfoundation/lams/web/LoginAsAction.java
    • -0
    • +6
    ./web/WEB-INF/struts-config.xml
    • -0
    • +37
    ./web/errorpages/errorWithMessage.jsp
  6. … 4 more files in changeset.
Thursday 31 May 2018
11:01 pm

Andrey Balan

LDEV-4593 Introduce Policies & consent feature

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -0
    • +153
    ./src/java/org/lamsfoundation/lams/web/action/PolicyConsentsAction.java
    • -1
    • +21
    ./web/WEB-INF/struts-config.xml
    • -0
    • +50
    ./web/policyConsents.jsp
  5. … 18 more files in changeset.
Wednesday 30 May 2018
8:18 pm

Marcin Cieslak

LDEV-4587 Add missing bottom border for complex activity in progress bar

Options
    • -0
    • +1
    ./web/css/_progressBar_base.scss
Monday 28 May 2018
10:14 pm

Andrey Balan

LDEV-4589 Fix warning message

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/action/LtiAction.java
4:36 pm

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV_NTU-9 Allowfullscreen for iframe CKeditor plugin is not working.

Options
    • -1
    • +1
    ./web/ckeditor/ckeditor.js
    • -1
    • +1
    ./web/ckeditor/lang/en-au.js
    • -2
    • +2
    ./web/ckeditor/plugins/iframe/dialogs/iframe.js
2:54 pm

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

LDEV_NTU-7 Page jumps to the top when clicking the link in Grouping.

Options
    • -10
    • +39
    ./web/orgGroup.jsp
10:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4588 Adding a colour picker

Options
    • -0
    • +319
    ./web/css/jquery.minicolors.css
    • binary
    ./web/images/css/jquery.minicolors.png
    • -0
    • +8
    ./web/includes/javascript/jquery.minicolors.min.js
  4. … 8 more files in changeset.
Friday 25 May 2018
12:03 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4590 Rating stars left can never be more than 5 stars

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/RatingServlet.java
  2. … 3 more files in changeset.
5:22 am

Andrey Balan

LDEV-4589 Implement LTI Deep Linking feature

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/web/LoginRequestLtiServlet.java
    • -10
    • +156
    ./src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -0
    • +5
    ./web/lti/addLesson.jsp
Tuesday 22 May 2018
6:19 pm

Marcin Cieslak

LDEV-4587 Refresh output definitions if new ones appeared

Options
    • -13
    • +20
    ./web/includes/javascript/authoring/authoringProperty.js
5:59 pm

Marcin Cieslak

LDEV-4587 Distinguish ordered branching by introducing a new field

The fields tells whether branching should start from highest ordered

answer (asc, true) or lowest (desc, false) or is it a plain, non-ordered

tool-based branching (null).

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +6
    ./web/authoring/authoring.jsp
    • -0
    • +5
    ./web/css/_authoring_base.scss
    • -1
    • +2
    ./web/includes/javascript/authoring/authoringActivity.js
    • -0
    • +2
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -4
    • +18
    ./web/includes/javascript/authoring/authoringProperty.js
  8. … 8 more files in changeset.
4:50 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-3115: Missing label for sequence detail

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    ./web/authoring/authoring.jsp
3:04 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating and fixing labels

There's quite a lot of work required with labels and it's not jsut translations but rearringing them according to language, string lenght, etc. Also we shouild be more accurate in naming users. When we are referring to students, we should call them students instead of users. Quite a few of these instances in this commit

Options
    • -17
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -17
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -76
    • +63
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 46 more files in changeset.
Monday 21 May 2018
11:21 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Adding template labels

Previously removed by accidents as they aren't in i18n yet

Options
    • -0
    • +54
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +54
    ./conf/language/lams/ApplicationResources_en_AU.properties