Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolved conflict #234

Open
wants to merge 51 commits into
base: 3.x-dev
Choose a base branch
from
Open

Resolved conflict #234

wants to merge 51 commits into from

Commits on Mar 31, 2021

  1. Merge pull request linnovate#136 from linnovate/dependabot/npm_and_ya… 

    …rn/themes/openideal_theme/ini-1.3.8

Bump ini from 1.3.5 to 1.3.8 in /themes/openideal_theme
    @db-Matroskeen
    db-Matroskeen committed Mar 31, 2021
    Configuration menu
    Copy the full SHA
    08eef25 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2021

  1. Add PHP Dependencies to README 

    On a fresh machine, I found that not all PHP dependencies were fully resolved prior to building, after running "composer create-project linnovate/openideal-composer openideal" as per the doc. I don't have the expertise to add these dependencies to the build process, but this temporary doc update will shorten the google-aided learning curve for new users until these dependencies are resolved in the build process, if that's possible.
    @bussardrobbie
    bussardrobbie committed May 12, 2021
    Configuration menu
    Copy the full SHA
    056c74a View commit details
    Browse the repository at this point in the history

Commits on May 13, 2021

  1. Remove Specific Dependencies - Introduce Drupal 

    Removed specifics about dependencies, as these were based upon Drupal. Added an intro to Drupal and resource links to install prior to moving forward with the install/build process for OpenIdeaL.
    @bussardrobbie
    bussardrobbie committed May 13, 2021
    Configuration menu
    Copy the full SHA
    4743c9c View commit details
    Browse the repository at this point in the history

Commits on May 27, 2021

  1. Changed phrasing a bit

    @zohar
    zohar committed May 27, 2021
    Configuration menu
    Copy the full SHA
    d1aa560 View commit details
    Browse the repository at this point in the history

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

    README Doc Clarifications
    @zohar
    zohar committed May 27, 2021
    Configuration menu
    Copy the full SHA
    5266da7 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2022

  1. attempting to fix build problems with lionel!

    @liorkesos
    liorkesos committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    45b85d7 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2022

  1. Exclude composer generated

    @heyyo-droid
    heyyo-droid committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    e1d5c11 View commit details
    Browse the repository at this point in the history

  2. Add compatibility to composer 2

    @heyyo-droid
    heyyo-droid committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    7158d56 View commit details
    Browse the repository at this point in the history

  3. Merge pull request linnovate#197 from linnovate/exclude-composer-gene… 

    …rated

Exclude composer generated
    @heyyo-droid
    heyyo-droid committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    8cd7332 View commit details
    Browse the repository at this point in the history

  4. Merge pull request linnovate#198 from linnovate/composer2-compatibility 

    Add compatibility to composer 2
    @heyyo-droid
    heyyo-droid committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    2731c12 View commit details
    Browse the repository at this point in the history

  5. Add missing module realname

    @heyyo-droid
    heyyo-droid committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    bd47304 View commit details
    Browse the repository at this point in the history

  6. Merge pull request linnovate#199 from linnovate/missing-realname 

    Add missing module realname
    @heyyo-droid
    heyyo-droid committed Jan 21, 2022
    Configuration menu
    Copy the full SHA
    ca55e76 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2022

  1. Upgrade CKEditor plugins

    @heyyo-droid
    heyyo-droid committed Feb 20, 2022
    Configuration menu
    Copy the full SHA
    42491c8 View commit details
    Browse the repository at this point in the history

  2. Add CKEditor plugins: links + fakeobjects

    @heyyo-droid
    heyyo-droid committed Feb 20, 2022
    Configuration menu
    Copy the full SHA
    2c2d90a View commit details
    Browse the repository at this point in the history

  3. Merge pull request linnovate#201 from linnovate/missing_ckeditor_plugins 

    Missing ckeditor plugins
    @heyyo-droid
    heyyo-droid committed Feb 20, 2022
    Configuration menu
    Copy the full SHA
    d068b5b View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2022

  1. Update composer.json 

    Stick to voting_api ^3.0@beta instead of dev branch to keep compatibility to Drupal 8.8
    @heyyo-droid
    heyyo-droid committed Apr 24, 2022
    Configuration menu
    Copy the full SHA
    3b7d197 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @heyyo-droid
    heyyo-droid committed Apr 24, 2022
    Configuration menu
    Copy the full SHA
    0886012 View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2022

  1. Update README.md 

    Recommendation to use composer 2
    @heyyo-droid
    heyyo-droid committed Apr 25, 2022
    Configuration menu
    Copy the full SHA
    bd129ab View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2022

  1. Update README.md

    @heyyo-droid
    heyyo-droid committed Apr 26, 2022
    Configuration menu
    Copy the full SHA
    3867825 View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @heyyo-droid
    heyyo-droid committed Apr 26, 2022
    Configuration menu
    Copy the full SHA
    2b71546 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2022

  1. Update composer.json

    @heyyo-droid
    heyyo-droid committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    46f6b24 View commit details
    Browse the repository at this point in the history

  2. Merge pull request linnovate#210 from linnovate/fix-unlimited-number-… 

    …version

Update composer.json
    @heyyo-droid
    heyyo-droid committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    15b815f View commit details
    Browse the repository at this point in the history

  3. Update composer.json

    @heyyo-droid
    heyyo-droid committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    9c0d45b View commit details
    Browse the repository at this point in the history

  4. Merge pull request linnovate#211 from linnovate/fix-unlimited-number-… 

    …version-1

Fix unlimited number version
    @heyyo-droid
    heyyo-droid committed Jul 31, 2022
    Configuration menu
    Copy the full SHA
    c959b27 View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2022

  1. Allow emojis in comments

    @heyyo-droid
    heyyo-droid committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    c9a855e View commit details
    Browse the repository at this point in the history

  2. Add library ckeditor/emojione

    @heyyo-droid
    heyyo-droid committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    bd5800d View commit details
    Browse the repository at this point in the history

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

    Emoji in comments
    @heyyo-droid
    heyyo-droid committed Aug 7, 2022
    Configuration menu
    Copy the full SHA
    44a22c4 View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2022

  1. Set Ajax_comments version to 1.0-beta4

    @heyyo-droid
    heyyo-droid committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    c79df20 View commit details
    Browse the repository at this point in the history

  2. Merge pull request linnovate#213 from linnovate/set-ajax_comments-ver… 

    …sion

Set Ajax_comments version to 1.0-beta4
    @heyyo-droid
    heyyo-droid committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    dfdcca6 View commit details
    Browse the repository at this point in the history

Commits on Mar 2, 2023

  1. Changed context to context_definitions

    @rustam-miagdeev
    rustam-miagdeev committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    378ce79 View commit details
    Browse the repository at this point in the history

  2. Updated install configs

    @rustam-miagdeev
    rustam-miagdeev committed Mar 2, 2023
    Configuration menu
    Copy the full SHA
    f16b539 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2023

  1. Fixed trusted callback errors

    @rustam-miagdeev
    rustam-miagdeev committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    0e6bf62 View commit details
    Browse the repository at this point in the history

  2. Fixed notices of accessCheck()

    @rustam-miagdeev
    rustam-miagdeev committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    7757f7d View commit details
    Browse the repository at this point in the history

  3. Updated configs regarding Drupal 9

    @rustam-miagdeev
    rustam-miagdeev committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    e83ecd2 View commit details
    Browse the repository at this point in the history

  4. Updated version of modules and patch section

    @rustam-miagdeev
    rustam-miagdeev committed Mar 3, 2023
    Configuration menu
    Copy the full SHA
    b5e76f5 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2023

  1. Added patch for fixing an error during config import

    @rustam-miagdeev
    rustam-miagdeev committed Mar 18, 2023
    Configuration menu
    Copy the full SHA
    5b28e19 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2023

  1. Fixed errors with context definitions in openideal_demo_content

    @rustam-miagdeev
    rustam-miagdeev committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    5d26da8 View commit details
    Browse the repository at this point in the history

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

    Upgrade to drupal9
    @heyyo-droid
    heyyo-droid committed Mar 20, 2023
    Configuration menu
    Copy the full SHA
    35b08be View commit details
    Browse the repository at this point in the history

Commits on Apr 12, 2023

  1. Fixed an issue during composer install

    @rustam-miagdeev
    rustam-miagdeev committed Apr 12, 2023
    Configuration menu
    Copy the full SHA
    6cd28ec View commit details
    Browse the repository at this point in the history

Commits on Apr 13, 2023

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

    Fixed an issue during composer install
    @heyyo-droid
    heyyo-droid committed Apr 13, 2023
    Configuration menu
    Copy the full SHA
    852ce76 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2023

  1. Fixed compatibility with PHP 8 errors

    @rustam-miagdeev
    rustam-miagdeev committed Apr 29, 2023
    Configuration menu
    Copy the full SHA
    dcd37a7 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2023

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

    Fixed compatibility with PHP 8.2
    @heyyo-droid
    heyyo-droid committed May 2, 2023
    Configuration menu
    Copy the full SHA
    eb513f9 View commit details
    Browse the repository at this point in the history

Commits on May 11, 2023

  1. Set version of votingapi_reaction compatible with Drupal 8

    @rustam-miagdeev
    rustam-miagdeev committed May 11, 2023
    Configuration menu
    Copy the full SHA
    a63ec8e View commit details
    Browse the repository at this point in the history

  2. Merge pull request linnovate#225 from rustam-miagdeev/fixed_version_v… 

    …otingapi_reaction

Fixed version votingapi reaction
    @heyyo-droid
    heyyo-droid committed May 11, 2023
    Configuration menu
    Copy the full SHA
    02f6f31 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2023

  1. Applied patch to rules to be compatible with PHP 8.1

    @rustam-miagdeev
    rustam-miagdeev committed May 21, 2023
    Configuration menu
    Copy the full SHA
    aa5ad84 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2023

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

    Fixed PHP 8.1 issue for Rules
    @heyyo-droid
    heyyo-droid committed May 22, 2023
    Configuration menu
    Copy the full SHA
    8b2daa3 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. Fix Drupal 9 version

    @heyyo-droid
    heyyo-droid committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    2c41497 View commit details
    Browse the repository at this point in the history

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

    Fixes for Drupal 9 version
    @heyyo-droid
    heyyo-droid committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    15f37a1 View commit details
    Browse the repository at this point in the history

  3. Revert "Fixes for Drupal 9 version"

    @heyyo-droid
    heyyo-droid committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    1561003 View commit details
    Browse the repository at this point in the history

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

    Revert "Fixes for Drupal 9 version"
    @heyyo-droid
    heyyo-droid committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    7a3b826 View commit details
    Browse the repository at this point in the history

Commits on Jan 30, 2024

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

    @rustam-miagdeev
    rustam-miagdeev committed Jan 30, 2024
    Configuration menu
    Copy the full SHA
    f4ca58e View commit details
    Browse the repository at this point in the history