Commit Graph

253 Commits (c92861618bd46646e2e861e33eaeb227721a6be1)

Author SHA1 Message Date
Fabio Comuni c92861618b Merge remote-tracking branch 'friendica/master' 2012-03-19 12:28:41 +01:00
Simon 365757a2ce Merge pull request #22 from beardy-unixer/master
Loads more smileys and a couple of typo-fixes
2012-03-18 21:35:12 -07:00
Thomas 8a5e770a8c Fixed typo 2012-03-19 04:06:41 +00:00
Thomas 2d03d285e4 Fixed stuff 2012-03-19 03:35:28 +00:00
Thomas 760abc1593 Merge remote-tracking branch 'upstream/master' 2012-03-19 03:34:54 +00:00
Thomas 0bc7e1302d Happy smileys 2012-03-19 03:32:34 +00:00
Thomas c39003b224 Fixed typos per Fabian Dost bug report 2012-03-19 03:25:37 +00:00
Thomas 530dacc123 More irritating smileys to make everybody cross 2012-03-19 03:19:23 +00:00
Thomas bad9d035fe Fantasy smileys. Alas, not the fantasty where nobody uses smileys. 2012-03-19 03:14:02 +00:00
Thomas 69fc5a53da Suitable punishments for anyone who actually uses any of these smilies. 2012-03-19 03:07:41 +00:00
Thomas a0a630eeaf Tired smileys 2012-03-19 02:55:23 +00:00
Thomas 9a0daeb205 actual smileys 2012-03-19 02:49:17 +00:00
Thomas 9ac0113c08 Stupid love smileys 2012-03-19 02:47:18 +00:00
Thomas 4910970823 More retarded smileys 2012-03-19 02:42:14 +00:00
friendica 0be5a02c9c bug: used uid for allow_gid instead of contact id 2012-03-18 18:51:52 -07:00
friendica 20ab0c68af not yet linked adult_smiles 2012-03-18 18:00:28 -07:00
friendica c397089f9d pkg update 2012-03-18 17:59:17 -07:00
friendica dd46179855 Merge pull request #21 from beardy-unixer/master
New plugin - smiley pack
2012-03-18 17:56:16 -07:00
Simon 71ad01ee5b Merge pull request #20 from tonybaldwin/master
added comments and link to documentation for irc
2012-03-18 15:18:50 -07:00
Thomas 0d19b9efed deleted: smiley_pack/smiley_pack.php~ 2012-03-18 22:05:37 +00:00
Thomas 97334a59c6 First set of smilies for smiley_pack 2012-03-18 22:04:53 +00:00
Tony Baldwin 403022498d added comments and link to documentation to irc.php 2012-03-18 12:10:55 -04:00
Simon e8562283af Merge pull request #19 from tonybaldwin/master
added insanejournal
2012-03-18 06:56:14 -07:00
Tony Baldwin 1f50a42135 minor 2012-03-18 09:50:50 -04:00
Tony Baldwin 28a7fb2680 replaces missing semi-colon... 2012-03-18 09:47:39 -04:00
Tony Baldwin cf6f514fe9 minor alteration 2012-03-18 09:37:46 -04:00
Tony Baldwin b1fb01437f another attempt
having difficulties
perhaps resolved?
2012-03-17 19:17:07 -04:00
Tony Baldwin 3d38180d8f corrections, minor alterations 2012-03-17 18:34:25 -04:00
Tony Baldwin f26c87aaea minor alterations, mostly to ijpost 2012-03-17 17:53:53 -04:00
Tony Baldwin 06e04aca2f added Cat's tag stuff to ijpost 2012-03-17 17:30:21 -04:00
Tony Baldwin f75d96e5bc Merge remote branch 'upstream/master' 2012-03-17 17:16:57 -04:00
Tony Baldwin 6696cc4cd1 minor adjustment to ijpost.php 2012-03-17 16:49:40 -04:00
Tony Baldwin 7949cf3f53 cleaned up where "lj" was included in dwpost.css
changed my profile url to the current, free-haven profile, in all
plugins to which I have contributed
added insanejournal.com plugin, ijpost
other minor cleanup of details, where a plugin was copied and modified
but incorrect details were left.
2012-03-17 16:40:17 -04:00
friendica 3503adb8cc facebook comment notifications 2012-03-17 01:21:38 -07:00
friendica 50a1a15c49 Merge pull request #18 from annando/master
New addon "pages" and a small change to the facebook addon
2012-03-15 15:29:33 -07:00
Michael Vogel 61edc9ff5e Pages: Some minor improvements (I guess) :) 2012-03-15 21:15:40 +01:00
Michael Vogel 96d8df11f7 Merge commit 'upstream/master' 2012-03-15 21:12:25 +01:00
friendica 14770093d9 adult_smile addon 2012-03-13 02:01:24 -07:00
friendica 2f467fb853 updating packages 2012-03-12 19:24:53 -07:00
tobiasd 75ddc730c1 fix spelling from copy and paste, Twitter is not StatusNet (not yet anyway) 2012-03-12 18:49:59 +01:00
Fabio Comuni 266eba9aea rembemberoid: save openid url in cookie on user request and use it to automatically login 2012-03-12 15:09:58 +01:00
Fabio Comuni 02483e4c94 widgets: only local user can change settings 2012-03-12 15:08:41 +01:00
Michael Vogel bdbefde50a Removed the test file 2012-03-11 19:43:37 +01:00
Michael Vogel a0f3c982ef Pages: Added pages.tgz 2012-03-11 19:28:39 +01:00
Michael Vogel 746a42e4e0 Merge commit 'upstream/master' 2012-03-11 19:27:18 +01:00
Michael Vogel 0f3f8deee3 Pages: New plugin that displays a list of community pages on the sidebar. 2012-03-11 19:24:05 +01:00
friendica 84f26d06c4 Merge pull request #17 from catness/master
Tags support for LJ and DW connector.
2012-03-08 14:43:58 -08:00
friendica 9e05e03a04 Merge pull request #16 from CatoTH/master
Support for Facebook's Real-Time Updates 
CatoTH - you might wish to consider moving delete_url to include/network.php, but since that is in a separate repository best to wrap it in "if (! function_exists('delete_url')) ..." in case somebody git updates the addon at a different time than the main code.
2012-03-08 14:43:22 -08:00
Cat Gray f68ba9b87d Added tags support to LJ and DW connectors. (Friendica tags are converted to LJ/DW tags.) 2012-03-08 21:57:57 +02:00
Tobias Hößl 49f2d04a15 Bugfix 2012-03-05 11:43:38 +00:00