Go to file
Simon L'nu a21d2b4a78 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  Fixed typo
  Fixed stuff
  Happy smileys
  Fixed typos per Fabian Dost bug report
  More irritating smileys to make everybody cross
  Fantasy smileys.  Alas, not the fantasty where nobody uses smileys.
  Suitable punishments for anyone who actually uses any of these smilies.
  Tired smileys
  actual smileys
  Stupid love smileys
  More retarded smileys
  bug: used uid for allow_gid instead of contact id

* master:
2012-03-19 00:35:55 -04:00
adult_smile not yet linked adult_smiles 2012-03-18 18:00:28 -07:00
blackout fixing some typos in blackout addon 2012-02-08 09:27:32 +01:00
blockem blockem: fix to work with changed 'display_item' hook 2012-03-02 11:33:07 +01:00
buglink permission change 644 to 755 for addons 2012-01-21 15:19:22 -08:00
calc permission change 644 to 755 for addons 2012-01-21 15:19:22 -08:00
communityhome Add Thomas Willingham contributed alternate version 2012-02-29 16:28:28 -08:00
convert permission change 644 to 755 for addons 2012-01-21 15:19:22 -08:00
dwpost replaces missing semi-colon... 2012-03-18 09:47:39 -04:00
editplain add numfriends plugin, update a couple of tgz's 2012-02-11 23:44:20 -08:00
extcron permission change 644 to 755 for addons 2012-01-21 15:19:22 -08:00
facebook bug: used uid for allow_gid instead of contact id 2012-03-18 18:51:52 -07:00
geonames add geonames plugin 2012-02-05 20:14:57 -08:00
gnot add gnot plugin 2012-02-27 17:17:22 -08:00
ijpost minor alteration 2012-03-18 09:37:46 -04:00
impressum Friendika -> Friendika (impressum) 2012-01-31 07:55:35 -03:00
irc added comments and link to documentation to irc.php 2012-03-18 12:10:55 -04:00
js_upload bug #77, photo upload produces inelegant warning if sizelimit exceeded 2012-02-16 22:48:12 -08:00
ldapauth Friendika -> Friendica (ldapauth) 2012-01-31 08:06:20 -03:00
ljpost minor 2012-03-18 09:50:50 -04:00
membersince updated to addressable profile entries 2012-02-07 20:35:25 -08:00
nsfw provide ability to disable n-s-f-w filter as a personal preference 2012-02-04 03:56:55 -08:00
numfriends add numfriends plugin, update a couple of tgz's 2012-02-11 23:44:20 -08:00
openstreetmap provide sane osm defaults if nothing has been configured 2012-02-19 14:26:41 -08:00
pageheader permission change 644 to 755 for addons 2012-01-21 15:19:22 -08:00
pages Pages: Some minor improvements (I guess) :) 2012-03-15 21:15:40 +01:00
piwik fix up the piwik README a bit so the markdown gets transformed 2012-02-22 23:38:35 -05:00
poormancron permission change 644 to 755 for addons 2012-01-21 15:19:22 -08:00
posterous updated some descriptions 2012-01-26 17:12:10 -08:00
qcomment descriptive text for qcomment settings 2012-02-28 18:41:24 -08:00
randplace add openstreetmap 2012-02-09 18:10:12 -08:00
showmore First commit: Addon for shortening long content and "show more" link. 2012-02-19 19:48:09 +01:00
smiley_pack Fixed typo 2012-03-19 04:06:41 +00:00
sniper Friendika -> Friendica (sniper) 2012-01-31 08:10:36 -03:00
statusnet added hint to SN/T connector settings about colliding privacy settings 2012-02-24 22:42:47 +01:00
tictac permission change 644 to 755 for addons 2012-01-21 15:19:22 -08:00
tumblr bug 266 - unlike some remote services, tumblr title is optional 2012-02-05 13:53:39 -08:00
twitter fix spelling from copy and paste, Twitter is not StatusNet (not yet anyway) 2012-03-12 18:49:59 +01:00
uhremotestorage Merge remote-tracking branch 'old/master' into mergeto 2012-02-09 20:13:36 +01:00
viewsrc add viewsrc addon 2012-01-26 16:50:35 -08:00
widgets Friendika -> Friendica (widgets) 2012-01-31 08:17:35 -03:00
wppost xmlify the login credentials - just in case 2012-03-01 15:48:58 -08:00
yourls bug #287 2012-02-17 15:31:15 -08:00
Makefile permission change 644 to 755 for addons 2012-01-21 15:19:22 -08:00
adult_smile.tgz facebook comment notifications 2012-03-17 01:21:38 -07:00
blackout.tgz updating packages 2012-03-12 19:24:53 -07:00
blockem.tgz updating packages 2012-03-12 19:24:53 -07:00
buglink.tgz updating packages 2012-03-12 19:24:53 -07:00
buildtgz [[ ]] evaluation was not working on Ubuntu /bin/sh 2012-02-19 17:32:05 -03:00
calc.tgz updating packages 2012-03-12 19:24:53 -07:00
communityhome.tgz updating packages 2012-03-12 19:24:53 -07:00
convert.tgz updating packages 2012-03-12 19:24:53 -07:00
dwpost.tgz pkg update 2012-03-18 17:59:17 -07:00
editplain.tgz updating packages 2012-03-12 19:24:53 -07:00
extcron.tgz updating packages 2012-03-12 19:24:53 -07:00
facebook.tgz bug: used uid for allow_gid instead of contact id 2012-03-18 18:51:52 -07:00
geonames.tgz updating packages 2012-03-12 19:24:53 -07:00
gnot.tgz updating packages 2012-03-12 19:24:53 -07:00
ijpost.tar.gz another attempt 2012-03-17 19:17:07 -04:00
impressum.tgz updating packages 2012-03-12 19:24:53 -07:00
irc.tgz pkg update 2012-03-18 17:59:17 -07:00
js_upload.tgz updating packages 2012-03-12 19:24:53 -07:00
ldapauth.tgz updating packages 2012-03-12 19:24:53 -07:00
ljpost.tgz pkg update 2012-03-18 17:59:17 -07:00
membersince.tgz updating packages 2012-03-12 19:24:53 -07:00
nsfw.tgz updating packages 2012-03-12 19:24:53 -07:00
numfriends.tgz updating packages 2012-03-12 19:24:53 -07:00
openstreetmap.tgz updating packages 2012-03-12 19:24:53 -07:00
pageheader.tgz updating packages 2012-03-12 19:24:53 -07:00
pages.tgz Pages: Added pages.tgz 2012-03-11 19:28:39 +01:00
piwik.tgz updating packages 2012-03-12 19:24:53 -07:00
poormancron.tgz updating packages 2012-03-12 19:24:53 -07:00
posterous.tgz updating packages 2012-03-12 19:24:53 -07:00
qcomment.tgz updating packages 2012-03-12 19:24:53 -07:00
randplace.tgz updating packages 2012-03-12 19:24:53 -07:00
showmore.tgz updating packages 2012-03-12 19:24:53 -07:00
sniper.tgz updating packages 2012-03-12 19:24:53 -07:00
statusnet.tgz updating packages 2012-03-12 19:24:53 -07:00
tictac.tgz updating packages 2012-03-12 19:24:53 -07:00
tumblr.tgz updating packages 2012-03-12 19:24:53 -07:00
twitter.tgz updating packages 2012-03-12 19:24:53 -07:00
uhremotestorage.tgz updating packages 2012-03-12 19:24:53 -07:00
viewsrc.tgz updating packages 2012-03-12 19:24:53 -07:00
widgets.tgz updating packages 2012-03-12 19:24:53 -07:00
wppost.tgz updating packages 2012-03-12 19:24:53 -07:00
yourls.tgz updating packages 2012-03-12 19:24:53 -07:00