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

Composer integration #2171

Open
wants to merge 19 commits into
base: develop
Choose a base branch
from
Open

Composer integration #2171

wants to merge 19 commits into from

Commits on Dec 29, 2016

  1. Merge branch 'hotfixes'

    @conejoninja
    conejoninja committed Dec 29, 2016
    Configuration menu
    Copy the full SHA
    fb709a6 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2017

  1. Html Purifier

    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    82d87c2 View commit details
    Browse the repository at this point in the history

  2. Fix php warnings and composer load during installation

    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    2d4e97d View commit details
    Browse the repository at this point in the history

  3. Move php-gettext to composer

    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    e9dd7b2 View commit details
    Browse the repository at this point in the history

  4. Load pclzip lib from composer

    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    626fd7f View commit details
    Browse the repository at this point in the history

  5. Remove libcurlemu as wasnt used. 

    Remove dead code as well
    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    0607896 View commit details
    Browse the repository at this point in the history

  6. Load phpmailer via composer

    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    10577c3 View commit details
    Browse the repository at this point in the history

  7. Remove json lib and custom implementation of json_encode and json_decode 

    Remove the compatibility and custom implementations
as after PHP 5.2 the json extension is loaded by default
    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    892418b View commit details
    Browse the repository at this point in the history

  8. Check is php-extension json is installed on the system

    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    dfc963d View commit details
    Browse the repository at this point in the history

  9. Load phpseclib via composer

    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    ccb2778 View commit details
    Browse the repository at this point in the history

  10. Load askimet via composer

    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    7c64513 View commit details
    Browse the repository at this point in the history

  11. Move images to osclass/assets

    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    9aadcbd View commit details
    Browse the repository at this point in the history

  12. Move images to osclass/assets

    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    866e07a View commit details
    Browse the repository at this point in the history

  13. Add author to composer

    @xiris
    xiris committed Apr 15, 2017
    Configuration menu
    Copy the full SHA
    31fa3fa View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2017

  1. Bcrypt lib loaded by composer

    @xiris
    xiris committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    7fa6fee View commit details
    Browse the repository at this point in the history

  2. Load AjaxUploader via composer

    @xiris
    xiris committed Apr 19, 2017
    Configuration menu
    Copy the full SHA
    423eefe View commit details
    Browse the repository at this point in the history

Commits on Apr 20, 2017

  1. Load recaptcha v1 and v2 from composer

    @xiris
    xiris committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    19cd94c View commit details
    Browse the repository at this point in the history

  2. Merge the current develop and fix conflicts

    @xiris
    xiris committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    5dda65e View commit details
    Browse the repository at this point in the history

  3. Remove phpseclib remaining from conflict solving

    @xiris
    xiris committed Apr 20, 2017
    Configuration menu
    Copy the full SHA
    6a5ba68 View commit details
    Browse the repository at this point in the history