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 14 Dec 2018
12:35 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4726 Restoring division line lost when licenses were updated.

Options
    • -0
    • +1
    ./web/authoring/authoring.jsp
9:25 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4726 Licenses updated to Creative Commons 4.0

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +5
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java
    • -4
    • +5
    ./web/authoring/authoring.jsp
    • -0
    • +243
    ./web/images/license/by-nc-nd.svg
    • -0
    • +202
    ./web/images/license/by-nc-sa.eu.svg
    • -0
    • +202
    ./web/images/license/by-nc-sa.svg
    • -0
    • +166
    ./web/images/license/by-nc.eu.svg
    • -0
    • +203
    ./web/images/license/by-nd.svg
    • -0
    • +199
    ./web/images/license/by-sa.svg
    • -0
    • +155
    ./web/images/license/by.svg
    • binary
    ./web/images/license/bync.jpg
    • binary
    ./web/images/license/byncnd.jpg
    • binary
    ./web/images/license/byncsa.jpg
    • binary
    ./web/images/license/bynd.jpg
  16. … 6 more files in changeset.
Thursday 13 Dec 2018
9:28 pm

Marcin Cieslak

LDEV-4731 Initial implementation of enrolments parser

Options
    • -0
    • +327
    ./src/java/org/lamsfoundation/lams/webservice/SPEnrolmentServlet.java
    • -1
    • +12
    ./web/WEB-INF/web.xml
Tuesday 11 Dec 2018
3:23 am

Marcin Cieslak

LDEV-4724 Fix edit profile dialog size

It seems that jQuery 3 is more strict when it comes to format of

parameters accepted by height() function.

Options
    • -3
    • +4
    ./web/includes/javascript/profile.js
Wednesday 05 Dec 2018
1:37 am

Marcin Cieslak

LDEV-4705 Remove references to Group Admin role from web.xml

Options
    • -6
    • +0
    ./web/WEB-INF/web.xml
  2. … 30 more files in changeset.
1:16 am

Marcin Cieslak

LDEV-4705 Add missing sysadmin role in a check

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/IndexController.java
Tuesday 04 Dec 2018
3:51 pm

Marcin Cieslak

LDEV-4705 Remove references to Group Admin role from Java code

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
    • -9
    • +7
    ./src/java/org/lamsfoundation/lams/web/DisplayGroupController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/EmailUserController.java
    • -5
    • +3
    ./src/java/org/lamsfoundation/lams/web/IndexController.java
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/web/LoginAsController.java
    • -10
    • +6
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java
  7. … 21 more files in changeset.
Thursday 29 Nov 2018
6:08 pm

Marcin Cieslak

LDEV-4714 Make fetching output definitions async

For large LDs sync calls can noticeably slow down drawing process.

Options
    • -1
    • +1
    ./web/includes/javascript/authoring/authoringActivity.js
Wednesday 28 Nov 2018
7:19 pm

Marcin Cieslak

LDEV-4391 Prevent double clicking on Save As and Import buttons

Even though Save button in Save As dialog does not seem to get spinning

arrows, it gets disabled straight away and double submit does not

happen. The arrows never get a chance to get rendered as code

responsible for saving works quickly and calls reset() method on the

button.

Options
    • -2
    • +4
    ./web/authoring/authoring.jsp
    • -2
    • +12
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -1
    • +10
    ./web/toolcontent/import.jsp
3:58 pm

Marcin Cieslak

LDEV-4717 Fix LD renaming in authoring

Options
    • -4
    • +4
    ./web/includes/javascript/authoring/authoringGeneral.js
3:50 pm

Marcin Cieslak

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

Conflicts:

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

lams_central/web/forgotPassword.jsp

lams_central/web/forgotPasswordChange.jsp

lams_central/web/forgotPasswordProc.jsp

lams_tool_assessment/web/pages/learning/results.jsp

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -83
    • +71
    ./src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
    • -1
    • +0
    ./web/WEB-INF/web.xml
    • -11
    • +11
    ./web/forgotPassword.jsp
    • -4
    • +3
    ./web/forgotPasswordChange.jsp
    • -39
    • +11
    ./web/forgotPasswordProc.jsp
    • -4
    • +18
    ./web/login.jsp
  8. … 4 more files in changeset.
3:55 am

Andrey Balan

LDEV-4711 Show only generic message when resetting passwords

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -79
    • +60
    ./src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
    • -16
    • +14
    ./web/forgotPassword.jsp
    • -55
    • +51
    ./web/forgotPasswordChange.jsp
    • -53
    • +13
    ./web/forgotPasswordProc.jsp
3:54 am

Andrey Balan

LDEV-4710 Add config setting to enable "Forgot your password?" option

Also if people try to get to the login page by going to the URL

directly, we display a 404 error message.

Options
    • -1
    • +10
    ./src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
    • -1
    • +0
    ./web/WEB-INF/web.xml
    • -4
    • +18
    ./web/login.jsp
  4. … 3 more files in changeset.
Tuesday 27 Nov 2018
10:50 pm

Marcin Cieslak

LDEV-4714 Add "loading" status to some buttons to prevent double click

Options
    • -4
    • +5
    ./web/authoring/authoring.jsp
    • -0
    • +5
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -1
    • +4
    ./web/includes/javascript/authoring/authoringMenu.js
10:12 pm

Marcin Cieslak

LDEV-4714 Fix SVG generation in Add Lesson and monitoring

Options
    • -8
    • +11
    ./web/includes/javascript/addLesson.js
    • -1
    • +1
    ./web/includes/javascript/authoring/authoringGeneral.js
  3. … 1 more file in changeset.
9:46 pm

Marcin Cieslak

LDEV-4714 Fix LD access adding and processing

Options
    • -4
    • +9
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -3
    • +1
    ./web/includes/javascript/authoring/authoringGeneral.js
  3. … 2 more files in changeset.
9:03 pm

Marcin Cieslak

LDEV-4714 Fix parsing of branching in old LDs

It seems that there can be LDs which have no coordinates for branching

at all. Neither old type (xCoord) nor new type (startXCoord). They can

still be rendered, but need to have activities automatically rearranged.

Options
    • -1
    • +3
    ./web/includes/javascript/authoring/authoringGeneral.js
8:54 pm

Marcin Cieslak

LDEV-4714 Fix SVG generation in authoring

Since LD opening in authoring is async now, there was a race condition

between opening LD and an attempt to save its thumbnail. Instead of

going back to sync solution, a callback was implemented that runs only

when LD is already open.

Options
    • -10
    • +17
    ./web/includes/javascript/authoring/authoringGeneral.js
8:50 pm

Marcin Cieslak

LDEV-4714 Make arrows spin when loading LD thumbnail in authoring

Options
    • -1
    • +1
    ./web/css/_authoring_base.scss
8:03 pm

Marcin Cieslak

LDEV-4714 Clear overflow of LD access entries

There is no point in keeping hundreds of LD access entries in DB for

each user, if there are always displayed only few of them.

Options
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringFullService.java
    • -9
    • +0
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringController.java
7:51 pm

Marcin Cieslak

LDEV-4714 Load Bootstrap faster so spinning arrows appear ASAP

Options
    • -1
    • +2
    ./web/authoring/authoring.jsp
7:38 pm

Marcin Cieslak

LDEV-4714 Use async Ajax calls where possible

Synchronised Ajax calls are discouraged since they stoi UI interaction.

Options
    • -1
    • +1
    ./web/includes/javascript/authoring/authoringActivity.js
    • -5
    • +5
    ./web/includes/javascript/authoring/authoringGeneral.js
Monday 26 Nov 2018
5:12 pm

Marcin Cieslak

LDEV-4391 Show export LD label in authoring.

It seems that with new jQuery show() method does work if DOM node is not

attached to an document (yet). For example if a piece of HTML gets

cloned with jQuery and it is not appended to any parent, show() will not

work.

Options
    • -1
    • +1
    ./web/includes/javascript/authoring/authoringMenu.js
Thursday 22 Nov 2018
7:01 pm

Marcin Cieslak

LDEV-3115 Fix detection of old LD being converted into new format.

If X and Y were 0, detection did not work.

Options
    • -1
    • +1
    ./web/includes/javascript/authoring/authoringGeneral.js
Wednesday 21 Nov 2018
10:43 pm

Marcin Cieslak

LDEV-4391 Fix properties dialog in authoring

When content was added to modal dialog, it was still hidden. We had to

explicitly show it in JS.

Options
    • -0
    • +1
    ./web/includes/javascript/authoring/authoringProperty.js
7:23 pm

Marcin Cieslak

LDEV-4391 Upgrade Boostrap to 3.3.7

Previous version did not support jQuery 3.

Options
    • -3
    • +4
    ./web/css/bootstrap.min.css
    • -4
    • +4
    ./web/includes/javascript/bootstrap.min.js
7:22 pm

Marcin Cieslak

LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

Options
    • -1
    • +1
    ./web/ckeditor/plugins/jlatexmath/jlatexmath.jsp
    • binary
    ./web/css/images/ui-bg_flat_0_999999_40x100.png
    • binary
    ./web/css/images/ui-bg_flat_0_aaaaaa_40x100.png
    • binary
    ./web/css/images/ui-bg_glass_55_fbf9ee_1x400.png
    • binary
    ./web/css/images/ui-bg_glass_65_ffffff_1x400.png
    • binary
    ./web/css/images/ui-bg_glass_75_ffffff_1x400.png
    • binary
    ./web/css/images/ui-bg_highlight-soft_75_cccccc_1x100.png
    • binary
    ./web/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png
    • binary
    ./web/css/images/ui-icons_222222_256x240.png
    • binary
    ./web/css/images/ui-icons_2e83ff_256x240.png
    • binary
    ./web/css/images/ui-icons_428bca_256x240.png
    • binary
    ./web/css/images/ui-icons_454545_256x240.png
    • binary
    ./web/css/images/ui-icons_555555_256x240.png
    • binary
    ./web/css/images/ui-icons_888888_256x240.png
    • binary
    ./web/css/images/ui-icons_999999_256x240.png
  16. … 83 more files in changeset.
7:22 pm

Marcin Cieslak

LDEV-4391 Upgrade jQuery UI to 1.12.1

Options
    • -11
    • +11
    ./web/includes/javascript/jquery-ui.js
7:21 pm

Marcin Cieslak

LDEV-4391 Upgrade timepicker script to 1.6.3

Options
    • -10
    • +4
    ./web/css/jquery-ui.timepicker.css
    • -1882
    • +5
    ./web/includes/javascript/jquery-ui.timepicker.js
7:21 pm

Marcin Cieslak

LDEV-4391 Upgrade tablesorter script to 2.31.1

Options
    • -48
    • +1
    ./web/css/jquery.tablesorter.pager.css
    • -222
    • +1
    ./web/css/jquery.tablesorter.theme-blue.css
    • -167
    • +1
    ./web/css/jquery.tablesorter.theme.bootstrap.css
    • -2
    • +1262
    ./web/includes/javascript/jquery.tablesorter-pager.js
    • -4
    • +3182
    ./web/includes/javascript/jquery.tablesorter-widgets.js
    • -2
    • +1
    ./web/includes/javascript/jquery.tablesorter.js