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

Show Images in posts in an image grid #12334

Merged
merged 38 commits into from Dec 12, 2022
Merged

Show Images in posts in an image grid #12334

merged 38 commits into from Dec 12, 2022

Commits on Dec 1, 2022

  1. Merge branch 'develop' into new_image_presentation

    Marek Bachmann committed Dec 1, 2022
    Copy the full SHA
    7e58052 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2022

  1. Merge branch 'develop' into new_image_presentation

    Marek Bachmann committed Dec 3, 2022
    Copy the full SHA
    a660718 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2022

  1. Merge branch 'develop' into new_image_presentation

    Marek Bachmann committed Dec 4, 2022
    Copy the full SHA
    7833da5 View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2022

  1. First draft for using a image grid to display attached images.

    Marek Bachmann committed Dec 5, 2022
    Copy the full SHA
    6753eea View commit details
    Browse the repository at this point in the history

  2. Support more than 2 images

    Marek Bachmann committed Dec 5, 2022
    Copy the full SHA
    fbd4b54 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into new_image_presentation

    Marek Bachmann committed Dec 5, 2022
    Copy the full SHA
    7335435 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into new_image_presentation 

    # Conflicts:
#	src/Object/Image.php
    Marek Bachmann committed Dec 5, 2022
    Copy the full SHA
    76f4ba7 View commit details
    Browse the repository at this point in the history

  5. Revert "Merge branch 'develop' into new_image_presentation" 

    This reverts commit 76f4ba7, reversing
changes made to 7335435.
    Marek Bachmann committed Dec 5, 2022
    Copy the full SHA
    8145454 View commit details
    Browse the repository at this point in the history

  6. First draft for using a image grid to display attached images.

    Marek Bachmann committed Dec 5, 2022
    Copy the full SHA
    7fb0f01 View commit details
    Browse the repository at this point in the history

  7. Support more than 2 images

    Marek Bachmann committed Dec 5, 2022
    Copy the full SHA
    458f22d View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2022

  1. Merge remote-tracking branch 'origin/new_image_presentation' into new… 

    …_image_presentation

# Conflicts:
#	src/Model/Item.php
    Marek Bachmann committed Dec 6, 2022
    Copy the full SHA
    2205ef0 View commit details
    Browse the repository at this point in the history

  2. cleaned up my git mess :-/ anyways, should work now

    Marek Bachmann committed Dec 6, 2022
    Copy the full SHA
    9778b60 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'friendica:develop' into new_image_presentation

    @MarekBenjamin
    MarekBenjamin committed Dec 6, 2022
    Copy the full SHA
    de83be1 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2022

  1. Temporary hack to remove images after last text line by DOM inspection

    Marek Bachmann committed Dec 7, 2022
    Copy the full SHA
    99e20d1 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/new_image_presentation' into new… 

    …_image_presentation
    Marek Bachmann committed Dec 7, 2022
    Copy the full SHA
    c8b43e6 View commit details
    Browse the repository at this point in the history

  3. set character encoding to utf-8 for parsing rendered-html

    Marek Bachmann committed Dec 7, 2022
    Copy the full SHA
    d590df9 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'friendica:2022.12-rc' into new_image_presentation

    @MarekBenjamin
    MarekBenjamin committed Dec 7, 2022
    Copy the full SHA
    74ff7ba View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2022

  1. Image grid logic

    Marek Bachmann committed Dec 8, 2022
    Copy the full SHA
    d270a98 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'friendica:2022.12-rc' into new_image_presentation

    @MarekBenjamin
    MarekBenjamin committed Dec 8, 2022
    Copy the full SHA
    75d857c View commit details
    Browse the repository at this point in the history

  3. Merge branch 'friendica:2022.12-rc' into new_image_presentation

    @MarekBenjamin
    MarekBenjamin committed Dec 8, 2022
    Copy the full SHA
    e86a2e0 View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2022

  1. Merge branch 'friendica:2022.12-rc' into new_image_presentation

    @MarekBenjamin
    MarekBenjamin committed Dec 10, 2022
    Copy the full SHA
    c781157 View commit details
    Browse the repository at this point in the history

  2. Added image grid generation to addVisualAttachments

    Marek Bachmann committed Dec 10, 2022
    Copy the full SHA
    d786f22 View commit details
    Browse the repository at this point in the history

  3. remove old code

    Marek Bachmann committed Dec 10, 2022
    Copy the full SHA
    cc048bc View commit details
    Browse the repository at this point in the history

  4. Added some logic for image grid column balancing

    Marek Bachmann committed Dec 10, 2022
    Copy the full SHA
    2eb170b View commit details
    Browse the repository at this point in the history

  5. Removed not needed image_grid_column.tpl

    Marek Bachmann committed Dec 10, 2022
    Copy the full SHA
    236a4c8 View commit details
    Browse the repository at this point in the history

  6. Removed unused imports

    Marek Bachmann committed Dec 10, 2022
    Copy the full SHA
    412ba46 View commit details
    Browse the repository at this point in the history

  7. Restored $s = $hook_data['html']; call which was removed on error

    Marek Bachmann committed Dec 10, 2022
    Copy the full SHA
    fe2c4f7 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'friendica:2022.12-rc' into new_image_presentation

    @MarekBenjamin
    MarekBenjamin committed Dec 10, 2022
    Copy the full SHA
    1454f3b View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2022

  1. Merge branch 'friendica:2022.12-rc' into new_image_presentation

    @MarekBenjamin
    MarekBenjamin committed Dec 11, 2022
    Copy the full SHA
    23f3188 View commit details
    Browse the repository at this point in the history

  2. fixed bug in portrait iteration 

    shortened var names

added some comments
    Marek Bachmann committed Dec 11, 2022
    Copy the full SHA
    58cc270 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'friendica:2022.12-rc' into new_image_presentation

    @MarekBenjamin
    MarekBenjamin committed Dec 11, 2022
    Copy the full SHA
    a5aa44f View commit details
    Browse the repository at this point in the history

  4. added more sophisticated column balancing logic for portraits and lan… 

    …dscapes
    Marek Bachmann committed Dec 11, 2022
    Copy the full SHA
    eb1cfd0 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'friendica:2022.12-rc' into new_image_presentation

    @MarekBenjamin
    MarekBenjamin committed Dec 11, 2022
    Copy the full SHA
    e4702ed View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2022

  1. Merge branch 'friendica:2022.12-rc' into new_image_presentation

    @MarekBenjamin
    MarekBenjamin committed Dec 12, 2022
    Copy the full SHA
    d2b23d5 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'friendica:2022.12-rc' into new_image_presentation

    @MarekBenjamin
    MarekBenjamin committed Dec 12, 2022
    Copy the full SHA
    c554af9 View commit details
    Browse the repository at this point in the history

  3. Update image_grid.css

    @MarekBenjamin
    MarekBenjamin committed Dec 12, 2022
    Copy the full SHA
    bc70bc2 View commit details
    Browse the repository at this point in the history

  4. Update image_grid.css 

    Removed fall back to one column
    @MarekBenjamin
    MarekBenjamin committed Dec 12, 2022
    Copy the full SHA
    86b9cef View commit details
    Browse the repository at this point in the history

  5. Moved image_grid.css content to global.css and use unique class names… 

    … for imagegrid style classes, removed id for div
    Marek Bachmann committed Dec 12, 2022
    Copy the full SHA
    8690b31 View commit details
    Browse the repository at this point in the history