Go to file
Simon L'nu 717d744e62 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: (24 commits)
  Remove tilde files
  Tobias outlined a rare situation where a site admin may not have an admin account, and will therefore need to do things in .htconfig.php
  .
  more wrong name
  add renamed package
  dash in filename won't work with plugins
  smilies_adult install issue after rename, package updates
  deleted:    adult_smile/adult_smile.php 	modified:   smiley_pack/smiley_pack.php 	renamed:    adult_smile/icons/bong.gif -> smilies-adult/icons/bong.gif 	renamed:    adult_smile/icons/drunk.gif -> smilies-adult/icons/drunk.gif 	renamed:    adult_smile/icons/sperm.gif -> smilies-adult/icons/sperm.gif 	renamed:    adult_smile/icons/tits.gif -> smilies-adult/icons/tits.gif 	new file:   smilies-adult/smilies-adult.php
  Brought readme up to date
  Brought readme up to date
  Brought readme up to date
  Brought README up to date.
  Changed the README for my variant, and changed "Last" users/likes/posts to Latest users/likes/posts.
  Improved nsfw/content filter
  Reworded the UI of NSFW to make it more obviously a general purpose content filter
  Facebook: Design issues in the export
  Migration hint: the form cannot be used as long as the settings are set in .htconfig.php, so tell this to the administrator.
  Check if the given AppID/Secret works. Make the polling interval configurable.
  wppost: Mechanism for guessing the title added
  facebook: If the body is empty then the link is taken.
  ...

* master:
2012-04-06 03:54:44 -04:00
blackout fixing some typos in blackout addon 2012-02-08 09:27:32 +01:00
blockem updated default profile photo 2012-03-20 15:44:53 -07: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 Changed the README for my variant, and changed "Last" users/likes/posts 2012-04-04 18:14:32 +01: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 Remove tilde files 2012-04-05 20:26:51 +01: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 Remove tilde files 2012-04-05 20:26:51 +01:00
irc provide optional sitewide channel list 2012-04-01 18:11:11 -07: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
namethingy added namethingy app 2012-03-30 05:35:55 -07:00
nsfw Improved nsfw/content filter 2012-04-03 01:45:06 +01:00
numfriends add numfriends plugin, update a couple of tgz's 2012-02-11 23:44:20 -08:00
openstreetmap Remove tilde files 2012-04-05 20:26:51 +01:00
page added namethingy app 2012-03-30 05:35:55 -07:00
pageheader make pageheader work on all themes 2012-04-01 22:27:10 -07:00
pages Pages: Moved under Networks 2012-03-17 13:44:13 +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 Show more: Changed "Show More" to "show more" 2012-03-17 11:09:21 +01:00
smiley_pack Remove tilde files 2012-04-05 20:26:51 +01:00
smilies_adult more wrong name 2012-04-05 00:29:55 -07:00
sniper Friendika -> Friendica (sniper) 2012-01-31 08:10:36 -03:00
statusnet fixed a typo 2012-03-31 10:28:09 +02: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 Remove tilde files 2012-04-05 20:26:51 +01:00
uhremotestorage Merge remote-tracking branch 'old/master' into mergeto 2012-02-09 20:13:36 +01:00
viewsrc viewsrc only on your own stuff 2012-03-30 23:19:14 -07:00
widgets widgets: only local user can change settings 2012-03-12 15:08:41 +01:00
wppost wppost: Mechanism for guessing the title added 2012-04-01 19:20:40 +02: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
blackout.tgz updating packages 2012-03-12 19:24:53 -07:00
blockem.tgz updated default profile photo 2012-03-20 15:44: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 smilies_adult install issue after rename, package updates 2012-04-04 15:45:00 -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 smilies_adult install issue after rename, package updates 2012-04-04 15:45:00 -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.tgz fix missing packages 2012-03-19 16:02:12 -07:00
impressum.tgz smilies_adult install issue after rename, package updates 2012-04-04 15:45:00 -07:00
irc.tgz provide optional sitewide channel list 2012-04-01 18:11:11 -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
namethingy.tgz added namethingy app 2012-03-30 05:35:55 -07:00
nsfw.tgz Merge https://github.com/annando/friendica-addons into apull 2012-04-03 16:30:28 -07:00
numfriends.tgz updating packages 2012-03-12 19:24:53 -07:00
openstreetmap.tgz smilies_adult install issue after rename, package updates 2012-04-04 15:45:00 -07:00
page.tgz added namethingy app 2012-03-30 05:35:55 -07:00
pageheader.tgz update packages 2012-04-01 22:27:32 -07:00
pages.tgz package updates 2012-03-29 03:53:54 -07: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 package updates 2012-03-29 03:53:54 -07:00
smiley_pack.tgz smilies_adult install issue after rename, package updates 2012-04-04 15:45:00 -07:00
smilies_adult.tgz more wrong name 2012-04-05 00:29:55 -07:00
sniper.tgz updating packages 2012-03-12 19:24:53 -07:00
statusnet.tgz package update 2012-03-31 18:12:28 -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 smilies_adult install issue after rename, package updates 2012-04-04 15:45:00 -07:00
uhremotestorage.tgz updating packages 2012-03-12 19:24:53 -07:00
viewsrc.tgz viewsrc only on your own stuff 2012-03-30 23:19:14 -07:00
widgets.tgz package updates 2012-03-29 03:53:54 -07:00
wppost.tgz Merge https://github.com/annando/friendica-addons into apull 2012-04-03 16:30:28 -07:00
yourls.tgz updating packages 2012-03-12 19:24:53 -07:00