common.properties

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5440 Upgrade MySQL Java connector to version 8.3.0

  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

# lams_common/db/sql/insert_lams_config_data.sql

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

Merge remote-tracking branch 'origin/LDEV-5397' into v4.8

  1. … 9 more files in changeset.
LDEV-5433 Squash DB patches and update versions

  1. … 107 more files in changeset.
LDEV-5403 Remove YUI compressor

  1. … 8 more files in changeset.
LDEV-5328 Squash DB patches and update versions

  1. … 154 more files in changeset.
LDEV-5122 Update project version in EAR manifest

LDEv-4759 Material Kit for Bootstrap 4 files installed into lams_central

  1. … 263 more files in changeset.
LDEV-4694 Remove obsolete embedded MySQL configuration

  1. … 5 more files in changeset.
LDEV-4440 Add allowPublicKeyRetrieval param required by MySQL 8

  1. … 2 more files in changeset.
LDEV-4402 Upgrade to MySQL 8.0.11

This server version requires a newer connector and server time zone

settings.

  1. … 15 more files in changeset.
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

  1. … 23 more files in changeset.
CLOUD-88: Ooopss

Sorry, didn't mean to commit these two files.

  1. … 1 more file in changeset.
CLOUD-88: removing flash tutorial video

removing flash video replace it with youtube streaming instead

  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

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

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

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

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

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

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

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

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

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

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

  1. … 29 more files in changeset.
LDEV-4433: reverting files that shouldn't have changed.

  1. … 1 more file in changeset.
LDEV-4433: adding new label

  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/master' into lams31

Multiple conflicts resolved with JSON replace and class move to

packages.

  1. … 33 more files in changeset.
LDEV-4405 Upgrade YUI Compressor library

From version 2.4.8 to 2.4.9

The older version does not handle Windows absolute paths.

Also added the library to the list of libs LAMS uses.

  1. … 3 more files in changeset.
LDEV-4405 War deployment minifies Javascript files

  1. … 5 more files in changeset.
Merge branch 'LDEV-4400' into lams31

LDEV-4405 Minify LAMS css files by default

  1. … 2 more files in changeset.
LDEV-4400 Update configuration files to match latest schemas

  1. … 33 more files in changeset.
LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

  1. … 156 more files in changeset.
LDEV-4367 SASS Used for CSS Development

First pass of converting our .css development to use SASS. Autobuild to

convert .scss to .css files has been set up for all projects where

target .css files were found. The overall ANT build has been modified

so the normal build will generate the .css files from .scss files. The

base variables are defined in lams_build/conf/sccs.

  1. … 158 more files in changeset.
LDEV-4180: Merge Windows and Unix configuration SQL script into one file.

  1. … 4 more files in changeset.
LDEV-4180: Remove patches for dropping DB tables as we never use them.

  1. … 35 more files in changeset.
LDEV-3422: Remove JSP precompilation from build files.

  1. … 1 more file in changeset.
LDEV-3633: Allow specyfing host which MySQL runs on.

LDEV-3633: Allow specyfing port which MySQL runs on. Disable SSL for building LAMS as it generates a warning message. New MySQL does not accept ALTER IGNORE TABLE statements.

  1. … 24 more files in changeset.
LDEV-3471: Set session timeout to 30 minuts.

  1. … 3 more files in changeset.