From 693928cf9f758da348ed7f11cf43442f1efcf435 Mon Sep 17 00:00:00 2001 From: Brett Profitt Date: Fri, 4 Jan 2013 16:29:43 -0500 Subject: Version bump. Updated changes. --- CHANGES.txt | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'CHANGES.txt') diff --git a/CHANGES.txt b/CHANGES.txt index ca1bdc675..acfb7055e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,39 @@ +Version 1.8.12 +(January 4th, 2013 from https://github.com/Elgg/Elgg/tree/1.8) + Contributing Developers: + * Brett Profitt + * Cash Costello + * Jerome Bakker + * Matt Beckett + * Paweł Sroka + * Sem + * Srokap + * Steve Clay + + Bugfixes: + * Added an AJAX workaround for the rewrite test. + * Code cleanup to prevent some notices and warnings. + * Removed "original_order" in menu item anchor tags. + * Site menu's selected item correctly persists through content pages. + * Static caches rewritten and improved to prevent stale data being returned. + * Installation: Invalid characters in admin username are handled correctly. + * Messages: Fixed inbox link in email notifications. + * The Wire: Fixed objects not displaying correctly when upgrading from 1.7. + + Enhancements: + * Performance improvements and improved caching in entity loading. + * Added upgrade locking to prevent concurrent upgrade attempts. + * Replaced xml_to_object() and autop() with GPL / MIT-compatible code. + * Error messages (register_error()) only fade after being clicked. + * Groups: Added a sidebar entry to display membership status and a link to + group notification settings. + * Groups: Added pending membership and invitation requests to the sidebar. + * Groups: Better redirection for invisible and closed groups. + * Search: User profile fields are searched. + * Pages: Subpages can be reassigned to new parent pages. + * Twitter: Login with twitter supports persistent login and correctly forwards + after login. + Version 1.8.11 (December 5th, 2012 from https://github.com/Elgg/Elgg/tree/1.8) -- cgit v1.2.3 From 3cfc0d3c2b5b4aaaa94179060370e1fe34668464 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 19 Jan 2013 09:36:27 -0500 Subject: Fixes #4982 adds confirm dialog to profile field reset --- CHANGES.txt | 14 +++++++++++++- languages/en.php | 3 ++- views/default/admin/appearance/profile_fields.php | 12 ++++++++++-- views/default/forms/profile/fields/reset.php | 12 ------------ 4 files changed, 25 insertions(+), 16 deletions(-) delete mode 100644 views/default/forms/profile/fields/reset.php (limited to 'CHANGES.txt') diff --git a/CHANGES.txt b/CHANGES.txt index acfb7055e..8687b3d2a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,3 +1,15 @@ +Version 1.8.13 +(January xx, 2013 from https://github.com/Elgg/Elgg/tree/1.8) + Contributing Developers: + * Cash Costello + * Cristo Rabani + + Security Fixes: + + Enhancements: + * Added confirm dialog for resetting profile fields (adds language string profile:resetdefault:confirm) + + Version 1.8.12 (January 4th, 2013 from https://github.com/Elgg/Elgg/tree/1.8) Contributing Developers: @@ -7,7 +19,6 @@ Version 1.8.12 * Matt Beckett * Paweł Sroka * Sem - * Srokap * Steve Clay Bugfixes: @@ -34,6 +45,7 @@ Version 1.8.12 * Twitter: Login with twitter supports persistent login and correctly forwards after login. + Version 1.8.11 (December 5th, 2012 from https://github.com/Elgg/Elgg/tree/1.8) diff --git a/languages/en.php b/languages/en.php index f3acc50ee..00a825b4d 100644 --- a/languages/en.php +++ b/languages/en.php @@ -405,7 +405,8 @@ $english = array( 'profile:editdefault:delete:fail' => 'Removed default profile item field failed', 'profile:editdefault:delete:success' => 'Profile field deleted', 'profile:defaultprofile:reset' => 'Profile fields reset to the system default', - 'profile:resetdefault' => 'Reset default profile', + 'profile:resetdefault' => 'Reset profile fields to system defaults', + 'profile:resetdefault:confirm' => 'Are you sure you want to delete your custom profile fields?', 'profile:explainchangefields' => "You can replace the existing profile fields with your own using the form below. \n\n Give the new profile field a label, for example, 'Favorite team', then select the field type (eg. text, url, tags), and click the 'Add' button. To re-order the fields drag on the handle next to the field label. To edit a field label - click on the label's text to make it editable. \n\n At any time you can revert back to the default profile set up, but you will lose any information already entered into custom fields on profile pages.", 'profile:editdefault:success' => 'New profile field added', 'profile:editdefault:fail' => 'Default profile could not be saved', diff --git a/views/default/admin/appearance/profile_fields.php b/views/default/admin/appearance/profile_fields.php index 91d14b874..f1d78c19f 100644 --- a/views/default/admin/appearance/profile_fields.php +++ b/views/default/admin/appearance/profile_fields.php @@ -5,12 +5,20 @@ $add = elgg_view_form('profile/fields/add', array('class' => 'elgg-form-settings'), array()); $list = elgg_view('admin/appearance/profile_fields/list'); -$reset = elgg_view_form('profile/fields/reset', array(), array()); + +$reset = elgg_view('output/confirmlink', array( + 'text' => elgg_echo('reset'), + 'href' => 'action/profile/fields/reset', + 'title' => elgg_echo('profile:resetdefault'), + 'confirm' => elgg_echo('profile:resetdefault:confirm'), + 'class' => 'elgg-button elgg-button-cancel', + 'is_trusted' => 'true', +)); $body = <<<__HTML $add $list -$reset +
$reset
__HTML; echo $body; diff --git a/views/default/forms/profile/fields/reset.php b/views/default/forms/profile/fields/reset.php deleted file mode 100644 index c0bb1b7f4..000000000 --- a/views/default/forms/profile/fields/reset.php +++ /dev/null @@ -1,12 +0,0 @@ -'; -$params = array( - 'value' => elgg_echo('profile:resetdefault'), - 'class' => 'elgg-button-cancel', -); -echo elgg_view('input/submit', $params); -echo ''; -- cgit v1.2.3 From 718cddc89e3b4901a641e175e86b4208436f2089 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sun, 20 Jan 2013 20:32:33 -0500 Subject: Fixes #4991 CLI allowed when walled garden is turned on --- CHANGES.txt | 8 ++++++-- engine/classes/ElggSite.php | 5 +++++ 2 files changed, 11 insertions(+), 2 deletions(-) (limited to 'CHANGES.txt') diff --git a/CHANGES.txt b/CHANGES.txt index 8687b3d2a..105d60f72 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,12 +2,16 @@ Version 1.8.13 (January xx, 2013 from https://github.com/Elgg/Elgg/tree/1.8) Contributing Developers: * Cash Costello - * Cristo Rabani + * Kevin Jardine + * Krzysztof Różalski Security Fixes: + Bugfixes: + * CLI usages with walled garden fixed + Enhancements: - * Added confirm dialog for resetting profile fields (adds language string profile:resetdefault:confirm) + * Added confirm dialog for resetting profile fields (adds language string profile:resetdefault:confirm) Version 1.8.12 diff --git a/engine/classes/ElggSite.php b/engine/classes/ElggSite.php index f7f5b68ea..1fe49b85c 100644 --- a/engine/classes/ElggSite.php +++ b/engine/classes/ElggSite.php @@ -362,6 +362,11 @@ class ElggSite extends ElggEntity { public function checkWalledGarden() { global $CONFIG; + // command line calls should not invoke the walled garden check + if (PHP_SAPI === 'cli') { + return; + } + if ($CONFIG->walled_garden) { if ($CONFIG->default_access == ACCESS_PUBLIC) { $CONFIG->default_access = ACCESS_LOGGED_IN; -- cgit v1.2.3 From d33d3521485138551d95d4c4187eb46a90ae4d9d Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Sat, 26 Jan 2013 10:27:23 -0500 Subject: Defines river:comment:object:default - taken from PR 438 --- CHANGES.txt | 9 ++++++++- languages/en.php | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'CHANGES.txt') diff --git a/CHANGES.txt b/CHANGES.txt index 105d60f72..8b8838e71 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,14 +1,21 @@ Version 1.8.13 -(January xx, 2013 from https://github.com/Elgg/Elgg/tree/1.8) +(January 29, 2013 from https://github.com/Elgg/Elgg/tree/1.8) Contributing Developers: * Cash Costello + * Juho Jaakkola * Kevin Jardine * Krzysztof Różalski + * Steve Clay Security Fixes: Bugfixes: * CLI usages with walled garden fixed + * Upgrading from < 1.8 to 1.8 fixed + * Default widgets fixed + * Quotes in object titles no longer result in "qout" in URLs + * List of my groups is ordered now + * Language string river:comment:object:default is defined now Enhancements: * Added confirm dialog for resetting profile fields (adds language string profile:resetdefault:confirm) diff --git a/languages/en.php b/languages/en.php index 125e2358f..78f37ab63 100644 --- a/languages/en.php +++ b/languages/en.php @@ -1141,7 +1141,7 @@ If you requested this, click on the link below. Otherwise ignore this email. 'comments:count' => "%s comments", - 'riveraction:annotation:generic_comment' => '%s commented on %s', + 'river:comment:object:default' => '%s commented on %s', 'generic_comments:add' => "Leave a comment", 'generic_comments:post' => "Post comment", -- cgit v1.2.3 From 8d3a7ab1755829c6e070a038d6b33e326de8fc8f Mon Sep 17 00:00:00 2001 From: cash Date: Sat, 26 Jan 2013 15:11:28 -0500 Subject: updated version for 1.8.13 release --- CHANGES.txt | 2 ++ version.php | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'CHANGES.txt') diff --git a/CHANGES.txt b/CHANGES.txt index 8b8838e71..13c30ae3e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -8,6 +8,7 @@ Version 1.8.13 * Steve Clay Security Fixes: + * Added validation of Twitter usernames in Twitter widget Bugfixes: * CLI usages with walled garden fixed @@ -16,6 +17,7 @@ Version 1.8.13 * Quotes in object titles no longer result in "qout" in URLs * List of my groups is ordered now * Language string river:comment:object:default is defined now + * Added language string for comments: generic_comment:on Enhancements: * Added confirm dialog for resetting profile fields (adds language string profile:resetdefault:confirm) diff --git a/version.php b/version.php index 858877cfd..07a08ab4a 100644 --- a/version.php +++ b/version.php @@ -11,7 +11,7 @@ // YYYYMMDD = Elgg Date // XX = Interim incrementer -$version = 2012120500; +$version = 2013012900; // Human-friendly version name -$release = '1.8.12'; +$release = '1.8.13'; -- cgit v1.2.3