Code

Resolved conflict#234

Code

Open

rustam-miagdeev wants to merge 51 commits intolinnovate:3.x-devlinnovate/openideal:3.x-devfrom rustam-miagdeev:3.x-devrustam-miagdeev/openideal:3.x-devCopy head branch name to clipboard

+153-81

Commits

Commits on Mar 31, 2021

• Merge pull request linnovate#136 from linnovate/dependabot/npm_and_yarn/themes/openideal_theme/ini-1.3.8

  Show description for 08eef25
  db-Matroskeen

  authored
  08eef25

  Copy full SHA for 08eef25

Commits on May 12, 2021

• Add PHP Dependencies to README

  Show description for 056c74a
  bussardrobbie

  authored
  056c74a

  Copy full SHA for 056c74a

Commits on May 13, 2021

• Remove Specific Dependencies - Introduce Drupal

  Show description for 4743c9c
  bussardrobbie

  authored
  4743c9c

  Copy full SHA for 4743c9c

Commits on May 27, 2021

• Changed phrasing a bit

  zohar

  authored
  d1aa560

  Copy full SHA for d1aa560

• Merge pull request linnovate#180 from bussardrobbie/3.x

  Show description for 5266da7
  zohar

  authored
  5266da7

  Copy full SHA for 5266da7

Commits on Jan 20, 2022

• attempting to fix build problems with lionel!

  liorkesos

  authored
  45b85d7

  Copy full SHA for 45b85d7

Commits on Jan 21, 2022

• Exclude composer generated

  heyyo-droid

  committed
  e1d5c11

  Copy full SHA for e1d5c11

• Add compatibility to composer 2

  heyyo-droid

  committed
  7158d56

  Copy full SHA for 7158d56

• Merge pull request linnovate#197 from linnovate/exclude-composer-generated

  Show description for 8cd7332
  heyyo-droid

  authored
  8cd7332

  Copy full SHA for 8cd7332

• Merge pull request linnovate#198 from linnovate/composer2-compatibility

  Show description for 2731c12
  heyyo-droid

  authored
  2731c12

  Copy full SHA for 2731c12

• Add missing module realname

  heyyo-droid

  committed
  bd47304

  Copy full SHA for bd47304

• Merge pull request linnovate#199 from linnovate/missing-realname

  Show description for ca55e76
  heyyo-droid

  authored
  ca55e76

  Copy full SHA for ca55e76

Commits on Feb 20, 2022

• Upgrade CKEditor plugins

  heyyo-droid

  committed
  42491c8

  Copy full SHA for 42491c8

• Add CKEditor plugins: links + fakeobjects

  heyyo-droid

  committed
  2c2d90a

  Copy full SHA for 2c2d90a

• Merge pull request linnovate#201 from linnovate/missing_ckeditor_plugins

  Show description for d068b5b
  heyyo-droid

  authored
  d068b5b

  Copy full SHA for d068b5b

Commits on Apr 24, 2022

• Update composer.json

  Show description for 3b7d197
  heyyo-droid

  authored
  3b7d197

  Copy full SHA for 3b7d197

• Update README.md

  heyyo-droid

  authored
  0886012

  Copy full SHA for 0886012

Commits on Apr 25, 2022

• Update README.md

  Show description for bd129ab
  heyyo-droid

  authored
  bd129ab

  Copy full SHA for bd129ab

Commits on Apr 26, 2022

• Update README.md

  heyyo-droid

  authored
  3867825

  Copy full SHA for 3867825

• Update README.md

  heyyo-droid

  authored
  2b71546

  Copy full SHA for 2b71546

Commits on Jul 31, 2022

• Update composer.json

  heyyo-droid

  authored
  46f6b24

  Copy full SHA for 46f6b24

• Merge pull request linnovate#210 from linnovate/fix-unlimited-number-version

  Show description for 15b815f
  heyyo-droid

  authored
  15b815f

  Copy full SHA for 15b815f

• Update composer.json

  heyyo-droid

  authored
  9c0d45b

  Copy full SHA for 9c0d45b

• Merge pull request linnovate#211 from linnovate/fix-unlimited-number-version-1

  Show description for c959b27
  heyyo-droid

  authored
  c959b27

  Copy full SHA for c959b27

Commits on Aug 7, 2022

• Allow emojis in comments

  heyyo-droid

  committed
  c9a855e

  Copy full SHA for c9a855e

• Add library ckeditor/emojione

  heyyo-droid

  authored
  bd5800d

  Copy full SHA for bd5800d

• Merge pull request linnovate#212 from linnovate/emoji-in-comments

  Show description for 44a22c4
  heyyo-droid

  authored
  44a22c4

  Copy full SHA for 44a22c4

Commits on Aug 18, 2022

• Set Ajax_comments version to 1.0-beta4

  heyyo-droid

  committed
  c79df20

  Copy full SHA for c79df20

• Merge pull request linnovate#213 from linnovate/set-ajax_comments-version

  Show description for dfdcca6
  heyyo-droid

  authored
  dfdcca6

  Copy full SHA for dfdcca6

Commits on Mar 2, 2023

• Changed context to context_definitions

  rustam-miagdeev

  committed
  378ce79

  Copy full SHA for 378ce79

• Updated install configs

  rustam-miagdeev

  committed
  f16b539

  Copy full SHA for f16b539

Commits on Mar 3, 2023

• Fixed trusted callback errors

  rustam-miagdeev

  committed
  0e6bf62

  Copy full SHA for 0e6bf62

• Fixed notices of accessCheck()

  rustam-miagdeev

  committed
  7757f7d

  Copy full SHA for 7757f7d

• Updated configs regarding Drupal 9

  rustam-miagdeev

  committed
  e83ecd2

  Copy full SHA for e83ecd2

• Updated version of modules and patch section

  rustam-miagdeev

  committed
  b5e76f5

  Copy full SHA for b5e76f5

Commits on Mar 18, 2023

• Added patch for fixing an error during config import

  rustam-miagdeev

  committed
  5b28e19

  Copy full SHA for 5b28e19

Commits on Mar 20, 2023

• Fixed errors with context definitions in openideal_demo_content

  rustam-miagdeev

  committed
  5d26da8

  Copy full SHA for 5d26da8

• Merge pull request linnovate#221 from rustam-miagdeev/Upgrade_to_Drupal9

  Show description for 35b08be
  heyyo-droid

  authored
  35b08be

  Copy full SHA for 35b08be

Commits on Apr 12, 2023

• Fixed an issue during composer install

  rustam-miagdeev

  committed
  6cd28ec

  Copy full SHA for 6cd28ec

Commits on Apr 13, 2023

• Merge pull request linnovate#222 from rustam-miagdeev/Upgrade_to_Drupal9

  Show description for 852ce76
  heyyo-droid

  authored
  852ce76

  Copy full SHA for 852ce76

Commits on Apr 29, 2023

• Fixed compatibility with PHP 8 errors

  rustam-miagdeev

  committed
  dcd37a7

  Copy full SHA for dcd37a7

Commits on May 2, 2023

• Merge pull request linnovate#224 from rustam-miagdeev/Upgrade_to_Drupal9

  Show description for eb513f9
  heyyo-droid

  authored
  eb513f9

  Copy full SHA for eb513f9

Commits on May 11, 2023

• Set version of votingapi_reaction compatible with Drupal 8

  rustam-miagdeev

  committed
  a63ec8e

  Copy full SHA for a63ec8e

• Merge pull request linnovate#225 from rustam-miagdeev/fixed_version_votingapi_reaction

  Show description for 02f6f31
  heyyo-droid

  authored
  02f6f31

  Copy full SHA for 02f6f31

Commits on May 21, 2023

• Applied patch to rules to be compatible with PHP 8.1

  rustam-miagdeev

  committed
  aa5ad84

  Copy full SHA for aa5ad84

Commits on May 22, 2023

• Merge pull request linnovate#226 from rustam-miagdeev/Upgrade_to_Drupal9

  Show description for 8b2daa3
  heyyo-droid

  authored
  8b2daa3

  Copy full SHA for 8b2daa3

Commits on Dec 13, 2023

• Fix Drupal 9 version

  heyyo-droid

  committed
  2c41497

  Copy full SHA for 2c41497

• Merge pull request linnovate#230 from linnovate/4.x-dev

  Show description for 15f37a1
  heyyo-droid

  authored
  15f37a1

  Copy full SHA for 15f37a1

• Revert "Fixes for Drupal 9 version"

  heyyo-droid

  authored
  1561003

  Copy full SHA for 1561003

• Merge pull request linnovate#231 from linnovate/revert-230-4.x-dev

  Show description for 7a3b826
  heyyo-droid

  authored
  7a3b826

  Copy full SHA for 7a3b826

Commits on Jan 30, 2024

• Merge remote-tracking branch 'origin/3.x' into 3.x-dev

  rustam-miagdeev

  committed
  f4ca58e

  Copy full SHA for f4ca58e