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

Iks branch merge #50

Merged
merged 80 commits into from
Mar 25, 2012
Merged

Iks branch merge #50

merged 80 commits into from
Mar 25, 2012

Commits on Nov 28, 2011

  1. Added support for subjects

    @fabian
    fabian committed Nov 28, 2011
    Configuration menu
    Copy the full SHA
    590e077 View commit details
    Browse the repository at this point in the history

  2. Renamed to tags

    @fabian
    fabian committed Nov 28, 2011
    Configuration menu
    Copy the full SHA
    58b6c0c View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2011

  1. adjustet markup for article settings

    @podlebar
    Your Name authored and podlebar committed Nov 30, 2011
    Configuration menu
    Copy the full SHA
    20f3979 View commit details
    Browse the repository at this point in the history

  2. added script for jackrabbit

    Vanessa Haenni committed Nov 30, 2011
    Configuration menu
    Copy the full SHA
    cd53ea4 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2011

  1. Use iks branch

    @fabian
    fabian committed Dec 1, 2011
    Configuration menu
    Copy the full SHA
    0e96f74 View commit details
    Browse the repository at this point in the history

  2. Updated VIE

    @fabian
    fabian committed Dec 1, 2011
    Configuration menu
    Copy the full SHA
    2c299e9 View commit details
    Browse the repository at this point in the history

  3. Use latest VieBundle from branch IKS

    @fabian
    fabian committed Dec 1, 2011
    Configuration menu
    Copy the full SHA
    1848d18 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2011

  1. Remove hiddenfield.js 

    Moved to VieBundle
    @fabian
    fabian committed Dec 2, 2011
    Configuration menu
    Copy the full SHA
    7041d0c View commit details
    Browse the repository at this point in the history

  2. Overlay settings

    @fabian
    fabian committed Dec 2, 2011
    Configuration menu
    Copy the full SHA
    fca6278 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2011

  1. Added CSS for Link Panel

    @podlebar
    podlebar committed Dec 5, 2011
    Configuration menu
    Copy the full SHA
    e42dcfd View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2011

  1. Show links

    @fabian
    fabian committed Dec 7, 2011
    Configuration menu
    Copy the full SHA
    e7546d3 View commit details
    Browse the repository at this point in the history

  2. Vie sometimes mixes them

    @fabian
    fabian committed Dec 7, 2011
    Configuration menu
    Copy the full SHA
    e0f970f View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2011

  1. changed location of image.css

    @podlebar
    podlebar committed Dec 8, 2011
    Configuration menu
    Copy the full SHA
    8110c2a View commit details
    Browse the repository at this point in the history

  2. Cleanup

    @fabian
    fabian committed Dec 8, 2011
    Configuration menu
    Copy the full SHA
    13f666d View commit details
    Browse the repository at this point in the history

  3. fixed design for tags

    Vanessa Haenni committed Dec 8, 2011
    Configuration menu
    Copy the full SHA
    3b96def View commit details
    Browse the repository at this point in the history

  4. cleanup: removed VIE stuff

    Vanessa Haenni committed Dec 8, 2011
    Configuration menu
    Copy the full SHA
    a557cdf View commit details
    Browse the repository at this point in the history

  5. cleanup sorted css by id/class

    Vanessa Haenni committed Dec 8, 2011
    Configuration menu
    Copy the full SHA
    7621f95 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2011

  1. Proper menu in fixtures

    @fabian
    fabian committed Dec 9, 2011
    Configuration menu
    Copy the full SHA
    5dc8d14 View commit details
    Browse the repository at this point in the history

  2. Some styling

    @fabian
    fabian committed Dec 9, 2011
    Configuration menu
    Copy the full SHA
    7f201c6 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2011

  1. Fixed navigation position

    @fabian
    fabian committed Dec 12, 2011
    Configuration menu
    Copy the full SHA
    cac7fa6 View commit details
    Browse the repository at this point in the history

  2. Fixed Subpages save

    Vanessa Haenni committed Dec 12, 2011
    Configuration menu
    Copy the full SHA
    151e0c3 View commit details
    Browse the repository at this point in the history

  3. Added base for image upload

    @fabian
    fabian committed Dec 12, 2011
    Configuration menu
    Copy the full SHA
    a4dffea View commit details
    Browse the repository at this point in the history

  4. Set vie_plugins_link_related_path

    @fabian
    fabian committed Dec 12, 2011
    Configuration menu
    Copy the full SHA
    5f63ed0 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2011

  1. dummy response

    @podlebar
    podlebar committed Dec 13, 2011
    Configuration menu
    Copy the full SHA
    9675131 View commit details
    Browse the repository at this point in the history

  2. fixed annotations

    Vanessa Haenni committed Dec 13, 2011
    Configuration menu
    Copy the full SHA
    6dffdb0 View commit details
    Browse the repository at this point in the history

  3. WHITESPACE

    Vanessa Haenni committed Dec 13, 2011
    Configuration menu
    Copy the full SHA
    63ac2ce View commit details
    Browse the repository at this point in the history

  4. added Imagecontroller save image into jackrabbit

    Vanessa Haenni committed Dec 13, 2011
    Configuration menu
    Copy the full SHA
    1500e48 View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2011

  1. fixed construct error

    Vanessa Haenni committed Dec 14, 2011
    Configuration menu
    Copy the full SHA
    c75f4ac View commit details
    Browse the repository at this point in the history

  2. fixed controller return for image upload

    Vanessa Haenni committed Dec 14, 2011
    Configuration menu
    Copy the full SHA
    9556cdf View commit details
    Browse the repository at this point in the history

  3. fixed Pathname problem when no file found

    Vanessa Haenni committed Dec 14, 2011
    Configuration menu
    Copy the full SHA
    c85c418 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2011

  1. CMFE-69 Added tags and removed unneeded setContent method

    @fabian
    fabian committed Dec 15, 2011
    Configuration menu
    Copy the full SHA
    7285291 View commit details
    Browse the repository at this point in the history

  2. CMFE-69 Display image

    @fabian
    fabian committed Dec 15, 2011
    Configuration menu
    Copy the full SHA
    d0c1418 View commit details
    Browse the repository at this point in the history

  3. added langageselecter to header

    Vanessa Haenni committed Dec 15, 2011
    Configuration menu
    Copy the full SHA
    9d2aac5 View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2011

  1. Fixed position of lang

    @fabian
    fabian committed Dec 19, 2011
    Configuration menu
    Copy the full SHA
    fb2b4bc View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2012

  1. Merge branch 'master' of github.com:liip/cmf-sandbox into iks 

    Conflicts:
	deps.lock
    @fabian
    fabian committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    7eca9fa View commit details
    Browse the repository at this point in the history

  2. Updated VieBundle

    @fabian
    fabian committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    8f16826 View commit details
    Browse the repository at this point in the history

  3. RDFa flexibility

    @fabian
    fabian committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    9236808 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'refs/heads/master' into iks 

    Conflicts:
	app/config/routing.yml
	deps.lock
	src/Sandbox/MainBundle/Document/EditableStaticContent.php
	src/Sandbox/MainBundle/Resources/config/services.yml
	src/Sandbox/MainBundle/Resources/data/fixtures/020_LoadNavigationData.php
	src/Sandbox/MainBundle/Resources/data/fixtures/021_LoadRoutingData.php
	src/Sandbox/MainBundle/Resources/data/fixtures/030_LoadMenuData.php
	src/Sandbox/MainBundle/Resources/public/css/style.css
    @fabian
    fabian committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    9164993 View commit details
    Browse the repository at this point in the history

  5. Merge fixes

    @fabian
    fabian committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    5060caa View commit details
    Browse the repository at this point in the history

  6. More merge fixes (in CSS)

    @fabian
    fabian committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    5deb866 View commit details
    Browse the repository at this point in the history

  7. Merge fault

    @fabian
    fabian committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    c94e453 View commit details
    Browse the repository at this point in the history

  8. fixed height for navigation/content

    Vanessa Haenni committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    6766f3d View commit details
    Browse the repository at this point in the history

  9. design navigation

    Vanessa Haenni committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    da2c4f9 View commit details
    Browse the repository at this point in the history

  10. added .DS_Store to .gitignore

    Vanessa Haenni committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    376fbd3 View commit details
    Browse the repository at this point in the history

  11. removed old css stuff

    Vanessa Haenni committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    520b0b8 View commit details
    Browse the repository at this point in the history

  12. deleted rest of NavigationBundle, which got deleted in f9a109e

    Vanessa Haenni committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    5af67ea View commit details
    Browse the repository at this point in the history

  13. fixed background for breadcrumb

    Vanessa Haenni committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    d59fbd7 View commit details
    Browse the repository at this point in the history

  14. added css for createjs new tags

    Vanessa Haenni committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    70eefb9 View commit details
    Browse the repository at this point in the history

  15. bump LiipVieBundle commit-id

    @rndstr
    rndstr committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    eeb8644 View commit details
    Browse the repository at this point in the history

  16. added property to index.hmtl

    Vanessa Haenni committed Feb 6, 2012
    Configuration menu
    Copy the full SHA
    632037d View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2012

  1. updated jack script

    Vanessa Haenni committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    f320b8c View commit details
    Browse the repository at this point in the history

  2. make content textarea

    Vanessa Haenni committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    1dcd4dc View commit details
    Browse the repository at this point in the history

  3. bump LiipVieBundle

    @rndstr
    rndstr committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    5ac8675 View commit details
    Browse the repository at this point in the history

  4. added Liip IP to dev array

    Vanessa Haenni committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    9d7718d View commit details
    Browse the repository at this point in the history

  5. remove deprecated `alias' annotation from Image

    @rndstr
    rndstr committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    1ff44df View commit details
    Browse the repository at this point in the history

  6. add clearfix to article paragraphs

    @rndstr
    rndstr committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    f857450 View commit details
    Browse the repository at this point in the history

  7. bump LiipVieBundle

    @rndstr
    rndstr committed Feb 7, 2012
    Configuration menu
    Copy the full SHA
    1f007d8 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2012

  1. changed to new VIEbundle

    Vanessa Haenni committed Feb 8, 2012
    Configuration menu
    Copy the full SHA
    2fb05e0 View commit details
    Browse the repository at this point in the history

  2. updated css path to new theme

    Vanessa Haenni committed Feb 8, 2012
    Configuration menu
    Copy the full SHA
    04bc953 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2012

  1. Fixed Tags CSS

    @fabian
    fabian committed Feb 9, 2012
    Configuration menu
    Copy the full SHA
    6b90bed View commit details
    Browse the repository at this point in the history

  2. Updated VieBundle

    @fabian
    fabian committed Feb 9, 2012
    Configuration menu
    Copy the full SHA
    77941c5 View commit details
    Browse the repository at this point in the history

  3. Fixed CSS

    @fabian
    fabian committed Feb 9, 2012
    Configuration menu
    Copy the full SHA
    77427b2 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2012

  1. Updated LiipVieBundle

    @fabian
    fabian committed Mar 9, 2012
    Configuration menu
    Copy the full SHA
    bae0912 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refs/heads/iks'

    @fabian
    fabian committed Mar 9, 2012
    Configuration menu
    Copy the full SHA
    ab0b939 View commit details
    Browse the repository at this point in the history

  3. Moved vie_plugins_link_related_path to VieBundle

    @fabian
    fabian committed Mar 9, 2012
    Configuration menu
    Copy the full SHA
    4128afc View commit details
    Browse the repository at this point in the history

  4. Updated VieBundle

    @fabian
    fabian committed Mar 9, 2012
    Configuration menu
    Copy the full SHA
    c70358d View commit details
    Browse the repository at this point in the history

  5. Fixed home link

    @fabian
    fabian committed Mar 9, 2012
    Configuration menu
    Copy the full SHA
    fd5ba4a View commit details
    Browse the repository at this point in the history

  6. Updated VieBundle

    @fabian
    fabian committed Mar 9, 2012
    Configuration menu
    Copy the full SHA
    874a957 View commit details
    Browse the repository at this point in the history

Commits on Mar 14, 2012

  1. don't save tags twice

    Vanessa Hänni committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    d072623 View commit details
    Browse the repository at this point in the history

  2. Updated VieBundle (Fix for Tags)

    @fabian
    fabian committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    b1fb7fe View commit details
    Browse the repository at this point in the history

  3. Update VieBundle

    @fabian
    fabian committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    d4a706e View commit details
    Browse the repository at this point in the history

  4. Added missing path config

    @fabian
    fabian committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    47f611c View commit details
    Browse the repository at this point in the history

  5. Updated VieBundle (Fixed Submodule)

    @fabian
    fabian committed Mar 14, 2012
    Configuration menu
    Copy the full SHA
    12aa6d3 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2012

  1. Updated VieBundle 

    Removed undo/redo
    @fabian
    fabian committed Mar 15, 2012
    Configuration menu
    Copy the full SHA
    2e95d97 View commit details
    Browse the repository at this point in the history

  2. Updated VieBundle

    @fabian
    fabian committed Mar 15, 2012
    Configuration menu
    Copy the full SHA
    13dd45d View commit details
    Browse the repository at this point in the history

  3. Updated VieBundle

    @fabian
    fabian committed Mar 15, 2012
    Configuration menu
    Copy the full SHA
    bc10a36 View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2012

  1. Merge branch 'master' into iks 

    Conflicts:
	deps.lock
	src/Sandbox/MainBundle/Resources/views/skeleton.html.twig
    @lsmith77
    lsmith77 committed Mar 20, 2012
    Configuration menu
    Copy the full SHA
    53eaea7 View commit details
    Browse the repository at this point in the history

  2. latest version is 2.4.0

    @lsmith77
    lsmith77 committed Mar 20, 2012
    Configuration menu
    Copy the full SHA
    4efa731 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2012

  1. removing weird ip from app_dev.php and adding comments to warn about … 

    …hacks
    @dbu
    dbu committed Mar 23, 2012
    Configuration menu
    Copy the full SHA
    18610a8 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2012

  1. Merge remote-tracking branch 'origin/master' into iks

    @lsmith77
    lsmith77 committed Mar 25, 2012
    Configuration menu
    Copy the full SHA
    2937c1a View commit details
    Browse the repository at this point in the history