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
Tuesday 22 May 2018
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
11:10 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels

Options
    • -60
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -58
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -62
    • +385
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 22 more files in changeset.
Friday 18 May 2018
6:43 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgPasswordChangeAction.java

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_central/src/java/org/lamsfoundation/lams/comments/web/CommentAction.java

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

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

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

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

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -6
    • +23
    ./src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
  5. … 19 more files in changeset.
5:41 pm

Marcin Cieslak

LDEV-4587 Add new assessment output type

Options
    • -1
    • +1
    ./web/includes/javascript/authoring/authoringProperty.js
  2. … 4 more files in changeset.
Wednesday 16 May 2018
3:23 am

Andrey Balan

LDEV-4583 Block access to index.do for integration learners

If user comes from integrations and possess only learner rights we

should not allow him/her to access index.do page.

Options
    • -0
    • +21
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
  2. … 2 more files in changeset.
Thursday 10 May 2018
4:00 pm

Marcin Cieslak

LDEV-4579 Rewrite for.. of.. JS syntax to keep IE 11 compatibility

Options
    • -12
    • +12
    ./web/includes/javascript/authoring/authoringGeneral.js
2:56 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating missing labels and Greek

Options
    • -5
    • +8
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -5
    • +16
    ./conf/language/lams/ApplicationResources_en_AU.properties
  4. … 13 more files in changeset.
12:11 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4547 Tweaking background for authoring/chart

Options
    • -0
    • +7
    ./conf/scss/_lams_variables.scss
    • -0
    • +9
    ./conf/scss/_lams_variables_purple.scss
    • -9
    • +2
    ./web/css/_authoring_base.scss
    • -0
    • +4
    ./web/css/_chart_base.scss
1:47 am

Marcin Cieslak

LDEV-4576 Check TBL groupings before finishing Live Edit

If groupings are not correct, stay in Live Edit

Options
    • -16
    • +19
    ./web/includes/javascript/authoring/authoringGeneral.js
1:46 am

Marcin Cieslak

LDEV-4576 Ignore edit lock parameter when saving a LD

It is set by special functions in AuthoringService

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
Wednesday 09 May 2018
2:56 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating Greek

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_el_GR.properties
1:59 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Comments can be left anonymously.

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/comments/CommentConstants.java
    • -5
    • +14
    ./src/java/org/lamsfoundation/lams/comments/web/CommentAction.java
    • -1
    • +6
    ./web/WEB-INF/tags/Comments.tag
    • -1
    • +22
    ./web/WEB-INF/tags/CommentsAuthor.tag
    • -0
    • +23
    ./web/comments/anonymouscheckbox.jsp
    • -7
    • +26
    ./web/comments/edit.jsp
    • -8
    • +37
    ./web/comments/msgview.jsp
    • -9
    • +18
    ./web/comments/new.jsp
    • -8
    • +27
    ./web/comments/reply.jsp
    • -0
    • +5
    ./web/css/_learner_base.scss
  12. … 82 more files in changeset.
Tuesday 08 May 2018
7:39 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4559 Students can post anonymously in Forum

Options
    • -0
    • +6
    ./web/css/_learner_base.scss
  2. … 8 more files in changeset.
7:58 am

Marcin Cieslak

LDEV-4574 Re-launch monitoring after Live Edit closes

Options
    • -1
    • +5
    ./web/includes/javascript/dialog.js
    • -1
    • +5
    ./web/includes/javascript/main.js
  3. … 1 more file in changeset.
Monday 07 May 2018
11:51 am

Marcin Cieslak

LDEV-3115 Sort loaded groups by order ID rather than UIID

Options
    • -5
    • +6
    ./web/includes/javascript/authoring/authoringGeneral.js
Thursday 03 May 2018
10:54 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4573 Spinner indicates busy and no data found message added.

Options
    • -1
    • +40
    ./web/css/_learner_base.scss
  2. … 2 more files in changeset.
1:51 am

Andrey Balan

LDEV-4557 Fix Upload image dialog

Options
    • -0
    • +1
    ./web/includes/javascript/ckconfig_custom.js
Tuesday 01 May 2018
9:19 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4564 Audit log entry for Live Edit

Also fixed the learning screen that appears when a Live Edit is

in progress as it was throwing a Null Pointer Exception

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
  3. … 5 more files in changeset.
5:11 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4571: small formatting

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/LoginAsAction.java
5:09 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4571: small formatting

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/PasswordChangeAction.java
  2. … 1 more file in changeset.
Thursday 26 Apr 2018
9:20 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4556: CKEditor upgrade

Re-adding missing emojione icon

Options
    • binary
    ./web/ckeditor/plugins/emojione/icons/emojione.png
Saturday 21 Apr 2018
6:33 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

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

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

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

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

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +160
    ./src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -52
    • +35
    ./src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java
    • -38
    • +70
    ./src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java
    • -1
    • +22
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/SessionListener.java
    • -0
    • +1
    ./web/login.jsp
  8. … 14 more files in changeset.
7:00 am

Andrey Balan

LDEV-4556 Remove PasteFromWord button

There is no point in showing it as it shows only warning message

when pressed

Options
    • -10
    • +8
    ./web/includes/javascript/ckconfig_custom.js
6:58 am

Andrey Balan

LDEV-4556 Upgrade CKEditor to the latest version 4.9.2

Options
    • -1358
    • +1483
    ./web/ckeditor/CHANGES.md
    • -1420
    • +1420
    ./web/ckeditor/LICENSE.md
    • -2
    • +2
    ./web/ckeditor/adapters/jquery.js
    • -724
    • +800
    ./web/ckeditor/ckeditor.js
    • -208
    • +207
    ./web/ckeditor/contents.css
    • -2
    • +2
    ./web/ckeditor/lang/ar.js
    • -2
    • +2
    ./web/ckeditor/lang/bg.js
    • -2
    • +2
    ./web/ckeditor/lang/ca.js
    • -2
    • +2
    ./web/ckeditor/lang/cs.js
    • -2
    • +2
    ./web/ckeditor/lang/cy.js
    • -2
    • +2
    ./web/ckeditor/lang/da.js
    • -2
    • +2
    ./web/ckeditor/lang/de.js
    • -2
    • +2
    ./web/ckeditor/lang/el.js
    • -2
    • +2
    ./web/ckeditor/lang/en-au.js
    • -0
    • +5
    ./web/ckeditor/lang/en.js
  16. … 224 more files in changeset.
6:44 am

Andrey Balan

LDEV-4556 Create list of all LAMS Customizations

/ckeditor/README.md ("## LAMS Customizations" section) contains

now all customizations of the original CKEditor code done by LAMS.

Next time we do any customizations of CKEditor, it should also

be noted there. It will make future upgrades of CKEditor easier.

Options
    • -22
    • +150
    ./web/ckeditor/README.md
6:41 am

Andrey Balan

LDEV-4556 update /ckeditor/build-config.js

Make sure /ckeditor/build-config.js contains uptodate settings

which can be used next time to download CKEditor using builder

Options
    • -46
    • +6
    ./web/ckeditor/build-config.js
Thursday 19 Apr 2018
1:49 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4555 Improved data sending (POST, reduce data sent)

Options
    • -11
    • +27
    ./web/authoring/template/comms.jsp