1.10 to 1.x #7934
Merged
1.10 to 1.x #7934
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Updated CHANGES.txt and version.php for 1.8.20
…ible Fixes Elgg#7634 - This brings back the index counting from 0 instead of 1, making profile field changes back compatible for older sites
Release 1.10.0 rc.1
… plugin Fixes the method name from setUserSettings() to setUserSetting() and adds an incomplete unit test.
…setting fix(settings): It's again possible to set user specific setting for a plugin
…lts more meaningful.
feature(test): Added rewrite rules for builtin PHP cli server execution
…newer composer version.
fix(CSS): adds margin between a file's text and image
chore(simpletest): Removed old static simpletest library in favor of new...
Improves test coverage
chore(aalborg_theme): remove IE 8 support
fix(profile): admin defined profile fields are once again back-compatible
If a “forward” hook handler returns false, execution will no longer continue past the forward() call. Fixes Elgg#7637
fix(blog): adds missing class to preview button
The tilde is closer to what we want with semver.
perf(stats): makes get_entity_statistics() more efficient
Because the version was a float it results in version 1.1 and the deprecated notice always shows up.
…tice fix(views): deprecated notice no longer shows up in the wrong version
…h other elements It is difficult to predict how much translatable strings need space in each language. This replaces the textual representation with icons to make sure that the Next and Previous links do not take up too much space. Fixes Elgg#7542
fix(datepicker): Prevents month navigation links from overlapping with other elements
We used to use the raw href attribute as the selector for rel=“toggle” elements, which supported hrefs like “.class-name”. In 1.10 we switched to using elgg.getSelectorFromUrlFragment(), which does not support this format, so we are switching back to maintain BC. Fixes Elgg#7790
Before elgg.ui.init binds events for toggles, the user may click the hamburger menu in aalborg, which was a link to a non-existent page. This repoints the link to “#” and sets the toggle selector via the new data- attribute. Fixes Elgg#7861
fix(views): adds excerpt to comments and discussions in activity context
Fixes 2 bugs relating to rel="toggle"
chore(docs): add php_version to plugin dependencies documentation
Be less technical and do not expose system terminalogy. fixes Elgg#6959
chore(tests): use atypical dbprefix for travis installer
fix(messages): forward to inbox after deleting a message
…-prevention chore(i18n): changed text for actiongatekeeper:pluginprevents
fix(search): correctly split search words on multiple spaces
* Renames `Filesystem\Filesystem` to `Filesystem\GaufretteDirectory`. This is more consistent with our class naming conventions and provides more relevant information. * Introduces `Directory` interface which `GaufretteDirectory` now implements for better decoupling * less likely to leak the Gaufrette implementation detail * easier to switch to Flysystem, etc. if need be * Refactors tests and code to be written against the `Directory` interface. The `GaufretteDirectoryTest` now just provides `GaufretteDirectory` instances for those test methods to exercise. * Renames `put` and `getFileContents` to `putContents` and `getContents` respectively for consistency. * Alphabetize methods on both classes and the interface * `Directory::getFiles()` now returns a `Collection` instead of an array
chore(filesystem): Introduce `Directory` interface
Conflicts: composer.json engine/lib/comments.php
ewinslow
force-pushed
the
1.10-to-1.x
branch
from
6f73793
to
793cb1b
Compare
|
The merge conflicts were straightforward to resolve, thankfully. Please take a look at composer.json and engine/lib/comments.php if you have a chance. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.