Commit Graph

1893 Commits

Author SHA1 Message Date
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
friendica f58f13dcc6 Merge pull request #36 from beardy-unixer/master
NSFW -> Content Filter
2012-04-02 17:04:45 -07:00
Thomas Willingham b58629e860 Reworded the UI of NSFW to make it more obviously a general purpose content filter 2012-04-03 00:41:55 +01:00
friendica 0bd56d115a Merge pull request #35 from CatoTH/master
Imprevements for the FB-Connector
2012-04-02 15:31:46 -07:00
Simon L'nu 8df87c556d Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  update packages
  make pageheader work on all themes

* master:
2012-04-02 16:57:22 -04:00
Michael Vogel 9ff72061f2 Facebook: Design issues in the export 2012-04-02 22:37:12 +02:00
Michael Vogel cb93edf725 Merge commit 'upstream/master' 2012-04-02 22:36:59 +02:00
Tobias Hößl df343dd2d6 Migration hint: the form cannot be used as long as the settings are set in .htconfig.php, so tell this to the administrator. 2012-04-02 20:25:15 +00:00
Tobias Hößl 02165e7464 Merge branch 'master' of git://github.com/friendica/friendica-addons 2012-04-02 20:12:37 +00:00
Tobias Hößl dc7bdfcec6 Check if the given AppID/Secret works. Make the polling interval configurable. 2012-04-02 20:12:06 +00:00
friendica 3c119e62a3 update packages 2012-04-01 22:27:32 -07:00
friendica c1935f6eab make pageheader work on all themes 2012-04-01 22:27:10 -07:00
Simon L'nu d1638405a0 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  provide optional sitewide channel list
  improved irc with some alternate channel selections

* master:
2012-04-02 00:00:38 -04:00
friendica 3b2cf61a55 provide optional sitewide channel list 2012-04-01 18:11:11 -07:00
friendica bda43f7315 improved irc with some alternate channel selections 2012-04-01 17:54:17 -07:00
Simon L'nu e5f3080f9c Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  package update
  FEATURE: AppID/Secret can now be entered on the plugin's admin page. BUG: if a connected FB-App is deleted and a new FB-App is connected, the app_access_token of the former App remained in the config and made it impossible to activate Real-Time Updates with the new App. USABILITY: Now the user's connector settings page automatically recognizes if the connection is still valid and acts accordingly. SECURITY: XSRF-Protection.
  pass IRC channel through url, allows simpler default choice.
  package update
  remove frown - no longer needed
  Show the pseudo-user Administrator instead of a broken image
  fixed a typo
  Provide a link to reactivate Real-Time Updated
  Another proposal for notifications after FB-Connection-Invalidation

* master:
2012-04-01 19:04:02 -04:00
Michael Vogel 483043eb1b wppost: Mechanism for guessing the title added 2012-04-01 19:20:40 +02:00
Michael Vogel 26ad8dc79a facebook: If the body is empty then the link is taken. 2012-04-01 16:30:25 +02:00
Michael Vogel ced503973a Merge commit 'upstream/master'
Conflicts:

	facebook/facebook.php
2012-04-01 14:08:36 +02:00
Michael Vogel 79f5e9d083 Handling of empty messages improved. They weren't posted. 2012-04-01 13:44:39 +02:00
friendica 4f24c19039 package update 2012-04-01 01:38:31 -07:00
friendica c739f47d36 Merge pull request #33 from CatoTH/master
Facebook-Connector - Notifications
2012-04-01 01:37:20 -07:00
Tobias Hößl 1b1237d97c FEATURE: AppID/Secret can now be entered on the plugin's admin page. BUG: if a connected FB-App is deleted and a new FB-App is connected, the app_access_token of the former App remained in the config and made it impossible to activate Real-Time Updates with the new App. USABILITY: Now the user's connector settings page automatically recognizes if the connection is still valid and acts accordingly. SECURITY: XSRF-Protection. 2012-04-01 07:42:50 +00:00
Tobias Hößl 5c59002db4 Merge branch 'master' of git://github.com/friendica/friendica-addons 2012-04-01 06:34:34 +00:00
friendica 96edae9196 pass IRC channel through url, allows simpler default choice. 2012-03-31 18:39:35 -07:00
friendica 84c243c640 package update 2012-03-31 18:12:28 -07:00
friendica 4f3dae9623 Merge branch 'apull' 2012-03-31 18:12:10 -07:00
friendica ded03edca5 remove frown - no longer needed 2012-03-31 18:11:33 -07:00
Michael Vogel 97bbcad0f5 Facebook: Removing useless content when posting to facebook. Now content on facebook really looks great. 2012-03-31 17:42:17 +02:00
Michael Vogel 5e9405e9dc Maximum limit for facebook is now max higher than 400. 2012-03-31 16:34:28 +02:00
Tobias Hößl e92b5336f8 Show the pseudo-user Administrator instead of a broken image 2012-03-31 08:29:13 +00:00
Tobias Diekershoff 745f578722 fixed a typo 2012-03-31 10:28:09 +02:00
Simon L'nu 00a606772a Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  SN/Twitter: added hint to the admin panel in the README file
  Twitter: add option to send #tag links to connected account
  SN: added option to not send #tag links to the SN account
  viewsrc only on your own stuff
  Twitter: if there is a title include it into the outgoing tweet
  SN: if there is a title, include in into the outgoing dent
  added namethingy app

* master:
2012-03-31 04:25:29 -04:00
Tobias Diekershoff 79fb8a1c45 SN/Twitter: added hint to the admin panel in the README file 2012-03-31 10:24:24 +02:00