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 1.x up to master #7030

Merged
merged 96 commits into from Jul 10, 2014
Merged

Merge 1.x up to master #7030

merged 96 commits into from Jul 10, 2014

Conversation

ewinslow
Copy link
Contributor

No description provided.

jrtilson and others added 30 commits March 3, 2014 14:56
This is to avoid receiving notification from forks. See http://docs.travis-ci.com/user/encryption-keys/
chore(ci): Encrypted notification email
Inline references in documentation should use {@link ...}
fix(docs): Inline refs use @link instead of @see
fix(aalborg_theme): inconsistency between owner-block and page menu
fix(aalborg_theme): show dashboard menu item only when logged in
fix(aalborg_theme): Support fullscreen mode if user adds app to homescreen
fix(aalborg_theme): emphasizes sidebar navigation
Reasons:
1. Not all environments have these (e.g. codio.com).
2. Ending at the root directory of the new branch seems more correct
   than bouncing back to a potentially unrelated directory.
With git branch/git checkout the script would fail if you had run
it once already and the release branch had already been created.
This makes it so it ignores the fact that the release branch has
been created and just continues on its merry way, which is a more
intuitive behavior than forcing you to clean up the environment
if the script fails the first time.
Removes left and right margin from dashboard blurb and right margin from content lists like pages, blogs and from wire posts.
fix(aalborg_theme): removes unwanted  margins
chore(docs): Remove some 1.9.0 features that were reverted
ewinslow and others added 28 commits July 5, 2014 22:38
Fixes #6059 - adds a second parameter 'owner' to the url for pages listing collections owned by a user.
Previously the page could not be accessed if the username was 'add'
fix(collections):  make urls work regardless of username
fix(ui): Corrected bad stretching of non-square, large avatars. Now upscaling by width.
docs(upgrading): Added special upgrade instructions for 1.9
fix(install): Mobile-friendly installer
This causes the rss viewtype's river/item view to fall back to the
item's default viewtype in order to capture custom logic that
determines what the summaries should be, since the river's summary
view (`river/elements/summary`) doesn't know how to handle all
possible river items, especially now that we have a `target` field
in the river.

Fixes #6901
When array access is used on the wrapper, the wrapper now checks the wrapped
object for ArrayAccess. If found, it uses that instead of property access.
This also emits deprecation warnings on array access, which were left out
accidentally.

Fixes #7017, #6917
This updates the session handling to use the new elgg_get_session and set/get/remove
rather than the deprecated array access. Also cleans up ElggSession a bit.
fix(thewire): More effective textarea change detection
fix(deprecation): the deprecation wrapper correctly handles array access
fix(rss): River entries include their full correct summaries again
chore(notifications): remove docs referring to annotation/relationship support
fix(members): prevent members search with empty query
…imit

feature(file): display file upload limit on file upload form
chore(twitter): cleans up Twitter API to work with 1.9 session
fix(groups): give feedback if a user cannot be added to a group
…ping.

Additionally changed message subjects for group discussions to make Gmail happy.

Fixes #6894
fix(notifications): Better threading + resolve html entities decoding issue
ewinslow added a commit that referenced this pull request Jul 10, 2014
Merge 1.x up to master
@ewinslow ewinslow merged commit 18a2204 into master Jul 10, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

10 participants