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

Better UI dependency management and code path #324

Merged
merged 24 commits into from
Feb 20, 2016
Merged

Better UI dependency management and code path #324

merged 24 commits into from
Feb 20, 2016

Commits on Feb 15, 2016

  1. top-level composer file for skin

    @DawoudIO
    DawoudIO committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    1cf1a3f View commit details
    Browse the repository at this point in the history

  2. mount the crm under dev/churchcrm

    @DawoudIO
    DawoudIO committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    865dcdc View commit details
    Browse the repository at this point in the history

  3. added top level composer ignore

    @DawoudIO
    DawoudIO committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    c2b699c View commit details
    Browse the repository at this point in the history

  4. "almasaeed2010/adminlte": "driftyco/ionicons": "2.0.1" "components/f… 

    …ont-awesome": all moved from vendor dir to skin dir inside church info
    @DawoudIO
    DawoudIO committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    8bce8ee View commit details
    Browse the repository at this point in the history

  5. "driftyco/ionicons": "2.0.1", 

        "components/font-awesome": "4.5.0"

    added to the skin dir for usage later on
    @DawoudIO
    DawoudIO committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    cf9d91e View commit details
    Browse the repository at this point in the history

  6. moved adminlte from chuchinfo composer to top level skin composer

    @DawoudIO
    DawoudIO committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    37926ce View commit details
    Browse the repository at this point in the history

  7. removed unsed extra

    @DawoudIO
    DawoudIO committed Feb 15, 2016
    Configuration menu
    Copy the full SHA
    7969641 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2016

  1. moved skin build to its own .sh file

    @DawoudIO
    DawoudIO committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    22897d8 View commit details
    Browse the repository at this point in the history

  2. added ionicons

    @DawoudIO
    DawoudIO committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    353ddb9 View commit details
    Browse the repository at this point in the history

  3. fixed wrong sub folder

    @DawoudIO
    DawoudIO committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    1430470 View commit details
    Browse the repository at this point in the history

  4. removed wrong dir

    @DawoudIO
    DawoudIO committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    4b44119 View commit details
    Browse the repository at this point in the history

  5. added missing files due to bad copy

    @DawoudIO
    DawoudIO committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    d928c25 View commit details
    Browse the repository at this point in the history

  6. fixed copy script, also now cleans up old copies before it moves things

    @DawoudIO
    DawoudIO committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    321c7b1 View commit details
    Browse the repository at this point in the history

  7. offline support for icon/fonts

    @DawoudIO
    DawoudIO committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    97d6eeb View commit details
    Browse the repository at this point in the history

  8. almasaeed2010 using new build system at new home under /skin

    @DawoudIO
    DawoudIO committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    8fdfbc7 View commit details
    Browse the repository at this point in the history

  9. updated adminlte ref to use the new skin location

    @DawoudIO
    DawoudIO committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    3389bab View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' into build-systems

    @DawoudIO
    DawoudIO committed Feb 16, 2016
    Configuration menu
    Copy the full SHA
    0089573 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2016

  1. fixed merge issues

    @DawoudIO
    DawoudIO committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    75619de View commit details
    Browse the repository at this point in the history

  2. fixed line ending

    @DawoudIO
    DawoudIO committed Feb 17, 2016
    Configuration menu
    Copy the full SHA
    7de9614 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2016

  1. - removed extra mapping of folder which moved /vagrant 

    - fixed build-skin.sh Line ending
    @DawoudIO
    DawoudIO committed Feb 20, 2016
    Configuration menu
    Copy the full SHA
    aab243b View commit details
    Browse the repository at this point in the history

  2. - fixed Line ending

    @DawoudIO
    DawoudIO committed Feb 20, 2016
    Configuration menu
    Copy the full SHA
    60e556d View commit details
    Browse the repository at this point in the history

  3. - updated build path to /vagrant

    @DawoudIO
    DawoudIO committed Feb 20, 2016
    Configuration menu
    Copy the full SHA
    5262b3f View commit details
    Browse the repository at this point in the history

  4. - added how to update skin

    @DawoudIO
    DawoudIO committed Feb 20, 2016
    Configuration menu
    Copy the full SHA
    3de69fe View commit details
    Browse the repository at this point in the history

  5. develop merge

    @DawoudIO
    DawoudIO committed Feb 20, 2016
    Configuration menu
    Copy the full SHA
    1880b02 View commit details
    Browse the repository at this point in the history