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

WIP Create friends ACL and get rid of ACCESS_FRIENDS #11387

Closed
wants to merge 86 commits into from
Closed

WIP Create friends ACL and get rid of ACCESS_FRIENDS #11387

wants to merge 86 commits into from

Commits on Nov 15, 2017

  1. chore(seeding): process faker image from local file

    @jeabakker
    jeabakker committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    b3ef685 View commit details
    Browse the repository at this point in the history

  2. chore(tests): report code coverage to scrutinizer

    @jeabakker
    jeabakker committed Nov 15, 2017
    Configuration menu
    Copy the full SHA
    4bffc4c View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2017

  1. chore(travis): prevent composer timeout during seeding 

    Using composer to call the (un)seeding script can cause timeouts,
calling the script direclty avoids this issue.
    @jeabakker
    jeabakker committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    c55926b View commit details
    Browse the repository at this point in the history

  2. Merge pull request Elgg#11394 from jeabakker/seeder-image-processing-2 

    chore(seeding): process faker image from local file
    @jdalsem
    jdalsem committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    286152d View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2017

  1. chore(core): support parent function arguments in ElggSite::delete 

    ref Elgg#11399
    @jeabakker
    jeabakker committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    3dc70ae View commit details
    Browse the repository at this point in the history

  2. Merge pull request Elgg#11436 from jeabakker/site-delete-23 

    chore(core): support parent function arguments in ElggSite::delete
    @jdalsem
    jdalsem committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    108e240 View commit details
    Browse the repository at this point in the history

  3. wip friends acl

    @jdalsem
    jdalsem committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    75261ab View commit details
    Browse the repository at this point in the history

  4. more acl work

    @jdalsem
    jdalsem committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    7fdc81d View commit details
    Browse the repository at this point in the history

  5. fixed comments

    @jdalsem
    jdalsem committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    5f8d11e View commit details
    Browse the repository at this point in the history

  6. function docs

    @jdalsem
    jdalsem committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    6b15d6a View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'remote/2.3' into upmerge-23 

    Conflicts:
	.travis.yml
	composer.json
	engine/classes/Elgg/Database/Seeds/Seed.php
	engine/classes/ElggSite.php
    @jeabakker
    jeabakker committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    f643c66 View commit details
    Browse the repository at this point in the history

  8. fix(i18n): fallback to site language before English 

    fixes Elgg#4389
    @jeabakker
    jeabakker committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    e9f5d9d View commit details
    Browse the repository at this point in the history

  9. chore(groups): fixed dropdown content for owner transfer 

    fixes Elgg#11383
    @jdalsem
    jdalsem committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    2cbc5f9 View commit details
    Browse the repository at this point in the history

  10. feat(discussion): replies have been moved to comments 

    fixes Elgg#10217, Elgg#8458, Elgg#11424, Elgg#9762
    @jeabakker
    jeabakker committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    9549d7e View commit details
    Browse the repository at this point in the history

  11. Merge pull request Elgg#11438 from jeabakker/upmerge-23 

    Upmerge 2.3 into master
    @jeabakker
    jeabakker committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    3d348f1 View commit details
    Browse the repository at this point in the history

  12. chore(developers): restore entity_explorer menu item 

    fixes Elgg#11441
    @jeabakker
    jeabakker committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    6038515 View commit details
    Browse the repository at this point in the history

  13. chore(developers): replace deprecated function usage

    @jeabakker
    jeabakker committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    1f9525a View commit details
    Browse the repository at this point in the history

  14. feat(forms): form_vars and body_vars are now available in the footer 

    fixes Elgg#11398
    @jeabakker
    jeabakker committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    b823e60 View commit details
    Browse the repository at this point in the history

  15. Merge pull request Elgg#11425 from jeabakker/language-fallback 

    fix(i18n): fallback to site language before English
    @jdalsem
    jdalsem committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    333239e View commit details
    Browse the repository at this point in the history

  16. Merge pull request Elgg#11439 from jdalsem/group-dropdown 

    chore(groups): fixed dropdown content for owner transfer
    @jdalsem
    jdalsem committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    4b507fc View commit details
    Browse the repository at this point in the history

  17. Merge pull request Elgg#11431 from jeabakker/discussion-reply-to-comment 

    feat(discussion): replies have been moved to comments
    @jdalsem
    jdalsem committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    d1bdb70 View commit details
    Browse the repository at this point in the history

  18. Merge pull request Elgg#11442 from jeabakker/developers-entity-explor… 

    …er-menu

chore(developers): restore entity_explorer menu item
    @jdalsem
    jdalsem committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    80f3261 View commit details
    Browse the repository at this point in the history

  19. Merge pull request Elgg#11443 from jeabakker/form-footer-vars 

    feat(forms): form_vars and body_vars are now available in the footer
    @jdalsem
    jdalsem committed Nov 30, 2017
    Configuration menu
    Copy the full SHA
    9dfb83b View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2017

  1. fix(tests): moved incorrect registered test to correct location

    @jeabakker
    jeabakker committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    ba7c894 View commit details
    Browse the repository at this point in the history

  2. fix(tests): incorrect filename for test registration

    @jeabakker
    jeabakker committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    9af357b View commit details
    Browse the repository at this point in the history

  3. fix(tests): correct registration of view path

    @jeabakker
    jeabakker committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    950da0d View commit details
    Browse the repository at this point in the history

  4. fix(tests): correct validation of action path

    @jeabakker
    jeabakker committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    232a87b View commit details
    Browse the repository at this point in the history

  5. Merge pull request Elgg#11448 from jeabakker/test-fixes 

    Test fixes
    @jdalsem
    jdalsem committed Dec 1, 2017
    Configuration menu
    Copy the full SHA
    aa5cba0 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2017

  1. deprecate(breadcrumbs): breadcrumbs now use href instead of link 

    Fixes Elgg#10345
    @jdalsem
    jdalsem committed Dec 4, 2017
    Configuration menu
    Copy the full SHA
    6e7235a View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2017

  1. feat(navigation): breadcrumbs is now a menu

    @jdalsem
    jdalsem committed Dec 5, 2017
    Configuration menu
    Copy the full SHA
    b6ba043 View commit details
    Browse the repository at this point in the history

  2. Merge pull request Elgg#11101 from jdalsem/breadcrumb-href 

    Breadcrumb href
    @jdalsem
    jdalsem committed Dec 5, 2017
    Configuration menu
    Copy the full SHA
    ccca8d3 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'remote/2.3' into upmerge-23-20171205 

    Conflicts:
	engine/tests/phpunit/Elgg/ActionsServiceTest.php
	engine/tests/phpunit/Elgg/Database/PluginsTest.php
	engine/tests/phpunit/Elgg/ViewsServiceTest.php
    @jeabakker
    jeabakker committed Dec 5, 2017
    Configuration menu
    Copy the full SHA
    9c1eca7 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2017

  1. Merge pull request Elgg#11451 from jeabakker/upmerge-23-20171205 

    Upmerge 2.3 to master
    @jdalsem
    jdalsem committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    7cf6f16 View commit details
    Browse the repository at this point in the history

  2. chore(release): v2.3.5

    @jeabakker
    jeabakker committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    675a650 View commit details
    Browse the repository at this point in the history

  3. Merge pull request Elgg#11452 from jeabakker/release-2.3.5 

    chore(release): v2.3.5
    @jdalsem
    jdalsem committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    00e90aa View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'remote/2.3' into upmerge-2.3.5 

    Conflicts:
	composer.json
	composer.lock
	docs/locale/pot/contribute.pot
    @jeabakker
    jeabakker committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    e049379 View commit details
    Browse the repository at this point in the history

  5. feat(ckeditor): updated to full ckeditor v4.7.3 using composer 

    fixes Elgg#10968
fixes Elgg#9283
    @jdalsem
    jdalsem committed Dec 6, 2017
    Configuration menu
    Copy the full SHA
    dbedc19 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2017

  1. Merge pull request Elgg#11454 from jeabakker/upmerge-2.3.5 

    Upmerge 2.3.5
    @jdalsem
    jdalsem committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    61c1ea6 View commit details
    Browse the repository at this point in the history

  2. fix(navigation): correct container set on title menu button 

    When viewing another users content listing page the title menu button
'add content' could point to the wrong container, namely the listed user
instead of the current logged in user.
Now the button points to the current logged in user

fixes: Elgg#10846
    @jeabakker
    jeabakker committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    77c8f00 View commit details
    Browse the repository at this point in the history

  3. Merge pull request Elgg#11455 from jeabakker/register-add-title-button2 

    fix(navigation): correct container set on title menu button
    @jdalsem
    jdalsem committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    3e1222e View commit details
    Browse the repository at this point in the history

  4. Merge pull request Elgg#11453 from jdalsem/ckeditor5 

    feat(ckeditor): updated to full ckeditor v4.7.3 using composer
    @jdalsem
    jdalsem committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    493746f View commit details
    Browse the repository at this point in the history

  5. feat(members): use filter menu and resource views for the pages 

    fixes Elgg#10313
    @jdalsem
    jdalsem committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    f4b780a View commit details
    Browse the repository at this point in the history

  6. feat(members): added members tabs to member search page 

    fixes Elgg#11298
    @jdalsem
    jdalsem committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    27274ac View commit details
    Browse the repository at this point in the history

  7. chore(users): correctly update last_action for ElggUser 

    fixes Elgg#11306
    @jdalsem
    jdalsem committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    517a537 View commit details
    Browse the repository at this point in the history

  8. feat(views): object/elements/imprint/time now support a href on the time

    @jdalsem
    jdalsem committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    7db4811 View commit details
    Browse the repository at this point in the history

  9. feat(comments): submitting comments is now ajaxed 

    fixes Elgg#8133
fixes Elgg#8068
    @jdalsem
    jdalsem committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    c875b2c View commit details
    Browse the repository at this point in the history

  10. fix(cron): log correct completed time in cron monitor 

    fixes Elgg#10797
    @jeabakker
    jeabakker committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    e4a6619 View commit details
    Browse the repository at this point in the history

  11. Merge pull request Elgg#11457 from jdalsem/member-fixes 

    Member fixes
    @jdalsem
    jdalsem committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    a3bbde0 View commit details
    Browse the repository at this point in the history

  12. feat(likes): like annotation access is no longer linked to entity access 

    fixes Elgg#10981
    @jdalsem
    jdalsem committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    ab7336b View commit details
    Browse the repository at this point in the history

  13. fix(cron): cron/run endpoint calls intervals reliably 

    fixes Elgg#8918
fixes Elgg#10803
    @jeabakker
    jeabakker committed Dec 7, 2017
    Configuration menu
    Copy the full SHA
    9c37d92 View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2017

  1. Merge pull request Elgg#11449 from jdalsem/ajax-comments 

    Ajax comments
    @jdalsem
    jdalsem committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    d2faba3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request Elgg#11462 from jdalsem/likes-access 

    feat(likes): like annotation access is no longer linked to entity access
    @jdalsem
    jdalsem committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    7c207c0 View commit details
    Browse the repository at this point in the history

  3. Merge pull request Elgg#11463 from jeabakker/cron-misc 

    Cron fixes
    @jdalsem
    jdalsem committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    5633197 View commit details
    Browse the repository at this point in the history

  4. feat(search): adds a new core search service 

    Adds a new search service that behaves similar to elgg_get_entities()

BREAKING CHANGE
Most of search plugin views have been removed or updated
Tag search has been combined with entity search.
Some of the search behavior may have changed, search hooks have been deprecated.

Fixes Elgg#7392
Fixed Elgg#11330
Fixes Elgg#11274
Fixes Elgg#7062
Fixed Elgg#3549
    @hypeJunction
    hypeJunction committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    c359fec View commit details
    Browse the repository at this point in the history

  5. feat(core): elgg_get_config supports a default value if config not set

    @jdalsem
    jdalsem committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    6693b8a View commit details
    Browse the repository at this point in the history

  6. Merge pull request Elgg#11447 from hypeJunction/search 

    feat(search): adds a new core search service
    @jeabakker
    jeabakker committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    ada6b9b View commit details
    Browse the repository at this point in the history

  7. feat(views): friendly time switches to date format after a few days 

    The amount of days can be configured by the site admin.

Fixes Elgg#9897
    @jdalsem
    jdalsem committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    85abca3 View commit details
    Browse the repository at this point in the history

  8. chore(groups): removed old upgrade file 

    fixes Elgg#11461
    @jdalsem
    jdalsem committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    f81cf8d View commit details
    Browse the repository at this point in the history

  9. chore(search): cleanup of some issues after big refactor

    @jdalsem
    jdalsem committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    5de3aa2 View commit details
    Browse the repository at this point in the history

  10. chore(ckeditor): removed some dependent plugins in config

    @jdalsem
    jdalsem committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    38c8816 View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2017

  1. chore(sql): removes reverse_order_by query option 

    All usages have been replaced by explicit `order_by` values.

Fixes Elgg#11460

BREAKING CHANGE:
`reverse_order_by` in $options is ignored.
    @mrclay
    mrclay committed Dec 9, 2017
    Configuration menu
    Copy the full SHA
    f155550 View commit details
    Browse the repository at this point in the history

  2. chore(messages): unread count works again 

    Fixes Elgg#11476
    @hypeJunction @jdalsem
    hypeJunction authored and jdalsem committed Dec 9, 2017
    Configuration menu
    Copy the full SHA
    b4892e5 View commit details
    Browse the repository at this point in the history

  3. Merge pull request Elgg#11480 from mrclay/11460_reverse 

    chore(sql): removes reverse_order_by query option
    @jdalsem
    jdalsem committed Dec 9, 2017
    Configuration menu
    Copy the full SHA
    4675099 View commit details
    Browse the repository at this point in the history

  4. Merge pull request Elgg#11473 from jdalsem/small-master-fixes 

    Small master fixes
    @jdalsem
    jdalsem committed Dec 9, 2017
    Configuration menu
    Copy the full SHA
    f26d94d View commit details
    Browse the repository at this point in the history

  5. Merge pull request Elgg#11466 from jdalsem/friendly-time 

    Friendly time
    @jdalsem
    jdalsem committed Dec 9, 2017
    Configuration menu
    Copy the full SHA
    cb9ef60 View commit details
    Browse the repository at this point in the history

  6. Merge pull request Elgg#11472 from jdalsem/groups-upgrade 

    chore(groups): removed old upgrade file
    @jdalsem
    jdalsem committed Dec 9, 2017
    Configuration menu
    Copy the full SHA
    60f1317 View commit details
    Browse the repository at this point in the history

  7. fix(views): clean up of class attribute usage 

    Fixes Elgg#11468
    @mrclay
    mrclay committed Dec 9, 2017
    Configuration menu
    Copy the full SHA
    6b3edaf View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2017

  1. Merge pull request Elgg#11481 from mrclay/class_list 

    fix(views): clean up of class attribute usage
    @jdalsem
    jdalsem committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    d22ca00 View commit details
    Browse the repository at this point in the history

  2. feat(tests): travis now also test on PHP 7.2 

    fixes Elgg#11444
    @jdalsem
    jdalsem committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    5089dcb View commit details
    Browse the repository at this point in the history

  3. chore(i18n): plugin translations have been cleaned 

    fixes Elgg#10261
    @jdalsem
    jdalsem committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    a117449 View commit details
    Browse the repository at this point in the history

  4. Merge pull request Elgg#11474 from jdalsem/travis-php-7-2 

    feat(tests): travis now also test on PHP 7.2
    @jdalsem
    jdalsem committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    865cf04 View commit details
    Browse the repository at this point in the history

  5. Merge pull request Elgg#11467 from jdalsem/plugin-translations 

    chore(i18n): plugin translations have been cleaned
    @jdalsem
    jdalsem committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    b0763d4 View commit details
    Browse the repository at this point in the history

  6. chore(search): updated usage of elgg_search in plugins 

    fixes Elgg#8724
    @jdalsem
    jdalsem committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    4bac62f View commit details
    Browse the repository at this point in the history

  7. feat(theme): new theme 

    Implements a new theme

BREAKING CHANGE
Most of the CSS has been rewritten, which will probably affect plugins
and themes. Plugins will need to adapt to new styling guidelines.

Fixes Elgg#11134
Fixes Elgg#10201
Fixes Elgg#7658
Fixes Elgg#10857
Fixes Elgg#10316
Fixes Elgg#4762
Fixes Elgg#11245
Fixes Elgg#6912
    @hypeJunction
    hypeJunction committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    521041d View commit details
    Browse the repository at this point in the history

  8. Merge pull request Elgg#11484 from jdalsem/plugin-search 

    chore(search): updated usage of elgg_search in plugins
    @jdalsem
    jdalsem committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    9c744f7 View commit details
    Browse the repository at this point in the history

  9. Merge pull request Elgg#11395 from jeabakker/code-coverage 

    chore(tests): report code coverage to scrutinizer
    @jdalsem
    jdalsem committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    265d4bc View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' into css

    @hypeJunction
    hypeJunction committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    2504a58 View commit details
    Browse the repository at this point in the history

  11. Merge pull request Elgg#11477 from hypeJunction/css 

    feat(theme): improve the design
    @jdalsem
    jdalsem committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    4629570 View commit details
    Browse the repository at this point in the history

  12. chore(theme): fix widget layouts

    @hypeJunction
    hypeJunction committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    858c4ac View commit details
    Browse the repository at this point in the history

  13. chore(theme): bring back admin layout header

    @hypeJunction
    hypeJunction committed Dec 11, 2017
    Configuration menu
    Copy the full SHA
    fe57ca5 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2017

  1. Merge pull request Elgg#11488 from hypeJunction/widgets 

    Theme fixes
    @jdalsem
    jdalsem committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    3003357 View commit details
    Browse the repository at this point in the history

  2. wip friends acl

    @jdalsem
    jdalsem committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    bc18bbb View commit details
    Browse the repository at this point in the history

  3. more acl work

    @jdalsem
    jdalsem committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    835fc32 View commit details
    Browse the repository at this point in the history

  4. fixed comments

    @jdalsem
    jdalsem committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    1d8061d View commit details
    Browse the repository at this point in the history

  5. function docs

    @jdalsem
    jdalsem committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    2137b39 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'friends_acl_last_time' of git@github.com:jdalsem/Elgg.git 

    into friends_acl_last_time

Conflicts:
	docs/appendix/upgrade-notes/2.x-to-3.0.rst
    @jdalsem
    jdalsem committed Dec 12, 2017
    Configuration menu
    Copy the full SHA
    632b5bf View commit details
    Browse the repository at this point in the history