lams-github / lams_central

web

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
Wednesday 28 Nov 2018
12: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
    ./authoring/authoring.jsp
    • -2
    • +12
    ./includes/javascript/authoring/authoringGeneral.js
    • -1
    • +10
    ./toolcontent/import.jsp
8:58 am

Marcin Cieslak

LDEV-4717 Fix LD renaming in authoring

Options
    • -4
    • +4
    ./includes/javascript/authoring/authoringGeneral.js
8:50 am

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
    • -1
    • +0
    ./WEB-INF/web.xml
    • -11
    • +11
    ./forgotPassword.jsp
    • -4
    • +3
    ./forgotPasswordChange.jsp
    • -39
    • +11
    ./forgotPasswordProc.jsp
    • -4
    • +18
    ./login.jsp
  6. … 6 more files in changeset.
Tuesday 27 Nov 2018
8:55 pm

Andrey Balan

LDEV-4711 Show only generic message when resetting passwords

Options
    • -16
    • +14
    ./forgotPassword.jsp
    • -55
    • +51
    ./forgotPasswordChange.jsp
    • -53
    • +13
    ./forgotPasswordProc.jsp
  4. … 2 more files in changeset.
8:54 pm

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
    • +0
    ./WEB-INF/web.xml
    • -4
    • +18
    ./login.jsp
  3. … 4 more files in changeset.
3:50 pm

Marcin Cieslak

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

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

Marcin Cieslak

LDEV-4714 Fix SVG generation in Add Lesson and monitoring

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

Marcin Cieslak

LDEV-4714 Fix LD access adding and processing

Options
    • -3
    • +1
    ./includes/javascript/authoring/authoringGeneral.js
  2. … 3 more files in changeset.
2: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
    ./includes/javascript/authoring/authoringGeneral.js
1: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
    ./includes/javascript/authoring/authoringGeneral.js
1:50 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./css/_authoring_base.scss
12:51 pm

Marcin Cieslak

LDEV-4714 Load Bootstrap faster so spinning arrows appear ASAP

Options
    • -1
    • +2
    ./authoring/authoring.jsp
12: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
    ./includes/javascript/authoring/authoringActivity.js
    • -5
    • +5
    ./includes/javascript/authoring/authoringGeneral.js
Monday 26 Nov 2018
10:12 am

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
    ./includes/javascript/authoring/authoringMenu.js
Thursday 22 Nov 2018
12: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
    ./includes/javascript/authoring/authoringGeneral.js
Wednesday 21 Nov 2018
3: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
    ./includes/javascript/authoring/authoringProperty.js
12:23 pm

Marcin Cieslak

LDEV-4391 Upgrade Boostrap to 3.3.7

Previous version did not support jQuery 3.

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

Marcin Cieslak

LDEV-4391 Get rid of redundant jQuery UI themes

Only bootstrap theme is used now.

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

Marcin Cieslak

LDEV-4391 Upgrade jQuery UI to 1.12.1

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

Marcin Cieslak

LDEV-4391 Upgrade timepicker script to 1.6.3

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

Marcin Cieslak

LDEV-4391 Upgrade tablesorter script to 2.31.1

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

Marcin Cieslak

LDEV-4391 Update jQuery to version 3.3.1. Add Migration Plugin.

jQuery was upgraded to version 3.3.1.

It was put into jquery.js file which is referenced by LAMS JSPs.

In the same file below jQuery code Migration Plugin 3.0.0 was pasted.

This way it gets loaded every time jQuery gets loaded without extra HTML

tags.

The Migration Plugin reintroduces API removed from jQuery 3.

This way we can benefit from jQuery 3 efficiency and security and do not

have to use everywhere its new API straight away.

jQuery and Migration Plugin in jquery.js are in their compressed,

production version.

The Plugin produces only debug information in JS console: "JQMIGRATE:

Migrate is installed, version 3.0.0". It appears every time the Plugin

gets loaded. We can silence this message if we want to.

In jquery.migration.js the two above scripts come in their development

version.

The Plugin produces warnings every time deprecated API is used, pointing

to spots which require rewriting to comply with jQuery 3 new API.

While production jQuery + Plugin solution seems to work fine, we should

ultimately aim at rewriting our code and sticking to pure jQuery 3.

During development jquery.migration.js contents should be copied to

jquery.js to enable warnings.

Options
    • -4
    • +6
    ./includes/javascript/jquery.js
    • -0
    • +11455
    ./includes/javascript/jquery.migration.js
Monday 19 Nov 2018
11:01 pm

Andrey Balan

LDEV-4669 Switch to using placeholder attribute

Also stop copying tags to lams_tool_bbb

Options
    • -6
    • +7
    ./WEB-INF/tags/Rating.tag
    • -3
    • +0
    ./css/_jquery.jRating_base.scss
  3. … 32 more files in changeset.
Thursday 08 Nov 2018
11:23 am

Marcin Cieslak

LDEV-4649 Fix outcome and scale import

Fixed paths for import and outcome/scale removal.

Description is now an optional field when importing.

Options
    • -2
    • +2
    ./includes/javascript/outcome.js
    • -1
    • +1
    ./outcome/outcomeManage.jsp
    • -1
    • +1
    ./outcome/scaleManage.jsp
  4. … 2 more files in changeset.
Tuesday 23 Oct 2018
9:48 pm

Andrey Balan

LDEV-4440 Fix learner and monitor links after creating LTI lesson

Options
    • -4
    • +4
    ./lti/learnerMonitor.jsp
Monday 22 Oct 2018
9:33 am

Marcin Cieslak

LDEV-4691 Fix file uploads

MultipartFilter was introduced for LAMS servlets to work with Spring

MVC. It appears that for WildFly 14 it is not required anymore.

Furthermore, without it will not work without extra configuration. It

was removed.

Also a controller method was rewritten to Spring MVC style.

Options
    • -17
    • +1
    ./WEB-INF/web.xml
  2. … 1 more file in changeset.
Friday 19 Oct 2018
11:38 am

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_admin/web/sessionmaintain.jsp

lams_build/build.xml

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

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

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

Options
    • -9
    • +9
    ./outcome/outcomeEdit.jsp
    • -9
    • +8
    ./outcome/outcomeManage.jsp
    • -9
    • +9
    ./outcome/scaleEdit.jsp
    • -9
    • +8
    ./outcome/scaleManage.jsp
  5. … 14 more files in changeset.
Thursday 18 Oct 2018
10:59 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-4644'

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/web/WEB-INF/struts-config.xml

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java

lams_gradebook/web/gradebookMonitor.jsp

lams_monitoring/conf/language/lams/ApplicationResources.properties

Options
    • -3
    • +31
    ./WEB-INF/struts-config.xml
    • -0
    • +4
    ./main.jsp
    • -27
    • +0
    ./css/outcome.css
  4. … 12 more files in changeset.
Wednesday 17 Oct 2018
9:07 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4689 Save works, can edit acts after gate, learner msg improvement

Options
    • -7
    • +7
    ./includes/javascript/authoring/authoringGeneral.js
  2. … 2 more files in changeset.
Monday 15 Oct 2018
1:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4689 Live Edit has a contribution entry and button changes colour.

Also fixed the SVG rendering in monitor (did not return 404 properly

when missing) and fixed the path for the monitor chosen grouping page.

Options
    • -2
    • +2
    ./authoring/authoring.jsp
    • -0
    • +3
    ./includes/javascript/authoring/authoringGeneral.js
  3. … 9 more files in changeset.