Commit graph

5526 commits

Author SHA1 Message Date
friendica
1043451390 please use make 2012-04-10 06:16:39 -07:00
friendica
161c034e35 Merge pull request #42 from tonybaldwin/master
Random Planets, Empirial Version
2012-04-10 06:01:04 -07:00
tony baldwin
9bcfb4fd6d Do not meddle in Imperial affairs.
This correction is none of your concern.
2012-04-10 08:59:12 -04:00
tony baldwin
0efaade0cf minor correction 2012-04-10 08:55:54 -04:00
tony baldwin
d06df8bed0 Merge remote branch 'upstream/master' 2012-04-10 08:46:37 -04:00
tony baldwin
bf09c24e15 added Random Planets, Empirial Version
Also, "blogger", but that is still in progress and untested.
2012-04-10 08:44:31 -04:00
Simon L'nu
6b8b076352 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  package updates
  Facebook: Removed the test output of empty posts.
  facebook: Bug fixed that prevent old posts from being fetched.
  Facebook: Now the last fetched date is saved.
  Showmore: A little html bug was fixed (missing </div>)
  Facebook: Pages are now imported. Formatting of the import is improved.
  Removed plugin "pages" because it was absolete. (Replaced by "page")
  Facebook: The import is now formatted in another way to make it look nicer

* master:
2012-04-09 19:20:13 -04:00
Michael Vogel
acebf88aa5 New addon "fromgplus". Should import Ãposts from Google+. Not working by now. 2012-04-09 22:05:22 +02:00
Michael Vogel
c9ccd91dd9 New addon "convpath": It converts all local links according to the current scheme (http/https) 2012-04-09 21:28:11 +02:00
Tobias Hößl
64cbef4f0d Provide a link to Martin Farrent's instructions instead of the obsolete README text; Prevent some Notices when running on E_ALL 2012-04-09 12:07:24 +00:00
Klaus Weidenbach
d0fa37e8ea Add Gravatar plugin.
This plugin provides the default gravatar lookup feature that has been in friendica's core before.
In addition it lets you choose the default avatar image type and select the allowed image rating.
2012-04-09 12:58:06 +02:00
Tobias Hößl
1df6f59127 Use batch requests when syncing friends; this reduces the time for synchronization a lot 2012-04-09 09:42:14 +00:00
friendica
8a3643e8db package updates 2012-04-08 05:22:48 -07:00
friendica
c42807e2ef Merge pull request #40 from annando/master
Pages removed, a small fix to "showmore" and many changes to the facebook import
2012-04-08 05:21:46 -07:00
Simon L'nu
3acd957c7e Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  small change in my contact informations in the addon files
  Twitter: avooid sending broken words at the end of a Tweet
  SN: avoide to send broken last words to SN when shorten a message
  SN/T: since inclusion of the title 2xMax_Char is too short, increasing that
  Impressum: added optional page footer
  SN/Twitter relay updated the README file

* master:
2012-04-07 19:25:44 -04:00
Michael Vogel
be9f1fb659 Facebook: Removed the test output of empty posts. 2012-04-08 00:27:26 +02:00
Michael Vogel
94186ab475 facebook: Bug fixed that prevent old posts from being fetched. 2012-04-07 21:38:45 +02:00
Michael Vogel
d5e1359716 Merge commit 'upstream/master' 2012-04-07 18:33:41 +02:00
Michael Vogel
11f1d7e260 Facebook: Now the last fetched date is saved. 2012-04-07 18:11:57 +02:00
Tobias Diekershoff
1a99b8a4ea small change in my contact informations in the addon files 2012-04-07 09:21:49 +02:00
Tobias Diekershoff
a12d68066b Twitter: avooid sending broken words at the end of a Tweet 2012-04-07 07:07:55 +02:00
Tobias Diekershoff
f245b1478f SN: avoide to send broken last words to SN when shorten a message 2012-04-07 07:02:55 +02:00
Michael Vogel
3689c821b6 Showmore: A little html bug was fixed (missing </div>) 2012-04-06 23:36:41 +02:00
Michael Vogel
33df399574 Facebook: Pages are now imported. Formatting of the import is improved. 2012-04-06 20:22:35 +02:00
Tobias Diekershoff
26dec371bb SN/T: since inclusion of the title 2xMax_Char is too short, increasing that 2012-04-06 19:37:23 +02:00
Michael Vogel
6fc0f8fc02 Removed plugin "pages" because it was absolete. (Replaced by "page") 2012-04-06 14:56:53 +02:00
Michael Vogel
c71fdbf348 Facebook: The import is now formatted in another way to make it look nicer 2012-04-06 14:51:35 +02:00
Tobias Diekershoff
75dd08fa73 Impressum: added optional page footer 2012-04-06 14:34:47 +02:00
Tobias Diekershoff
4b384b9345 SN/Twitter relay updated the README file 2012-04-06 10:35:29 +02:00
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
friendica
d6d767573c Merge pull request #39 from beardy-unixer/master
Updated readme's again
2012-04-05 15:07:15 -07:00
Thomas Willingham
5ad2d3c7f8 Remove tilde files 2012-04-05 20:26:51 +01:00
Thomas Willingham
1405c0c637 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

So, restore the .htconfig.php method as "If you prefer..."
2012-04-05 20:23:40 +01:00
Thomas Willingham
3ea3cd9ec3 . 2012-04-05 20:04:36 +01:00
friendica
f34ae9a886 more wrong name 2012-04-05 00:29:55 -07:00
friendica
64f8a9f799 add renamed package 2012-04-05 00:25:26 -07:00
friendica
f104364c82 dash in filename won't work with plugins 2012-04-05 00:24:34 -07:00
friendica
4162199bd3 smilies_adult install issue after rename, package updates 2012-04-04 15:45:00 -07:00
friendica
c8bace61cf Merge pull request #38 from beardy-unixer/master
Readme updates/Adult Smiley rename/small bug fix
2012-04-04 15:37:26 -07:00
Thomas Willingham
9492123690 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

Renamed adult_smilie for PR reasons.  Also linked unlinked smileys
2012-04-04 20:07:55 +01:00
Thomas Willingham
4ce905347c Brought readme up to date 2012-04-04 18:59:37 +01:00
Thomas Willingham
174296d496 Brought readme up to date 2012-04-04 18:42:13 +01:00
Thomas Willingham
7ec4923c34 Brought readme up to date 2012-04-04 18:38:23 +01:00
Thomas Willingham
098330df30 Brought README up to date. 2012-04-04 18:32:04 +01:00
Thomas Willingham
5c37a8a7ca Changed the README for my variant, and changed "Last" users/likes/posts
to Latest users/likes/posts.
2012-04-04 18:14:32 +01:00
Thomas Willingham
45fb368f07 Merge remote-tracking branch 'upstream/master' 2012-04-04 18:09:29 +01:00
friendica
19b264a20c Merge https://github.com/annando/friendica-addons into apull
Conflicts:
	facebook/facebook.php
2012-04-03 16:30:28 -07:00
friendica
e02ce5b200 Merge pull request #37 from beardy-unixer/master
More improved NSFW
2012-04-02 18:01:00 -07:00
Thomas Willingham
e1cfe38e54 Merge remote-tracking branch 'upstream/master' 2012-04-03 01:47:41 +01:00
Thomas Willingham
f54e93e8c3 Improved nsfw/content filter 2012-04-03 01:45:06 +01:00