aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2011-06-24Merge branch 'master' of github.com:Elgg/Elggcash
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-24fixed group forum discussion inline replies for activity pageCash Costello
2011-06-24Merge pull request #35 - Fixes #3404, #3490Cash Costello
2011-06-24fixed the previous commit for the conflictCash Costello
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-24Merge pull request #33 from mcloughlin3/masterCash Costello
Fix bug #1932
2011-06-24Merge pull request #39 from blacktooth/thewire-counterfixCash Costello
Fixes #3563 textarea has to be jQuery object
2011-06-23cleaned up the twitter api plugin settings so instructions are correct. Need ↵cash
to verify that login works.
2011-06-23added instructions back to twitter api plugin settingscash
2011-06-23added a css class so that we can limit the width of text instruction areas ↵cash
in admin area
2011-06-23Refs #1867 let group owner know what user they just removedCash Costello
2011-06-23Merge pull request #38 from jrtilson/groups-remove-userCash Costello
Fixes #1867 Added 'remove from group' link to the user hover menu
2011-06-23Fixes #3599 spacing of dashboard blurb fixedCash Costello
2011-06-23Fixes #3471 moved helpers to end of css/elggCash Costello
2011-06-23Fixes #3603 fixes display of @username in twitter widget - thanks to ManUtopiKCash Costello
2011-06-22backward compatibility of the admin page shell was broken when we ↵cash
reorganized the page view directory
2011-06-22added @username in the reply text for a wire postcash
2011-06-22Fixes #3598 sanitizing the $name variableCash Costello
2011-06-22Merge pull request #44 from lie2815/3546-menu-item-edit-textCash Costello
Fixes #3546 Add setText() method to ElggMenuItem class
2011-06-21Add param description to PHPDoc comments of setText() function.Franz Liedke
2011-06-21Fix dumb typos from last commit.Franz Liedke
2011-06-20removed debug codecash
2011-06-20Merge pull request #43 from lie2815/3486-menu-item-set-hrefCash Costello
Fixes #3486 Add setHref() method to ElggMenuItem class
2011-06-20Add setText() method to ElggMenuItem class. Fixes #3546.Franz Liedke
2011-06-20Add setHref() method to ElggMenuItem class. Fixes #3486.Franz Liedke
2011-06-19fixed the wire's previous ajax - the link class for the menu was lost in the ↵cash
conversion from plain class to link_class
2011-06-19fixed typo in edit profile fields instructionscash
2011-06-19we "upload" new files and "save" old onescash
2011-06-19moved the download button for files to the action menu (which probably needs ↵cash
to be a menu)
2011-06-19File uploads working now. It is hard coded to only work with file plugin.cash
2011-06-19added another way for an action to be detected as an Ajax action: set the ↵cash
request variable X-Requested-With = XMLHttpRequest. This is because files cannot be uploaded with XMLHttpRequest
2011-06-19removed the special ajax/embed code from the file plugincash
2011-06-19need the system messages to be above the lightbox overlay at 1000 z-indexcash
2011-06-19need a default container for files if form included from outside file plugin ↵cash
(like the embed plugin)
2011-06-19Fixes #3581 checks that the owner of a friends widget is a userCash Costello
2011-06-18fixed issue with embedding a file in an embedded filecash
2011-06-18added back tab switchingcash
2011-06-18rewrote pagination for embed file listingcash
2011-06-18rewrote the insert javascript as an intermediate step. I'm sure I completely ↵cash
broke ECML integration and uploading files.
2011-06-18using the new lightbox and hacking away at the complicated embed/embed viewcash
2011-06-18Fixes #3580 adding blog preview button that uses save actioncash
2011-06-18added "Preview" as a general term defined in language filecash
2011-06-18using elgg_delete_river() rather than custom SQL in blog save actioncash
2011-06-18moving the delete button in blog form to right sidecash
2011-06-18Calling normal user registration "manual" was confusing admin manual ↵cash
registration with user initiated registration
2011-06-18moved LICENCE.txt to LICENSE.txt to be consistent with readmeCash Costello
2011-06-13Using tabs, not spaces for indentationEvan Winslow
2011-06-13Renamed river footer to a more semantic "responses". Fixed discussionEvan Winslow
to work inline again with this new layout.