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.

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

Merge 2.3 into master #10837

Merged
merged 85 commits into from
Mar 20, 2017
Merged

Merge 2.3 into master #10837

merged 85 commits into from
Mar 20, 2017

Commits on Nov 9, 2016

  1. Configuration menu
    Copy the full SHA
    a7277f3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10572 from jdalsem/8898-input-date

    fix(views): corrected syntax error in input/date
    hypeJunction committed Nov 9, 2016
    Configuration menu
    Copy the full SHA
    1db61d8 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2016

  1. Configuration menu
    Copy the full SHA
    3e4dc6a View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2016

  1. Merge pull request Elgg#10633 from iionly/cachelink-no-readlink

    fix(core): Check existence of cache symlink without usage of readlink()
    hypeJunction committed Nov 30, 2016
    Configuration menu
    Copy the full SHA
    d916693 View commit details
    Browse the repository at this point in the history

Commits on Dec 2, 2016

  1. fix(web_services): handle string params with proper escaping

    For string params, `serialize_parameters` outputs a string literal of PHP
    code, and `addcslashes` was not appropriate for this task, particularly
    around escapes in strings. While you can tell it to also escape escape
    chars, a second pass would be needed.
    
    The tests now `eval` the output just as the production code does, and
    this also makes the tests easier to read.
    mrclay committed Dec 2, 2016
    Configuration menu
    Copy the full SHA
    702ce46 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2016

  1. Configuration menu
    Copy the full SHA
    c97934b View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2016

  1. Merge pull request Elgg#10654 from jeabakker/can-comment

    chore: canComment inline with parent class
    jdalsem committed Dec 16, 2016
    Configuration menu
    Copy the full SHA
    da03a61 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7a55677 View commit details
    Browse the repository at this point in the history
  3. Merge pull request Elgg#10640 from mrclay/ws_addc

    fix(web_services): handle string params with proper escaping
    jdalsem committed Dec 16, 2016
    Configuration menu
    Copy the full SHA
    11c4640 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2016

  1. Merge pull request Elgg#10658 from jeabakker/plugin-deps

    chore(admin): fix plugin dependencies styling issue
    jdalsem committed Dec 20, 2016
    Configuration menu
    Copy the full SHA
    06c3a25 View commit details
    Browse the repository at this point in the history

Commits on Dec 23, 2016

  1. chore(plugins): plugins page properly updates on ajax (de)activate

    When a plugin is (de)activated, the updated plugin list now correctly
    shows/hides links to settings pages, and the admin menu is updated
    according to the active plugins.
    
    Fixes Elgg#10656
    mrclay committed Dec 23, 2016
    Configuration menu
    Copy the full SHA
    3020c5d View commit details
    Browse the repository at this point in the history
  2. fix(ajax): elgg/Ajax now uses spinner if 2nd fetch occurs in done han…

    …dler
    
    Without this patch, fetches that occur in a done() handler would not show
    the spinner because jQuery's "complete" handler (which fires after) always
    stopped the spinner.
    mrclay committed Dec 23, 2016
    Configuration menu
    Copy the full SHA
    afef3c4 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2016

  1. fix(ajax): elgg/Ajax view() and form() set $vars as expected

    The `elgg/Ajax` module was auto-converting any request with `options.data`
    to use the `POST` method. This makes sense for things like actions, which
    may send a large amount of form data, but it caused `$vars` to not be
    populated as expected because only `GET` params are injected.
    
    If you specified `options.data` with these methods before, note the server
    will no longer receive this data as `$_POST` on the server.
    
    Fixes Elgg#10667
    mrclay committed Dec 24, 2016
    Configuration menu
    Copy the full SHA
    abf8a9c View commit details
    Browse the repository at this point in the history

Commits on Dec 25, 2016

  1. fix(files): mitigate issues with special chars in file names

    Relative paths to files that contain special characters in the name
    will now be encoded with base64 to avoid malformatted URLs and
    HMAC mismatches resulting from unescaped characters.
    URLs generated prior to this change will continue working.
    
    Refs Elgg#10608
    hypeJunction authored and mrclay committed Dec 25, 2016
    Configuration menu
    Copy the full SHA
    4a7b74e View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2016

  1. Merge pull request Elgg#10673 from mrclay/serve_filename_22

    fix(files): mitigate issues with special chars in file names
    mrclay committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    2ad2509 View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10672 from mrclay/10667_ajax_vars

    fix(ajax): elgg/Ajax view() and form() set $vars as expected
    mrclay committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    b737151 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    61c538f View commit details
    Browse the repository at this point in the history
  4. Merge pull request Elgg#10676 from mrclay/merge_22

    Merge 2.2 into 2.3
    hypeJunction committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    9c9ce51 View commit details
    Browse the repository at this point in the history
  5. chore(release): v2.3.0

    hypeJunction committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    06af500 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    5d4fc2b View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    b7ef1a2 View commit details
    Browse the repository at this point in the history
  8. Merge pull request Elgg#10678 from hypeJunction/release-2.3.0

    chore(release): v2.3.0
    hypeJunction committed Dec 27, 2016
    Configuration menu
    Copy the full SHA
    6ad220a View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2017

  1. fix(discussions): river entries are once again visible to logged out …

    …users
    
    River items about new discussions are once again visible to logged out users.
    Discussion replies (but not the form) will be visible as well.
    
    Replaces Elgg#10685
    hypeJunction committed Jan 5, 2017
    Configuration menu
    Copy the full SHA
    65e6664 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2017

  1. fix(html): elgg_normalize_url() handles tel: links

    Removes cruft for older PHP versions.
    
    Fixes Elgg#10689
    mrclay committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    48a5170 View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10694 from mrclay/10689_tel_23

    fix(html): elgg_normalize_url() handles tel: links
    mrclay committed Jan 9, 2017
    Configuration menu
    Copy the full SHA
    bf1ef0e View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2017

  1. Merge pull request Elgg#10687 from hypeJunction/disc-river

    fix(discussions): river entries are once again visible to logged out …
    jdalsem committed Jan 10, 2017
    Configuration menu
    Copy the full SHA
    ddcbf48 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2017

  1. Configuration menu
    Copy the full SHA
    e42fa63 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2017

  1. Configuration menu
    Copy the full SHA
    e4e316e View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10701 from mrclay/10699_hash_attrs

    fix(views): elgg_view_field no longer leaves #type in attributes
    jdalsem committed Jan 13, 2017
    Configuration menu
    Copy the full SHA
    ac157ba View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2017

  1. Merge pull request Elgg#10697 from mrclay/10696_tables

    fix(views): in table lists, rows now have IDs
    jdalsem committed Jan 19, 2017
    Configuration menu
    Copy the full SHA
    273ab5e View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2017

  1. Configuration menu
    Copy the full SHA
    e75923b View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10717 from johnnymast/1.12

    chore(license): updated license year to 2017
    jdalsem committed Jan 23, 2017
    Configuration menu
    Copy the full SHA
    c711182 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2017

  1. fix(icons): set correct filename for temp resizing file

    The new resize lib expects a valid image extension in order to resize an
    image. Two problems existed, 1 when an image is uploaded it's stored in
    a tmp file without a valid image extension and 2 if called when logged
    out the file destination could not be created.
    jeabakker committed Jan 24, 2017
    Configuration menu
    Copy the full SHA
    aeed706 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2017

  1. chore(release): v1.12.15

    jeabakker committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    a018bd6 View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10727 from jeabakker/release-1.12.15

    chore(release): v1.12.15
    jdalsem committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    a40788b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    4e16cc9 View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'remote/1.12' into 1.12.15-to-2.2

    Conflicts:
    	CHANGELOG.md
    	composer.json
    	views/default/input/date.php
    jdalsem committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    67006fb View commit details
    Browse the repository at this point in the history
  5. Merge pull request Elgg#10729 from jdalsem/1.12.15-to-2.2

    1.12.15 to 2.2
    jdalsem committed Jan 26, 2017
    Configuration menu
    Copy the full SHA
    a1da9e7 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2017

  1. chore(release): v2.2.4

    jeabakker committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    927cabe View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10733 from jeabakker/release-2.2.4

    chore(release): v2.2.4
    jdalsem committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    2e809cf View commit details
    Browse the repository at this point in the history
  3. fix(icons): detect image format for resizing

    Detect the correct image format to use for resizing an image based on
    supplied output format of mimetype of the source image
    
    fixes Elgg#10686
    jeabakker committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    dd9af8a View commit details
    Browse the repository at this point in the history
  4. Merge remote-tracking branch 'remote/2.2' into 2.2-to-2.3

    Conflicts:
    	CHANGELOG.md
    	composer.json
    	docs/locale/pot/about.pot
    	docs/locale/pot/admin.pot
    	docs/locale/pot/appendix.pot
    	docs/locale/pot/contribute.pot
    	docs/locale/pot/design.pot
    	docs/locale/pot/guides.pot
    	docs/locale/pot/index.pot
    	docs/locale/pot/intro.pot
    	docs/locale/pot/plugins.pot
    	docs/locale/pot/tutorials.pot
    jdalsem committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    8562190 View commit details
    Browse the repository at this point in the history
  5. Merge pull request Elgg#10721 from jeabakker/icon-resize

    Icon resize
    jdalsem committed Jan 27, 2017
    Configuration menu
    Copy the full SHA
    6f71d66 View commit details
    Browse the repository at this point in the history

Commits on Jan 28, 2017

  1. Configuration menu
    Copy the full SHA
    aea4503 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2017

  1. chore(docs): update helper functions

    Yanwei Jiang committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    bc9e0b3 View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10743 from YanweiJiang/doc-helper

    chore(docs): update helper functions
    jdalsem committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    c3edd21 View commit details
    Browse the repository at this point in the history
  3. Merge pull request Elgg#10728 from jdalsem/emailsent

    fixed(uservalidationbyemail): unset emailsent after showing it once
    jdalsem committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    313da75 View commit details
    Browse the repository at this point in the history
  4. Merge pull request Elgg#10665 from mrclay/10656_plugin_ajax

    chore(plugins): plugins page properly updates on ajax (de)activate
    jdalsem committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    bea5a0d View commit details
    Browse the repository at this point in the history
  5. fix(admin): prevents simultaneous plugin (de)activation/reordering

    Problems can occur if a plugin order/activation change is requested while
    another change is being executed. This places a semi-opaque cover over the
    plugins list while an operation is executing so that the user cannot start
    another operation.
    
    This will not prevent the problem for users navigating via keyboard.
    
    Fixes Elgg#10706
    mrclay committed Jan 31, 2017
    Configuration menu
    Copy the full SHA
    907c9b6 View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2017

  1. Merge pull request Elgg#10744 from mrclay/10706_plugin_wait

    fix(admin): prevents simultaneous plugin (de)activation/reordering
    jdalsem committed Feb 1, 2017
    Configuration menu
    Copy the full SHA
    8c3a4a9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    99e8a4a View commit details
    Browse the repository at this point in the history
  3. Merge pull request Elgg#10734 from jeabakker/release-docs

    chore(docs): updated the release docs
    jeabakker committed Feb 1, 2017
    Configuration menu
    Copy the full SHA
    04f84c9 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2017

  1. fix(security): random byte generation improved on some systems

    On some Windows systems, `microtime()` is of insufficient precision and
    can yield the same value on multiple calls. In our algorithm this results
    in a divide-by-zero error and a `$rounds` count of `0`, so a little extra
    entropy is lost. There are numerous other entropy sources tapped, so this
    isn't a serious flaw, but here we avoid the error and just fix `$rounds`
    to a reasonable value to pick up a little more entropy.
    
    This issue should affect few systems, as it's a fallback mechanism for
    several better random sources.
    
    This also adds PHP7's `random_bytes` as the first source.
    
    Fixes Elgg#10750
    mrclay committed Feb 3, 2017
    Configuration menu
    Copy the full SHA
    03285ba View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2017

  1. Configuration menu
    Copy the full SHA
    fb57c02 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2017

  1. Merge pull request Elgg#10735 from jdalsem/2.2-to-2.3

    2.2 to 2.3
    jdalsem committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    913cf96 View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10751 from mrclay/better_rand

    fix(security): random byte generation improved on some systems
    jdalsem committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    dab094b View commit details
    Browse the repository at this point in the history
  3. fix(menus): return to default of sorting menus by text

    This was accidentally changed in Elgg#9522, which overhauled menu creation
    for Elgg 2.2.
    
    Fixes Elgg#10737
    mrclay committed Feb 8, 2017
    Configuration menu
    Copy the full SHA
    9636790 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2017

  1. Merge pull request Elgg#10756 from mrclay/10737_menu_sorting

    fix(menus): return to default of sorting menus by text
    jdalsem committed Feb 9, 2017
    Configuration menu
    Copy the full SHA
    c1ff0dd View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2017

  1. Merge pull request Elgg#10711 from iionly/embed-thumbnail-size-fix

    fix(embed): Inserting medium thumbnail size again instead of small on embedding images
    jdalsem committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    ace8d99 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    17d93a5 View commit details
    Browse the repository at this point in the history
  3. Merge pull request Elgg#10765 from jdalsem/comments-edit-ajax

    fixed(comments): use elgg/Ajax to load inline comment form
    jdalsem committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    a691ed7 View commit details
    Browse the repository at this point in the history
  4. Merge pull request Elgg#10755 from jeabakker/ignore-access

    fix(access): use ignore access only when querying the database
    jdalsem committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    8418712 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    be3855a View commit details
    Browse the repository at this point in the history
  6. Merge pull request Elgg#10767 from jeabakker/2.3.1-composer-lock

    chore(composer): update dependencies and regenerate lock
    jdalsem committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    5096428 View commit details
    Browse the repository at this point in the history
  7. chore(release): v2.3.1

    jeabakker committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    d8b4132 View commit details
    Browse the repository at this point in the history
  8. Merge pull request Elgg#10768 from jeabakker/release-2.3.1

    chore(release): v2.3.1
    jdalsem committed Feb 14, 2017
    Configuration menu
    Copy the full SHA
    0ace278 View commit details
    Browse the repository at this point in the history

Commits on Feb 16, 2017

  1. fix(output): elgg_normalize_url() again handles multibyte chars and s…

    …paces
    
    Our use of `filter_var()`/`FILTER_VALIDATE_URL` can now handle multibyte chars.
    
    Previous Elgg versions passed through invalid URLs that contained spaces. Since
    even core code created these URLs, we compromise by auto-encoding spaces rather
    than rejecting those URLs.
    
    Fixes Elgg#10771
    mrclay committed Feb 16, 2017
    Configuration menu
    Copy the full SHA
    62bf31c View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2017

  1. fix(js): make sure elgg.forward() always reloads the page

    If the destination URL has a hash, and the whole URL is identical
    to the current page, we must force `reload()`.
    mrclay committed Feb 17, 2017
    Configuration menu
    Copy the full SHA
    c42b9c9 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2017

  1. docs(security): explains current password hashing

    Documents current practice and legacy issue for older systems.
    
    Fixes Elgg#10778
    mrclay committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    d3affbd View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10779 from mrclay/10778_docs

    docs(security): explains current password hashing
    hypeJunction committed Feb 21, 2017
    Configuration menu
    Copy the full SHA
    0488db6 View commit details
    Browse the repository at this point in the history

Commits on Feb 25, 2017

  1. deprecate(logging): removes warnings about metadata/annotation value …

    …casting
    
    Metadata/annotation casting is now explained in the docs.
    
    Deprecates `detect_extender_valuetype()` and moves its logic to a static
    `ElggExtender` method.
    
    Fixes Elgg#10749
    mrclay committed Feb 25, 2017
    Configuration menu
    Copy the full SHA
    97b2b51 View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2017

  1. Configuration menu
    Copy the full SHA
    bb35cb9 View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10790 from beck24/7740_well_known

    fix(install): explicitly allow .well-known in rewrite rules
    beck24 committed Feb 26, 2017
    Configuration menu
    Copy the full SHA
    baf0c23 View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2017

  1. chore(river): warn devs that elgg_get_river() has no "views" option

    Devs who refactor `elgg_delete_river()` code to use `elgg_get_river()`
    may be surprised that it doesn't support this option.
    
    Fixes Elgg#10791
    mrclay committed Feb 27, 2017
    Configuration menu
    Copy the full SHA
    2ff4e34 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2017

  1. Merge pull request Elgg#10793 from mrclay/10791_del_river_2

    chore(river): warn devs that elgg_get_river() has no "views" option
    beck24 committed Mar 1, 2017
    Configuration menu
    Copy the full SHA
    6c0c82c View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2017

  1. fix(twitter_api): do not feed remote URLs to icon resize API

    Now uses a temporary files to store raw icon bytes
    
    Fixes 10686
    hypeJunction committed Mar 3, 2017
    Configuration menu
    Copy the full SHA
    bad30ed View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2017

  1. Merge pull request Elgg#10776 from mrclay/reload_with_hash

    fix(js): make sure elgg.forward() always reloads the page
    mrclay committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    306d6ba View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10772 from mrclay/10771_filter_url

    fix(output): elgg_normalize_url() again handles multibyte chars and spaces
    mrclay committed Mar 6, 2017
    Configuration menu
    Copy the full SHA
    4ece31a View commit details
    Browse the repository at this point in the history

Commits on Mar 8, 2017

  1. Configuration menu
    Copy the full SHA
    5adf2ec View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2017

  1. Merge pull request Elgg#10808 from jeabakker/perf-delete-disable

    perf(db): improved performance of disable/delete of an entity
    jeabakker committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    a160b44 View commit details
    Browse the repository at this point in the history
  2. Merge pull request Elgg#10788 from mrclay/10749_md_cast

    deprecate(logging): removes warnings about metadata/annotation value casting
    mrclay committed Mar 9, 2017
    Configuration menu
    Copy the full SHA
    177a812 View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2017

  1. Merge pull request Elgg#10800 from hypeJunction/twitter-icon

    fix(twitter_api): do not feed remote URLs to icon resize API
    jdalsem committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    e2b292f View commit details
    Browse the repository at this point in the history
  2. chore(release): v2.3.2

    jeabakker committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    9bac80b View commit details
    Browse the repository at this point in the history
  3. Merge pull request Elgg#10821 from jeabakker/release-2.3.2

    chore(release): v2.3.2
    jdalsem committed Mar 16, 2017
    Configuration menu
    Copy the full SHA
    d7bad2a View commit details
    Browse the repository at this point in the history

Commits on Mar 20, 2017

  1. Merge branch '2.3' into merge_23_2

    mrclay authored and jdalsem committed Mar 20, 2017
    Configuration menu
    Copy the full SHA
    5028a57 View commit details
    Browse the repository at this point in the history