aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-03-14Updating landing theme styleSilvio Rhatto
2014-03-14Merge commit 'beaab428eb8b6e19ca6d413249f6307100d9b853' as 'mod/saravea_theme'Silvio Rhatto
2014-03-14Squashed 'mod/saravea_theme/' content from commit daab1e0Silvio Rhatto
git-subtree-dir: mod/saravea_theme git-subtree-split: daab1e0a1d564efeb637ecb2ce27ade44f45ac64
2014-03-14Removing old saravea_theme folderSilvio Rhatto
2014-03-14Merge branch 'master' into saraveaSilvio Rhatto
Conflicts: mod/blog/views/default/blog/sidebar/archives.php
2014-01-22Merge branch 'hotfix/1.8.1.1'HEADmasterSem
2014-01-22Unmegred changes was breaking elgg.Sem
2014-01-22Merge branch 'release/1.8.1'Sem
2014-01-22Merge commit 'ae76fa880c7aeb7f7b0846dd4b109be8d398018c' into developSem
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-13Merge branch 'hotfix/1.8.1.1' into developSem
2014-01-13Fixed save action.Sem
2014-01-13Bumped version 1.8.1.1Sem
2014-01-13Deleted automatically generated file.Sem
2014-01-13Merge branch 'release/1.8.1' into developSem
2014-01-13Merge branch 'release/1.8.1'Sem
2014-01-13Bumped version 1.8.1Sem
2014-01-13Delete gedit automatically generated filesSem
2014-01-12little refactoringcapo
2014-01-12edit link only show when you can editcapo
2014-01-12fix identationcapo
2014-01-12review code from hellekin commentscapo
2014-01-11Prepare for 1.8.18 releaseSteve Clay
2014-01-07Merge pull request #6311 from mrclay/6309_fixJuho Jaakkola
Fixes #6309: Fixes notify_user() broken by 63db31c
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.
2014-01-01Preparing 1.8.17 releasePaweł Sroka
2013-12-29Merge branch 'master' into saraveaSilvio Rhatto
Conflicts: .gitmodules mod/admins mod/assemblies mod/audio_html5 mod/beechat mod/crud mod/elgg-activitystreams mod/elggman mod/elggpg mod/favorites mod/federated-objects mod/friendly_time mod/group_alias mod/group_operators mod/languages mod/lightpics mod/openid_client mod/spotlight mod/suicide mod/tasks mod/videolist
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-16Added feature to be able to use simplepie rss module in the groupscapo
2013-12-11Fixed directions for going to the site secret generation page.Brett Profitt
2013-12-11Merge pull request #6274 from juho-jaakkola/limited_groupsSteve Clay
Makes sure all group pages respect the limited_groups setting
2013-12-11Makes sure all group pages respect the limited_groups settingJuho Jaakkola
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-12-01Allow regenerating site secretSteve Clay
2013-11-29Merge pull request #6164 from jdalsem/file-remove-thumbsJuho Jaakkola
Fixes #6162 - Remove file thumbnails if no longer needed
2013-11-23Removes border-radius from radios/checkboxesSteve Clay
2013-11-20Fixing permissions changes from #6201Steve Clay
2013-11-12Merge branch 'release/1.8.0'Sem
2013-11-10Merge commit 'abc688bc15' into developSem
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 07:43:13 +0000