aboutsummaryrefslogtreecommitdiff
path: root/engine
AgeCommit message (Collapse)Author
2014-03-14Merge branch 'master' into saraveaSilvio Rhatto
Conflicts: mod/blog/views/default/blog/sidebar/archives.php
2014-01-22Merge tag '1.8.18' of git://github.com/Elgg/Elgg into developSem
1.8.18 Conflicts: mod/tinymce/vendor/tinymce/jscripts/tiny_mce/langs/en.js mod/tinymce/vendor/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js
2014-01-06Fixes #6309: Fixes notify_user() broken by 63db31cSteve Clay
2014-01-01Merged in libxml18 (pull request #8) Paweł Sroka
Disable loading external entities during XML parsing
2014-01-01Merged in csrf_fix (pull request #7) Paweł Sroka
Added function for escaping query strings and fixed several XSRF vulnerabilities.
2013-12-28Added missing @deprecated tagsPaweł Sroka
2013-12-23Merge pull request #6251 from jeabakker/3143-memcache-entity-cache-on-loginMatt Beckett
fixes #3143 login part
2013-12-09Code style fixes for recent PRSteve Clay
2013-12-08Checks X-Real-Ip header as well when determining client IPPaweł Sroka
2013-12-07Fixes #6012: Gets correct client IP behind proxy (1.8)Steve Clay
2013-12-07Merge pull request #6250 from edfactor/patch-1Steve Clay
Makes sure plugin settings functions return arrays
2013-12-07Handle case if get_user_notification_settings() returns falseSteve Clay
2013-12-02fixes #3143 login partJerome Bakker
2013-12-02Fix #6238 Return blank arrays Ed Lyons
I committed this simple change to return the empty array rather than false for empty settings result for ElggPlugin::getAllSettings and getAllUsersSettings. Put this into 1.8 branch.
2013-12-01Code style fixes in ElggCryptoSteve Clay
2013-12-01Make sure new lang key available during upgradeSteve Clay
2013-11-04code styleSteve Clay
2013-11-04PRNG replace Drupal's with George Argyros'Steve Clay
2013-11-04Allow regenerating site secretSteve Clay
2013-11-04Emit notice if XXE can't be tested and skip testSteve Clay
2013-11-04Enhanced testPaweł Sroka
2013-11-04Disable loading external entities during XML parsingSteve Clay
2013-10-31Merge pull request #6171 from jdalsem/widget-reorder-issueJuho Jaakkola
fixed issue when reordering plugins to second last position of other column that has more than 2 widgets
2013-10-27Merge pull request #6185 from Srokap/ticket_6117Paweł Sroka
Fixes #6177 - refuse to deactive plugins used as dependencies
2013-10-27Refs #6117 - Added docs + changed plugins_deactivate_dependency_check to ↵Paweł Sroka
_plugins_deactivate_dependency_check
2013-10-27Refs #6172 - Fixed one more trac mentionPaweł Sroka
2013-10-27Refs #5952 - Added testPaweł Sroka
2013-10-27#5952 - fix infinite loop when disabling > 50 annotations or metadataMatt Beckett
2013-10-25Merge pull request #6155 from jeabakker/fix-broken-unittest-from-398Paweł Sroka
fixed a unittest I broke in #398
2013-10-23Added comments regarding deactivation due to errorMatt Beckett
2013-10-23Revert "move deactivate event registration to the user-triggered action"Matt Beckett
This reverts commit 6da43b70ca0de807c0532adb0bba65405d3ffbc1.
2013-10-23found some more references to tracJerome Bakker
2013-10-23replaced all references to trac.elgg.org to the correct GitHub issuesJerome Bakker
2013-10-23fixed issue when reordering plugins to second last position of otherJeroen Dalsem
column that has more than 2 widgets
2013-10-22fixed a unittest I broke in #398Jerome Bakker
2013-10-13move deactivate event registration to the user-triggered actionbeck24
2013-10-13whitespace fixbeck24
2013-10-13Fixes #6177 - refuse to deactive plugins used as dependenciesbeck24
2013-10-08Fix inline docs for set_inputSteve Clay
2013-09-30fixes #6100 auth_gettoken now works with email addressJerome Bakker
2013-09-20Merge branch 'sembrestels-patch-2' into 1.8Steve Clay
2013-09-20Test that get_user_by_username accepts URL encoded inputSteve Clay
2013-09-20Adds comment to explain URL decoding in get_user_by_usernameSteve Clay
2013-09-20detect pagination needsJeroen Dalsem
2013-09-12spacingMatt Beckett
2013-09-12collections pages are only for logged in usersMatt Beckett
2013-09-12Added function for escaping query strings and fixed several XSRF ↵Paweł Sroka
vulnerabilities.
2013-09-12Fixes #6052. Urldecoding usernames to allow non-alphanumeric characters.Sem
2013-08-28Merge pull request #5552 from jeabakker/#251-ipv6-system-log-tableSteve Clay
Store IPv6 addresses losslessly in system_log
2013-08-09Avoiding 'explode() expects parameter 2 to be string, array given'Silvio Rhatto