aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-08-23Merged [6819] into trunk from 1.7 branchcash
git-svn-id: http://code.elgg.org/elgg/trunk@6856 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-23merged [6828] into trunk from 1.7 branchcash
git-svn-id: http://code.elgg.org/elgg/trunk@6855 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-23merged [6829] from 1.7 branch into trunkcash
git-svn-id: http://code.elgg.org/elgg/trunk@6854 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-23merged [6832] into trunk from 1.7 branchcash
git-svn-id: http://code.elgg.org/elgg/trunk@6853 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-23Fixed text overflow and word-breaking for base themepete
git-svn-id: http://code.elgg.org/elgg/trunk@6852 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-22Merged r6812:6837 from 1.7 branch to trunk (skipping some changes to plugins ↵cash
like groups and wire) git-svn-id: http://code.elgg.org/elgg/trunk@6851 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-22Merged r6757:6810 from 1.7 branch into trunkcash
git-svn-id: http://code.elgg.org/elgg/trunk@6850 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-22Merged r6701:6756 from 1.7 branch into trunkcash
git-svn-id: http://code.elgg.org/elgg/trunk@6849 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-22Merged r6684:6694 from 1.7 branch to trunk (pages plugin was manually merged ↵cash
due to standardization of code in trunk but not branch) git-svn-id: http://code.elgg.org/elgg/trunk@6848 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-22Merged r6671:6683 from 1.7 branch to trunkcash
git-svn-id: http://code.elgg.org/elgg/trunk@6847 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-22Merged r6620:6653 from 1.7 branch into trunkcash
git-svn-id: http://code.elgg.org/elgg/trunk@6846 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-22Merged r6614:6617 from 1.7 branch into trunkcash
git-svn-id: http://code.elgg.org/elgg/trunk@6845 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-22Merged [6612] from 1.7 into the trunkcash
git-svn-id: http://code.elgg.org/elgg/trunk@6844 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-22Merged [6600],[6601],[6605],[6606],[6607],[6608],[6611] from 1.7 branch into ↵cash
trunk git-svn-id: http://code.elgg.org/elgg/trunk@6843 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-21Merged r6586:6587 from 1.7 branch into trunkcash
git-svn-id: http://code.elgg.org/elgg/trunk@6842 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-21Merged [6573],[6574],[6582] from 1.7 branch into trunkcash
git-svn-id: http://code.elgg.org/elgg/trunk@6841 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-21Merged r6534-6559 from 1.7 branch to trunkcash
git-svn-id: http://code.elgg.org/elgg/trunk@6840 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-21Merging r6517:6520 from 1.7 branchcash
git-svn-id: http://code.elgg.org/elgg/trunk@6839 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-09Updated walledgarden login to wraplongnamespete
git-svn-id: http://code.elgg.org/elgg/trunk@6831 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-06cleaned up the included license, GPL v2dave
git-svn-id: http://code.elgg.org/elgg/trunk@6803 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-06Removed additional header/extend view from HTML head. Moved metatags view ↵brettp
to right before </html>. Removed the check if the view exists since it's done in elgg_view() anyway. git-svn-id: http://code.elgg.org/elgg/trunk@6802 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-04Added optional param to sanitise_filepath() that appends a / or not. Also ↵brettp
removes any ../s git-svn-id: http://code.elgg.org/elgg/trunk@6801 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-04Updated embed csspete
git-svn-id: http://code.elgg.org/elgg/trunk@6800 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-04Updated walled-garden login input boxes - so they are not effected by any ↵pete
theme running git-svn-id: http://code.elgg.org/elgg/trunk@6799 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-03a view inserted for plugins to extenddave
git-svn-id: http://code.elgg.org/elgg/trunk@6797 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-08-02inserted a view for plugins to extenddave
git-svn-id: http://code.elgg.org/elgg/trunk@6796 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-29correcting a mistake in the readme file.dave
git-svn-id: http://code.elgg.org/elgg/trunk@6790 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-21Merged pervious commit to 1.8.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6754 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-19small nav tweak to the filterdave
git-svn-id: http://code.elgg.org/elgg/trunk@6741 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-19Moved start conversation buttonpete
git-svn-id: http://code.elgg.org/elgg/trunk@6740 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-19missing string addeddave
git-svn-id: http://code.elgg.org/elgg/trunk@6739 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-19groups tab added to profiledave
git-svn-id: http://code.elgg.org/elgg/trunk@6738 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-19lang tweak on activity filterdave
git-svn-id: http://code.elgg.org/elgg/trunk@6737 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-19un-do last group commitdave
git-svn-id: http://code.elgg.org/elgg/trunk@6736 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-19Added interface elements for inline conversation posting from activity streampete
git-svn-id: http://code.elgg.org/elgg/trunk@6734 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-19added a view for plugins to extend the activity view if requireddave
git-svn-id: http://code.elgg.org/elgg/trunk@6733 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-18view for plugins to extend on group activitydave
git-svn-id: http://code.elgg.org/elgg/trunk@6732 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-16More code cleanup to pages.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6730 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-16Added display:page plugin hook in page_draw function.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6728 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-16plugin hook output:strip_tags is now format:strip_tags.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6727 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-16Removing stray text from previous commit.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6725 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-16elgg_make_excerpt() uses elgg_strip_tags().brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6724 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-15Using elgg_strip_tags() for notification body.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6720 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-15ECML removes keywords for elgg_strip_tags().brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6719 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-15Fixes #2099. Added elgg_strip_tags() to allow plugins to remove extra ↵brettp
formatting. git-svn-id: http://code.elgg.org/elgg/trunk@6718 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-15Parsing pages views for ecml.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6717 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-15First pass at standardizing pages.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6716 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-15Undoing previous 2 commits.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6715 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-15Converting spaces to tabs without the stray t.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6714 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-15Convert spaces to tabs.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6713 36083f99-b078-4883-b0ff-0f9b5a30f544