aboutsummaryrefslogtreecommitdiff
path: root/mod
AgeCommit message (Collapse)Author
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-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-04Updated embed csspete
git-svn-id: http://code.elgg.org/elgg/trunk@6800 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-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-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-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
2010-07-14Disabling friend invite form when site has disabled new user registration.nickw
git-svn-id: http://code.elgg.org/elgg/trunk@6703 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-14Admin users can join groups. Don't request to join a closed group if admin.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6702 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-12Added logos to embed web services pane, and made embed nav-bar theme agnosticpete
git-svn-id: http://code.elgg.org/elgg/trunk@6699 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-12Removed old classes from embedpete
git-svn-id: http://code.elgg.org/elgg/trunk@6698 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-12Updated ecml and embed with new success/failure for input code.pete
git-svn-id: http://code.elgg.org/elgg/trunk@6697 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-12Corrected js for preview pane toggleclasspete
git-svn-id: http://code.elgg.org/elgg/trunk@6695 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-10messages now parse ecmldave
git-svn-id: http://code.elgg.org/elgg/trunk@6693 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-10ecml added to group profilesdave
git-svn-id: http://code.elgg.org/elgg/trunk@6691 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-09Web services tab now default embed tab if ecml is enabled.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6681 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-09Updated embed/ecml modal interfacepete
git-svn-id: http://code.elgg.org/elgg/trunk@6680 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-09keep sitepages settings in their normal locationdave
git-svn-id: http://code.elgg.org/elgg/trunk@6679 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-09continuation of embed modal interfacingpete
git-svn-id: http://code.elgg.org/elgg/trunk@6677 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-09Beginnings of embed modal web-services interfacing improvements.pete
git-svn-id: http://code.elgg.org/elgg/trunk@6676 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-09river view tweakeddave
git-svn-id: http://code.elgg.org/elgg/trunk@6675 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-09missing string addeddave
git-svn-id: http://code.elgg.org/elgg/trunk@6670 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-09Added instructions.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6669 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-09Added ecml help for web service embeds.brettp
git-svn-id: http://code.elgg.org/elgg/trunk@6668 36083f99-b078-4883-b0ff-0f9b5a30f544
2010-07-08Adding a missed oauth library file.nickw
git-svn-id: http://code.elgg.org/elgg/trunk@6667 36083f99-b078-4883-b0ff-0f9b5a30f544