Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5395 Update release

- Disable tools to be deprecated in next release (either 4.9 or 5.0)

- Set server version

- Update default user details

  1. … 1 more file 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

    • -1388
    • +1540
    ./sql/create_lams_11_tables.sql
    • -116
    • +128
    ./sql/create_quartz_table.sql
  1. … 103 more files in changeset.
LDEV-5416 Fix inconsistent initial data in fresh build

  1. … 2 more files in changeset.
LDEV-5395 Updating version info

I've been working in LAMS for 20 years (almost) and I always forgot to tag the development versions at the beginning. This is the first time I've done so properly. Hopefully this sets a precedent :-)

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

    • -498
    • +544
    ./sql/create_lams_11_tables.sql
    • -224
    • +179
    ./sql/create_quartz_table.sql
    • -12
    • +114
    ./sql/insert_lams_config_data.sql
    • -235
    • +259
    ./sql/insert_types_data.sql
  1. … 150 more files in changeset.
LDEV-5081 Merge changes made for monitor in LDEV-5083

    • -1847
    • +1410
    ./sql/create_lams_11_tables.sql
  1. … 34 more files in changeset.
LDEV-5280 fix timezones and default user details

Now all users have the land down under as country.

LDEV-5280 fix timezones and default user details

Merge remote-tracking branch 'origin/v4.0' into LDEV-5016

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

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

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

  1. … 27 more files in changeset.
LDEV-5122 Updating LAMS version and language pack date

LDEV-5122 Modify DB structure to produce 3.1 version

Till now DB structure was compliant with 3.0 version and patches

upgraded it to 3.1. Now we produce DB compliant with 3.1 and patches in

branch 4.0 upgrade it to version 4.0.

    • -2160
    • +1710
    ./sql/create_lams_11_tables.sql
  1. … 38 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

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

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

lams_central/web/questions/questionFile.jsp

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

  1. … 25 more files in changeset.
LDEV-5058 Allow tool adding both on fresh build and afterwards

As a column got removed from a LAMS core table, we need to make sure

that all scenarios work well: an upgrade from previous version, a fresh

build and adding extra tools afterwards.

  1. … 41 more files in changeset.
LDEV-4979 Update SQL scripts for LAMS 4.0 release

1. Update SQL scripts (create_lams_tool_*.sql), to avoid running 3.1 to

4.0 autopatch scripts on every build.

2. Update module version to 20200219 in build.properties.

3. Squash patches that upgrade from 3.1 to 4.0 into a single one.

    • -25
    • +220
    ./sql/create_lams_11_tables.sql
  1. … 56 more files in changeset.
LDEV-4440 Do not put Quartz jobs via DB script

The jobs will be initialised via commonContext.xml

LDEV-4743 update SQL core tables

Updating all core tables for 3.1 release.

    • -1531
    • +2445
    ./sql/create_lams_11_tables.sql
    • -173
    • +252
    ./sql/create_quartz_table.sql
    • -299
    • +9
    ./sql/insert_lams_config_data.sql
    • -321
    • +235
    ./sql/insert_types_data.sql
LDEV-4440 updated sql - monitoring rows

  1. … 1 more file in changeset.
LDEV-4440 Monitoring migration - necessary changes at central (changed paths for monitoring), removed controllers connected with branching

    • -0
    • +66
    ./sql/patch20180827.sql
  1. … 15 more files in changeset.
LDEV-4402 Upgrade Quartz

From version 2.2.1 to 2.2.3

  1. … 5 more files in changeset.
LDEV-4311: increasing default file upload sizes to 10MB for students and 100MB for teahers. Only for new installations, existing ones will maintain their currents

LDEV-4180: change table and fields name from TEXT to text as in unix these aren't the same

LDEV-4251: Do not create roles for an user which was excluded from the initial DB build script.

LDEV-4180: Add missing tables.

LDEV-4251: Do not create roles for an user which was excluded from the initial DB build script.

LDEV-4180, LDEV-4217: Apply date-based naming convention to SQL patches.

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

    • -0
    • +302
    ./sql/insert_lams_config_data.sql
    • -302
    • +0
    ./sql/insert_lams_unix_config_data.sql
    • -302
    • +0
    ./sql/insert_lams_windows_config_data.sql
  1. … 2 more files in changeset.
LDEV-3147 Get rid of 'supports_run_offline_flag' and 'define_later_url' columns from lams_tool table

  1. … 31 more files in changeset.
LDEV-4180: Remove help_text from lams_learning_activity as it is taken from i18n files anyway.

  1. … 9 more files in changeset.
LDEV-3254, LDEV-4180: Fix a typo in a configuration key.

    • -1
    • +1
    ./sql/insert_lams_unix_config_data.sql
    • -1
    • +1
    ./sql/insert_lams_windows_config_data.sql
  1. … 2 more files in changeset.