-
Notifications
You must be signed in to change notification settings - Fork 672
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
Merge 2.3 into master #10837
Commits on Nov 9, 2016
-
Configuration menu - View commit details
-
Copy full SHA for a7277f3 - Browse repository at this point
Copy the full SHA a7277f3View commit details -
Merge pull request Elgg#10572 from jdalsem/8898-input-date
fix(views): corrected syntax error in input/date
Configuration menu - View commit details
-
Copy full SHA for 1db61d8 - Browse repository at this point
Copy the full SHA 1db61d8View commit details
Commits on Nov 27, 2016
-
Configuration menu - View commit details
-
Copy full SHA for 3e4dc6a - Browse repository at this point
Copy the full SHA 3e4dc6aView commit details
Commits on Nov 30, 2016
-
Merge pull request Elgg#10633 from iionly/cachelink-no-readlink
fix(core): Check existence of cache symlink without usage of readlink()
Configuration menu - View commit details
-
Copy full SHA for d916693 - Browse repository at this point
Copy the full SHA d916693View commit details
Commits on Dec 2, 2016
-
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.
Configuration menu - View commit details
-
Copy full SHA for 702ce46 - Browse repository at this point
Copy the full SHA 702ce46View commit details
Commits on Dec 15, 2016
-
Configuration menu - View commit details
-
Copy full SHA for c97934b - Browse repository at this point
Copy the full SHA c97934bView commit details
Commits on Dec 16, 2016
-
Merge pull request Elgg#10654 from jeabakker/can-comment
chore: canComment inline with parent class
Configuration menu - View commit details
-
Copy full SHA for da03a61 - Browse repository at this point
Copy the full SHA da03a61View commit details -
Configuration menu - View commit details
-
Copy full SHA for 7a55677 - Browse repository at this point
Copy the full SHA 7a55677View commit details -
Merge pull request Elgg#10640 from mrclay/ws_addc
fix(web_services): handle string params with proper escaping
Configuration menu - View commit details
-
Copy full SHA for 11c4640 - Browse repository at this point
Copy the full SHA 11c4640View commit details
Commits on Dec 20, 2016
-
Merge pull request Elgg#10658 from jeabakker/plugin-deps
chore(admin): fix plugin dependencies styling issue
Configuration menu - View commit details
-
Copy full SHA for 06c3a25 - Browse repository at this point
Copy the full SHA 06c3a25View commit details
Commits on Dec 23, 2016
-
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
Configuration menu - View commit details
-
Copy full SHA for 3020c5d - Browse repository at this point
Copy the full SHA 3020c5dView commit details -
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.
Configuration menu - View commit details
-
Copy full SHA for afef3c4 - Browse repository at this point
Copy the full SHA afef3c4View commit details
Commits on Dec 24, 2016
-
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
Configuration menu - View commit details
-
Copy full SHA for abf8a9c - Browse repository at this point
Copy the full SHA abf8a9cView commit details
Commits on Dec 25, 2016
-
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
Configuration menu - View commit details
-
Copy full SHA for 4a7b74e - Browse repository at this point
Copy the full SHA 4a7b74eView commit details
Commits on Dec 27, 2016
-
Merge pull request Elgg#10673 from mrclay/serve_filename_22
fix(files): mitigate issues with special chars in file names
Configuration menu - View commit details
-
Copy full SHA for 2ad2509 - Browse repository at this point
Copy the full SHA 2ad2509View commit details -
Merge pull request Elgg#10672 from mrclay/10667_ajax_vars
fix(ajax): elgg/Ajax view() and form() set $vars as expected
Configuration menu - View commit details
-
Copy full SHA for b737151 - Browse repository at this point
Copy the full SHA b737151View commit details -
Configuration menu - View commit details
-
Copy full SHA for 61c538f - Browse repository at this point
Copy the full SHA 61c538fView commit details -
Merge pull request Elgg#10676 from mrclay/merge_22
Merge 2.2 into 2.3
Configuration menu - View commit details
-
Copy full SHA for 9c9ce51 - Browse repository at this point
Copy the full SHA 9c9ce51View commit details -
Configuration menu - View commit details
-
Copy full SHA for 06af500 - Browse repository at this point
Copy the full SHA 06af500View commit details -
Configuration menu - View commit details
-
Copy full SHA for 5d4fc2b - Browse repository at this point
Copy the full SHA 5d4fc2bView commit details -
Merge branch 'release-2.3.0' of https://github.com/hypeJunction/Elgg …
…into release-2.3.0
Configuration menu - View commit details
-
Copy full SHA for b7ef1a2 - Browse repository at this point
Copy the full SHA b7ef1a2View commit details -
Merge pull request Elgg#10678 from hypeJunction/release-2.3.0
chore(release): v2.3.0
Configuration menu - View commit details
-
Copy full SHA for 6ad220a - Browse repository at this point
Copy the full SHA 6ad220aView commit details
Commits on Jan 5, 2017
-
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
Configuration menu - View commit details
-
Copy full SHA for 65e6664 - Browse repository at this point
Copy the full SHA 65e6664View commit details
Commits on Jan 9, 2017
-
fix(html): elgg_normalize_url() handles tel: links
Removes cruft for older PHP versions. Fixes Elgg#10689
Configuration menu - View commit details
-
Copy full SHA for 48a5170 - Browse repository at this point
Copy the full SHA 48a5170View commit details -
Merge pull request Elgg#10694 from mrclay/10689_tel_23
fix(html): elgg_normalize_url() handles tel: links
Configuration menu - View commit details
-
Copy full SHA for bf1ef0e - Browse repository at this point
Copy the full SHA bf1ef0eView commit details
Commits on Jan 10, 2017
-
Merge pull request Elgg#10687 from hypeJunction/disc-river
fix(discussions): river entries are once again visible to logged out …
Configuration menu - View commit details
-
Copy full SHA for ddcbf48 - Browse repository at this point
Copy the full SHA ddcbf48View commit details
Commits on Jan 12, 2017
-
Configuration menu - View commit details
-
Copy full SHA for e42fa63 - Browse repository at this point
Copy the full SHA e42fa63View commit details
Commits on Jan 13, 2017
-
Configuration menu - View commit details
-
Copy full SHA for e4e316e - Browse repository at this point
Copy the full SHA e4e316eView commit details -
Merge pull request Elgg#10701 from mrclay/10699_hash_attrs
fix(views): elgg_view_field no longer leaves #type in attributes
Configuration menu - View commit details
-
Copy full SHA for ac157ba - Browse repository at this point
Copy the full SHA ac157baView commit details
Commits on Jan 19, 2017
-
Merge pull request Elgg#10697 from mrclay/10696_tables
fix(views): in table lists, rows now have IDs
Configuration menu - View commit details
-
Copy full SHA for 273ab5e - Browse repository at this point
Copy the full SHA 273ab5eView commit details
Commits on Jan 23, 2017
-
Configuration menu - View commit details
-
Copy full SHA for e75923b - Browse repository at this point
Copy the full SHA e75923bView commit details -
Merge pull request Elgg#10717 from johnnymast/1.12
chore(license): updated license year to 2017
Configuration menu - View commit details
-
Copy full SHA for c711182 - Browse repository at this point
Copy the full SHA c711182View commit details
Commits on Jan 24, 2017
-
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.
Configuration menu - View commit details
-
Copy full SHA for aeed706 - Browse repository at this point
Copy the full SHA aeed706View commit details
Commits on Jan 26, 2017
-
Configuration menu - View commit details
-
Copy full SHA for a018bd6 - Browse repository at this point
Copy the full SHA a018bd6View commit details -
Merge pull request Elgg#10727 from jeabakker/release-1.12.15
chore(release): v1.12.15
Configuration menu - View commit details
-
Copy full SHA for a40788b - Browse repository at this point
Copy the full SHA a40788bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 4e16cc9 - Browse repository at this point
Copy the full SHA 4e16cc9View commit details -
Merge remote-tracking branch 'remote/1.12' into 1.12.15-to-2.2
Conflicts: CHANGELOG.md composer.json views/default/input/date.php
Configuration menu - View commit details
-
Copy full SHA for 67006fb - Browse repository at this point
Copy the full SHA 67006fbView commit details -
Merge pull request Elgg#10729 from jdalsem/1.12.15-to-2.2
1.12.15 to 2.2
Configuration menu - View commit details
-
Copy full SHA for a1da9e7 - Browse repository at this point
Copy the full SHA a1da9e7View commit details
Commits on Jan 27, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 927cabe - Browse repository at this point
Copy the full SHA 927cabeView commit details -
Merge pull request Elgg#10733 from jeabakker/release-2.2.4
chore(release): v2.2.4
Configuration menu - View commit details
-
Copy full SHA for 2e809cf - Browse repository at this point
Copy the full SHA 2e809cfView commit details -
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
Configuration menu - View commit details
-
Copy full SHA for dd9af8a - Browse repository at this point
Copy the full SHA dd9af8aView commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 8562190 - Browse repository at this point
Copy the full SHA 8562190View commit details -
Configuration menu - View commit details
-
Copy full SHA for 6f71d66 - Browse repository at this point
Copy the full SHA 6f71d66View commit details
Commits on Jan 28, 2017
-
fix(embed): Inserting medium thumbnail size again instead of small on…
… embedding images
Configuration menu - View commit details
-
Copy full SHA for aea4503 - Browse repository at this point
Copy the full SHA aea4503View commit details
Commits on Jan 31, 2017
-
chore(docs): update helper functions
Yanwei Jiang committedJan 31, 2017 Configuration menu - View commit details
-
Copy full SHA for bc9e0b3 - Browse repository at this point
Copy the full SHA bc9e0b3View commit details -
Merge pull request Elgg#10743 from YanweiJiang/doc-helper
chore(docs): update helper functions
Configuration menu - View commit details
-
Copy full SHA for c3edd21 - Browse repository at this point
Copy the full SHA c3edd21View commit details -
Merge pull request Elgg#10728 from jdalsem/emailsent
fixed(uservalidationbyemail): unset emailsent after showing it once
Configuration menu - View commit details
-
Copy full SHA for 313da75 - Browse repository at this point
Copy the full SHA 313da75View commit details -
Merge pull request Elgg#10665 from mrclay/10656_plugin_ajax
chore(plugins): plugins page properly updates on ajax (de)activate
Configuration menu - View commit details
-
Copy full SHA for bea5a0d - Browse repository at this point
Copy the full SHA bea5a0dView commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 907c9b6 - Browse repository at this point
Copy the full SHA 907c9b6View commit details
Commits on Feb 1, 2017
-
Merge pull request Elgg#10744 from mrclay/10706_plugin_wait
fix(admin): prevents simultaneous plugin (de)activation/reordering
Configuration menu - View commit details
-
Copy full SHA for 8c3a4a9 - Browse repository at this point
Copy the full SHA 8c3a4a9View commit details -
Configuration menu - View commit details
-
Copy full SHA for 99e8a4a - Browse repository at this point
Copy the full SHA 99e8a4aView commit details -
Merge pull request Elgg#10734 from jeabakker/release-docs
chore(docs): updated the release docs
Configuration menu - View commit details
-
Copy full SHA for 04f84c9 - Browse repository at this point
Copy the full SHA 04f84c9View commit details
Commits on Feb 3, 2017
-
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
Configuration menu - View commit details
-
Copy full SHA for 03285ba - Browse repository at this point
Copy the full SHA 03285baView commit details
Commits on Feb 7, 2017
-
Configuration menu - View commit details
-
Copy full SHA for fb57c02 - Browse repository at this point
Copy the full SHA fb57c02View commit details
Commits on Feb 8, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 913cf96 - Browse repository at this point
Copy the full SHA 913cf96View commit details -
Merge pull request Elgg#10751 from mrclay/better_rand
fix(security): random byte generation improved on some systems
Configuration menu - View commit details
-
Copy full SHA for dab094b - Browse repository at this point
Copy the full SHA dab094bView commit details -
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
Configuration menu - View commit details
-
Copy full SHA for 9636790 - Browse repository at this point
Copy the full SHA 9636790View commit details
Commits on Feb 9, 2017
-
Merge pull request Elgg#10756 from mrclay/10737_menu_sorting
fix(menus): return to default of sorting menus by text
Configuration menu - View commit details
-
Copy full SHA for c1ff0dd - Browse repository at this point
Copy the full SHA c1ff0ddView commit details
Commits on Feb 14, 2017
-
Merge pull request Elgg#10711 from iionly/embed-thumbnail-size-fix
fix(embed): Inserting medium thumbnail size again instead of small on embedding images
Configuration menu - View commit details
-
Copy full SHA for ace8d99 - Browse repository at this point
Copy the full SHA ace8d99View commit details -
Configuration menu - View commit details
-
Copy full SHA for 17d93a5 - Browse repository at this point
Copy the full SHA 17d93a5View commit details -
Merge pull request Elgg#10765 from jdalsem/comments-edit-ajax
fixed(comments): use elgg/Ajax to load inline comment form
Configuration menu - View commit details
-
Copy full SHA for a691ed7 - Browse repository at this point
Copy the full SHA a691ed7View commit details -
Merge pull request Elgg#10755 from jeabakker/ignore-access
fix(access): use ignore access only when querying the database
Configuration menu - View commit details
-
Copy full SHA for 8418712 - Browse repository at this point
Copy the full SHA 8418712View commit details -
Configuration menu - View commit details
-
Copy full SHA for be3855a - Browse repository at this point
Copy the full SHA be3855aView commit details -
Merge pull request Elgg#10767 from jeabakker/2.3.1-composer-lock
chore(composer): update dependencies and regenerate lock
Configuration menu - View commit details
-
Copy full SHA for 5096428 - Browse repository at this point
Copy the full SHA 5096428View commit details -
Configuration menu - View commit details
-
Copy full SHA for d8b4132 - Browse repository at this point
Copy the full SHA d8b4132View commit details -
Merge pull request Elgg#10768 from jeabakker/release-2.3.1
chore(release): v2.3.1
Configuration menu - View commit details
-
Copy full SHA for 0ace278 - Browse repository at this point
Copy the full SHA 0ace278View commit details
Commits on Feb 16, 2017
-
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
Configuration menu - View commit details
-
Copy full SHA for 62bf31c - Browse repository at this point
Copy the full SHA 62bf31cView commit details
Commits on Feb 17, 2017
-
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()`.
Configuration menu - View commit details
-
Copy full SHA for c42b9c9 - Browse repository at this point
Copy the full SHA c42b9c9View commit details
Commits on Feb 21, 2017
-
docs(security): explains current password hashing
Documents current practice and legacy issue for older systems. Fixes Elgg#10778
Configuration menu - View commit details
-
Copy full SHA for d3affbd - Browse repository at this point
Copy the full SHA d3affbdView commit details -
Merge pull request Elgg#10779 from mrclay/10778_docs
docs(security): explains current password hashing
Configuration menu - View commit details
-
Copy full SHA for 0488db6 - Browse repository at this point
Copy the full SHA 0488db6View commit details
Commits on Feb 25, 2017
-
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
Configuration menu - View commit details
-
Copy full SHA for 97b2b51 - Browse repository at this point
Copy the full SHA 97b2b51View commit details
Commits on Feb 26, 2017
-
Configuration menu - View commit details
-
Copy full SHA for bb35cb9 - Browse repository at this point
Copy the full SHA bb35cb9View commit details -
Merge pull request Elgg#10790 from beck24/7740_well_known
fix(install): explicitly allow .well-known in rewrite rules
Configuration menu - View commit details
-
Copy full SHA for baf0c23 - Browse repository at this point
Copy the full SHA baf0c23View commit details
Commits on Feb 27, 2017
-
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
Configuration menu - View commit details
-
Copy full SHA for 2ff4e34 - Browse repository at this point
Copy the full SHA 2ff4e34View commit details
Commits on Mar 1, 2017
-
Merge pull request Elgg#10793 from mrclay/10791_del_river_2
chore(river): warn devs that elgg_get_river() has no "views" option
Configuration menu - View commit details
-
Copy full SHA for 6c0c82c - Browse repository at this point
Copy the full SHA 6c0c82cView commit details
Commits on Mar 3, 2017
-
fix(twitter_api): do not feed remote URLs to icon resize API
Now uses a temporary files to store raw icon bytes Fixes 10686
Configuration menu - View commit details
-
Copy full SHA for bad30ed - Browse repository at this point
Copy the full SHA bad30edView commit details
Commits on Mar 6, 2017
-
Merge pull request Elgg#10776 from mrclay/reload_with_hash
fix(js): make sure elgg.forward() always reloads the page
Configuration menu - View commit details
-
Copy full SHA for 306d6ba - Browse repository at this point
Copy the full SHA 306d6baView commit details -
Merge pull request Elgg#10772 from mrclay/10771_filter_url
fix(output): elgg_normalize_url() again handles multibyte chars and spaces
Configuration menu - View commit details
-
Copy full SHA for 4ece31a - Browse repository at this point
Copy the full SHA 4ece31aView commit details
Commits on Mar 8, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 5adf2ec - Browse repository at this point
Copy the full SHA 5adf2ecView commit details
Commits on Mar 9, 2017
-
Merge pull request Elgg#10808 from jeabakker/perf-delete-disable
perf(db): improved performance of disable/delete of an entity
Configuration menu - View commit details
-
Copy full SHA for a160b44 - Browse repository at this point
Copy the full SHA a160b44View commit details -
Merge pull request Elgg#10788 from mrclay/10749_md_cast
deprecate(logging): removes warnings about metadata/annotation value casting
Configuration menu - View commit details
-
Copy full SHA for 177a812 - Browse repository at this point
Copy the full SHA 177a812View commit details
Commits on Mar 16, 2017
-
Merge pull request Elgg#10800 from hypeJunction/twitter-icon
fix(twitter_api): do not feed remote URLs to icon resize API
Configuration menu - View commit details
-
Copy full SHA for e2b292f - Browse repository at this point
Copy the full SHA e2b292fView commit details -
Configuration menu - View commit details
-
Copy full SHA for 9bac80b - Browse repository at this point
Copy the full SHA 9bac80bView commit details -
Merge pull request Elgg#10821 from jeabakker/release-2.3.2
chore(release): v2.3.2
Configuration menu - View commit details
-
Copy full SHA for d7bad2a - Browse repository at this point
Copy the full SHA d7bad2aView commit details
Commits on Mar 20, 2017
-
Configuration menu - View commit details
-
Copy full SHA for 5028a57 - Browse repository at this point
Copy the full SHA 5028a57View commit details