aboutsummaryrefslogtreecommitdiff
path: root/engine
AgeCommit message (Collapse)Author
2011-08-23Merge branch 'master' of github.com:Elgg/ElggBrett Profitt
Conflicts: engine/lib/views.php
2011-08-22Closes #3015. jQuery updated to 1.6.2. jQuery-UI updated to 1.8.16.Brett Profitt
2011-08-22Merge branch 'master' of github.com:Elgg/ElggBrett Profitt
2011-08-21Fixes #3606. Reset password page added to public pages for walled garden mode.Brett Profitt
2011-08-21Fixes #3496. Using OR to concatenate unpaired type and subtype clauses in ↵Brett Profitt
elgg_get_river_type_subtype_where_sql().
2011-08-18Fixing priorities for jquery.Brett Profitt
2011-08-17Finished ElggPriorityList. Migrated external files to use it.Brett Profitt
2011-08-15Refs #3355. Added ElggPriorityList.Brett Profitt
2011-07-27Fixed some documentation.Brett Profitt
2011-07-27Fixes Ticket #3709 "Embed plugin: uploading a file in Firefox tries to save ↵Richard Loxley
a JSON file in the user's browser"
2011-07-10Fixes #3336 functions that used elgg_view_exists() were not falling back to ↵Cash Costello
the default views
2011-07-09fixed redirect for user avatars if we cannot get the usercash
2011-07-06Revert "Merged ACL fixes from 1.7 branch."Brett Profitt
This reverts commit de111da23258cd2b513c8f4ab84712ee50272b23. Reverted because of problems in how 1.8 populates the access dropdown.
2011-07-06Revert "Fixes #3552. Addess ACL unit tests. These currently fail because of ↵Brett Profitt
#3522." This reverts commit d423aee393458d6827dbe913ceacd29171fa3d74. Removing because of problems with differences in how 1.7 and 1.8 populate the acl dropdown for groups.
2011-07-06Fixes #2204 standardized the hooks/overrides for plugin settings and ↵Cash Costello
usersettings
2011-07-06$joins was not declared in elgg_get_river()Cash Costello
2011-07-06Merge pull request #54 from cash/dev-toolsCash Costello
Fixes #3564 Adds the inspection tool and logging to the web page
2011-07-06changed new convenience function from elgg_register_add_button() to ↵Cash Costello
elgg_register_title_button()
2011-07-04Merge pull request #53 from cash/reflected_xss_fixesCash Costello
Fixes #3544 Reflected xss fixes
2011-07-03Merged ACL fixes from 1.7 branch.Brett Profitt
2011-07-03Merged d423aee393458d6827db from 1.7 to master.Brett Profitt
Fixes #3552. Addess ACL unit tests. These currently fail because of #3522. git-svn-id: http://code.elgg.org/elgg/branches/1.7@9202 36083f99-b078-4883-b0ff-0f9b5a30f544 Conflicts: engine/lib/access.php
2011-07-03Fixes #3650 deprecated ElggUser::getCollections()cash
2011-07-03Fixes #3656 updates the AccessArray interface methods for ElggCacheCash Costello
2011-07-02added logging to the web page footercash
2011-07-02fixed river for #3544cash
2011-07-02added note about preventing reflected XSS vulnerabilities.cash
2011-06-30Adds exception handling to shutdown hook from pull request 50Cash Costello
2011-06-30Refs #3015 updated jquery and jquery-ui to their latest releasesCash Costello
2011-06-29handling spaces and uppercase characters when creating menu item classescash
2011-06-29added backward compatibility for the view page_elements/content_wrappercash
2011-06-29added @since dates on two functions in group librarycash
2011-06-28using elgg_view_title() in content layout headerCash Costello
2011-06-28Merge pull request #51 from cash/add-data-to-menuCash Costello
Fixes #3615 Better handling of options in ElggMenuItem
2011-06-26removed buttons logic from content header view, created convenience function ↵cash
rather than copying and pasting, and updated the blog plugin
2011-06-26added a data array to ElggMenuItem. Now by default options end up being ↵cash
passed to output/url.
2011-06-26Merge pull request #41 from cash/embed-lightboxCash Costello
Fixes #3564 Embed rewrite using new lightbox
2011-06-26Fixes #3585 do not need to check parameters because was registered for only ↵Cash Costello
one event
2011-06-26Fixes #3470 using rel=toggle nowCash Costello
2011-06-26Fixes #3614 updated use of elgg_view_entity() throughout coreCash Costello
2011-06-25Don't say the db was upgradeded when it wasn't.Brett Profitt
2011-06-25Fixes #3554. Pulled 1.7->1.8 upgrade bootstrapping into a separate function. ↵Brett Profitt
Made the plugin upgrade that forwards (2011010101) set itself in the processed upgrades.
2011-06-25datalist_get() was incorrectly setting escaped values in the cache.Brett Profitt
2011-06-25fixed spacing in elgg_admin_add_plugin_settings_menu()cash
2011-06-25Fixes #3609 removed use of deprecated trigger_plugin_hook()cash
2011-06-24Refs #1253 using 'list_type' string instead of boolean 'gallery' for entity ↵cash
listing
2011-06-24cleaned up the list/gallery css classes to use standard class naming - minor ↵cash
modifications only
2011-06-24Merge squashed pull request #42 from benbro/master - Fixes #3586 by adding a ↵Cash Costello
hook for finding active users
2011-06-24added find_active_users hookbenbro
2011-06-24Merge branch '3404-river-revamp' of https://github.com/ewinslow/Elgg into ↵Cash Costello
ewinslow-3404-river-revamp Conflicts: languages/en.php
2011-06-22Merge pull request #44 from lie2815/3546-menu-item-edit-textCash Costello
Fixes #3546 Add setText() method to ElggMenuItem class
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-29 19:14:18 +0000