]> git.mxchange.org Git - friendica-addons.git/log
friendica-addons.git
12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 9 Apr 2012 23:20:13 +0000 (19:20 -0400)]
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:

12 years agopackage updates
friendica [Sun, 8 Apr 2012 12:22:48 +0000 (05:22 -0700)]
package updates

12 years agoMerge pull request #40 from annando/master
friendica [Sun, 8 Apr 2012 12:21:46 +0000 (05:21 -0700)]
Merge pull request #40 from annando/master

Pages removed, a small fix to "showmore" and many changes to the facebook import

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 7 Apr 2012 23:25:44 +0000 (19:25 -0400)]
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:

12 years agoFacebook: Removed the test output of empty posts.
Michael Vogel [Sat, 7 Apr 2012 22:27:26 +0000 (00:27 +0200)]
Facebook: Removed the test output of empty posts.

12 years agofacebook: Bug fixed that prevent old posts from being fetched.
Michael Vogel [Sat, 7 Apr 2012 19:38:45 +0000 (21:38 +0200)]
facebook: Bug fixed that prevent old posts from being fetched.

12 years agoMerge commit 'upstream/master'
Michael Vogel [Sat, 7 Apr 2012 16:33:41 +0000 (18:33 +0200)]
Merge commit 'upstream/master'

12 years agoFacebook: Now the last fetched date is saved.
Michael Vogel [Sat, 7 Apr 2012 16:11:57 +0000 (18:11 +0200)]
Facebook: Now the last fetched date is saved.

12 years agosmall change in my contact informations in the addon files
Tobias Diekershoff [Sat, 7 Apr 2012 07:21:49 +0000 (09:21 +0200)]
small change in my contact informations in the addon files

12 years agoTwitter: avooid sending broken words at the end of a Tweet
Tobias Diekershoff [Sat, 7 Apr 2012 05:07:55 +0000 (07:07 +0200)]
Twitter: avooid sending broken words at the end of a Tweet

12 years agoSN: avoide to send broken last words to SN when shorten a message
Tobias Diekershoff [Sat, 7 Apr 2012 05:02:55 +0000 (07:02 +0200)]
SN: avoide to send broken last words to SN when shorten a message

12 years agoShowmore: A little html bug was fixed (missing </div>)
Michael Vogel [Fri, 6 Apr 2012 21:36:41 +0000 (23:36 +0200)]
Showmore: A little html bug was fixed (missing </div>)

12 years agoFacebook: Pages are now imported. Formatting of the import is improved.
Michael Vogel [Fri, 6 Apr 2012 18:22:35 +0000 (20:22 +0200)]
Facebook: Pages are now imported. Formatting of the import is improved.

12 years agoSN/T: since inclusion of the title 2xMax_Char is too short, increasing that
Tobias Diekershoff [Fri, 6 Apr 2012 17:37:23 +0000 (19:37 +0200)]
SN/T: since inclusion of the title 2xMax_Char is too short, increasing that

12 years agoRemoved plugin "pages" because it was absolete. (Replaced by "page")
Michael Vogel [Fri, 6 Apr 2012 12:56:53 +0000 (14:56 +0200)]
Removed plugin "pages" because it was absolete. (Replaced by "page")

12 years agoFacebook: The import is now formatted in another way to make it look nicer
Michael Vogel [Fri, 6 Apr 2012 12:51:35 +0000 (14:51 +0200)]
Facebook: The import is now formatted in another way to make it look nicer

12 years agoImpressum: added optional page footer
Tobias Diekershoff [Fri, 6 Apr 2012 12:34:47 +0000 (14:34 +0200)]
Impressum: added optional page footer

12 years agoSN/Twitter relay updated the README file
Tobias Diekershoff [Fri, 6 Apr 2012 08:35:29 +0000 (10:35 +0200)]
SN/Twitter relay updated the README file

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 6 Apr 2012 07:54:44 +0000 (03:54 -0400)]
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:

12 years agoMerge pull request #39 from beardy-unixer/master
friendica [Thu, 5 Apr 2012 22:07:15 +0000 (15:07 -0700)]
Merge pull request #39 from beardy-unixer/master

Updated readme's again

12 years agoRemove tilde files
Thomas Willingham [Thu, 5 Apr 2012 19:26:51 +0000 (20:26 +0100)]
Remove tilde files

12 years agoTobias outlined a rare situation where a site admin may not have an
Thomas Willingham [Thu, 5 Apr 2012 19:23:40 +0000 (20:23 +0100)]
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..."

12 years ago.
Thomas Willingham [Thu, 5 Apr 2012 19:04:36 +0000 (20:04 +0100)]
.

12 years agomore wrong name
friendica [Thu, 5 Apr 2012 07:29:55 +0000 (00:29 -0700)]
more wrong name

12 years agoadd renamed package
friendica [Thu, 5 Apr 2012 07:25:26 +0000 (00:25 -0700)]
add renamed package

12 years agodash in filename won't work with plugins
friendica [Thu, 5 Apr 2012 07:24:34 +0000 (00:24 -0700)]
dash in filename won't work with plugins

12 years agosmilies_adult install issue after rename, package updates
friendica [Wed, 4 Apr 2012 22:43:34 +0000 (15:43 -0700)]
smilies_adult install issue after rename, package updates

12 years agoMerge pull request #38 from beardy-unixer/master
friendica [Wed, 4 Apr 2012 22:37:26 +0000 (15:37 -0700)]
Merge pull request #38 from beardy-unixer/master

Readme updates/Adult Smiley rename/small bug fix

12 years ago deleted: adult_smile/adult_smile.php
Thomas Willingham [Wed, 4 Apr 2012 19:07:55 +0000 (20:07 +0100)]
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

12 years agoBrought readme up to date
Thomas Willingham [Wed, 4 Apr 2012 17:59:37 +0000 (18:59 +0100)]
Brought readme up to date

12 years agoBrought readme up to date
Thomas Willingham [Wed, 4 Apr 2012 17:42:13 +0000 (18:42 +0100)]
Brought readme up to date

12 years agoBrought readme up to date
Thomas Willingham [Wed, 4 Apr 2012 17:38:23 +0000 (18:38 +0100)]
Brought readme up to date

12 years agoBrought README up to date.
Thomas Willingham [Wed, 4 Apr 2012 17:32:04 +0000 (18:32 +0100)]
Brought README up to date.

12 years agoChanged the README for my variant, and changed "Last" users/likes/posts
Thomas Willingham [Wed, 4 Apr 2012 17:14:32 +0000 (18:14 +0100)]
Changed the README for my variant, and changed "Last" users/likes/posts
to Latest users/likes/posts.

12 years agoMerge remote-tracking branch 'upstream/master'
Thomas Willingham [Wed, 4 Apr 2012 17:09:29 +0000 (18:09 +0100)]
Merge remote-tracking branch 'upstream/master'

12 years agoMerge https://github.com/annando/friendica-addons into apull
friendica [Tue, 3 Apr 2012 23:30:28 +0000 (16:30 -0700)]
Merge https://github.com/annando/friendica-addons into apull

Conflicts:
facebook/facebook.php

12 years agoMerge pull request #37 from beardy-unixer/master
friendica [Tue, 3 Apr 2012 01:01:00 +0000 (18:01 -0700)]
Merge pull request #37 from beardy-unixer/master

More improved NSFW

12 years agoMerge remote-tracking branch 'upstream/master'
Thomas Willingham [Tue, 3 Apr 2012 00:47:41 +0000 (01:47 +0100)]
Merge remote-tracking branch 'upstream/master'

12 years agoImproved nsfw/content filter
Thomas Willingham [Tue, 3 Apr 2012 00:45:06 +0000 (01:45 +0100)]
Improved nsfw/content filter

12 years agoMerge pull request #36 from beardy-unixer/master
friendica [Tue, 3 Apr 2012 00:04:45 +0000 (17:04 -0700)]
Merge pull request #36 from beardy-unixer/master

NSFW -> Content Filter

12 years agoReworded the UI of NSFW to make it more obviously a general purpose content filter
Thomas Willingham [Mon, 2 Apr 2012 23:41:55 +0000 (00:41 +0100)]
Reworded the UI of NSFW to make it more obviously a general purpose content filter

12 years agoMerge pull request #35 from CatoTH/master
friendica [Mon, 2 Apr 2012 22:31:46 +0000 (15:31 -0700)]
Merge pull request #35 from CatoTH/master

Imprevements for the FB-Connector

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 2 Apr 2012 20:57:22 +0000 (16:57 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  update packages
  make pageheader work on all themes

* master:

12 years agoFacebook: Design issues in the export
Michael Vogel [Mon, 2 Apr 2012 20:37:12 +0000 (22:37 +0200)]
Facebook: Design issues in the export

12 years agoMerge commit 'upstream/master'
Michael Vogel [Mon, 2 Apr 2012 20:36:59 +0000 (22:36 +0200)]
Merge commit 'upstream/master'

12 years agoMigration hint: the form cannot be used as long as the settings are set in .htconfig...
Tobias Hößl [Mon, 2 Apr 2012 20:25:15 +0000 (20:25 +0000)]
Migration hint: the form cannot be used as long as the settings are set in .htconfig.php, so tell this to the administrator.

12 years agoMerge branch 'master' of git://github.com/friendica/friendica-addons
Tobias Hößl [Mon, 2 Apr 2012 20:12:37 +0000 (20:12 +0000)]
Merge branch 'master' of git://github.com/friendica/friendica-addons

12 years agoCheck if the given AppID/Secret works. Make the polling interval configurable.
Tobias Hößl [Mon, 2 Apr 2012 20:12:06 +0000 (20:12 +0000)]
Check if the given AppID/Secret works. Make the polling interval configurable.

12 years agoupdate packages
friendica [Mon, 2 Apr 2012 05:27:32 +0000 (22:27 -0700)]
update packages

12 years agomake pageheader work on all themes
friendica [Mon, 2 Apr 2012 05:27:10 +0000 (22:27 -0700)]
make pageheader work on all themes

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Mon, 2 Apr 2012 04:00:38 +0000 (00:00 -0400)]
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:

12 years agoprovide optional sitewide channel list
friendica [Mon, 2 Apr 2012 01:11:11 +0000 (18:11 -0700)]
provide optional sitewide channel list

12 years agoimproved irc with some alternate channel selections
friendica [Mon, 2 Apr 2012 00:54:17 +0000 (17:54 -0700)]
improved irc with some alternate channel selections

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 1 Apr 2012 23:04:02 +0000 (19:04 -0400)]
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:

12 years agowppost: Mechanism for guessing the title added
Michael Vogel [Sun, 1 Apr 2012 17:20:40 +0000 (19:20 +0200)]
wppost: Mechanism for guessing the title added

12 years agofacebook: If the body is empty then the link is taken.
Michael Vogel [Sun, 1 Apr 2012 14:30:25 +0000 (16:30 +0200)]
facebook: If the body is empty then the link is taken.

12 years agoMerge commit 'upstream/master'
Michael Vogel [Sun, 1 Apr 2012 12:08:36 +0000 (14:08 +0200)]
Merge commit 'upstream/master'

Conflicts:

facebook/facebook.php

12 years agoHandling of empty messages improved. They weren't posted.
Michael Vogel [Sun, 1 Apr 2012 11:44:39 +0000 (13:44 +0200)]
Handling of empty messages improved. They weren't posted.

12 years agopackage update
friendica [Sun, 1 Apr 2012 08:38:31 +0000 (01:38 -0700)]
package update

12 years agoMerge pull request #33 from CatoTH/master
friendica [Sun, 1 Apr 2012 08:37:20 +0000 (01:37 -0700)]
Merge pull request #33 from CatoTH/master

Facebook-Connector - Notifications

12 years agoFEATURE: AppID/Secret can now be entered on the plugin's admin page. BUG: if a connec...
Tobias Hößl [Sun, 1 Apr 2012 07:42:50 +0000 (07:42 +0000)]
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.

12 years agoMerge branch 'master' of git://github.com/friendica/friendica-addons
Tobias Hößl [Sun, 1 Apr 2012 06:34:34 +0000 (06:34 +0000)]
Merge branch 'master' of git://github.com/friendica/friendica-addons

12 years agopass IRC channel through url, allows simpler default choice.
friendica [Sun, 1 Apr 2012 01:39:35 +0000 (18:39 -0700)]
pass IRC channel through url, allows simpler default choice.

12 years agopackage update
friendica [Sun, 1 Apr 2012 01:12:28 +0000 (18:12 -0700)]
package update

12 years agoMerge branch 'apull'
friendica [Sun, 1 Apr 2012 01:12:10 +0000 (18:12 -0700)]
Merge branch 'apull'

12 years agoremove frown - no longer needed
friendica [Sun, 1 Apr 2012 01:11:33 +0000 (18:11 -0700)]
remove frown - no longer needed

12 years agoFacebook: Removing useless content when posting to facebook. Now content on facebook...
Michael Vogel [Sat, 31 Mar 2012 15:42:17 +0000 (17:42 +0200)]
Facebook: Removing useless content when posting to facebook. Now content on facebook really looks great.

12 years agoMaximum limit for facebook is now max higher than 400.
Michael Vogel [Sat, 31 Mar 2012 14:34:28 +0000 (16:34 +0200)]
Maximum limit for facebook is now max higher than 400.

12 years agoShow the pseudo-user Administrator instead of a broken image
Tobias Hößl [Sat, 31 Mar 2012 08:29:13 +0000 (08:29 +0000)]
Show the pseudo-user Administrator instead of a broken image

12 years agofixed a typo
Tobias Diekershoff [Sat, 31 Mar 2012 08:28:09 +0000 (10:28 +0200)]
fixed a typo

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sat, 31 Mar 2012 08:25:29 +0000 (04:25 -0400)]
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:

12 years agoSN/Twitter: added hint to the admin panel in the README file
Tobias Diekershoff [Sat, 31 Mar 2012 08:24:24 +0000 (10:24 +0200)]
SN/Twitter: added hint to the admin panel in the README file

12 years agoMerge branch 'master' of https://github.com/friendica/friendica-addons
Tobias Diekershoff [Sat, 31 Mar 2012 08:20:45 +0000 (10:20 +0200)]
Merge branch 'master' of https://github.com/friendica/friendica-addons

12 years agoTwitter: add option to send #tag links to connected account
Tobias Diekershoff [Sat, 31 Mar 2012 08:19:36 +0000 (10:19 +0200)]
Twitter: add option to send #tag links to connected account

12 years agoMerge branch 'master' of git://github.com/friendica/friendica-addons
Tobias Hößl [Sat, 31 Mar 2012 08:16:12 +0000 (08:16 +0000)]
Merge branch 'master' of git://github.com/friendica/friendica-addons

12 years agoProvide a link to reactivate Real-Time Updated
Tobias Hößl [Sat, 31 Mar 2012 08:16:09 +0000 (08:16 +0000)]
Provide a link to reactivate Real-Time Updated

12 years agoSN: added option to not send #tag links to the SN account
Tobias Diekershoff [Sat, 31 Mar 2012 07:59:27 +0000 (09:59 +0200)]
SN: added option to not send #tag links to the SN account

12 years agoviewsrc only on your own stuff
friendica [Sat, 31 Mar 2012 06:19:14 +0000 (23:19 -0700)]
viewsrc only on your own stuff

12 years agoTwitter: if there is a title include it into the outgoing tweet
Tobias Diekershoff [Sat, 31 Mar 2012 06:06:07 +0000 (08:06 +0200)]
Twitter: if there is a title include it into the outgoing tweet

12 years agoSN: if there is a title, include in into the outgoing dent
Tobias Diekershoff [Sat, 31 Mar 2012 06:04:45 +0000 (08:04 +0200)]
SN: if there is a title, include in into the outgoing dent

12 years agoadded namethingy app
friendica [Fri, 30 Mar 2012 12:35:55 +0000 (05:35 -0700)]
added namethingy app

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Fri, 30 Mar 2012 12:24:45 +0000 (08:24 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  package updates
  Remove rembemberoid plugin

* master:

12 years agoThe "bookmark" element is now supported
Michael Vogel [Thu, 29 Mar 2012 18:04:54 +0000 (20:04 +0200)]
The "bookmark" element is now supported

12 years agopackage updates
friendica [Thu, 29 Mar 2012 10:53:54 +0000 (03:53 -0700)]
package updates

12 years agoMerge pull request #32 from fabrixxm/master
fabrixxm [Thu, 29 Mar 2012 08:37:36 +0000 (01:37 -0700)]
Merge pull request #32 from fabrixxm/master

Remove rembemeroid plugin

12 years agoRemove rembemberoid plugin
Fabio Comuni [Thu, 29 Mar 2012 07:34:59 +0000 (09:34 +0200)]
Remove rembemberoid plugin

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Thu, 29 Mar 2012 04:10:38 +0000 (00:10 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  viewsrc: show message source in a fancybox via ajax
  Fixed typo in smiley name.
  deleted:    .gitignore On second thoughts, better leave that to Mike since I don't really know what I'm doing
  Update .gitignore
  Facebook: detecting of images when exporting
  Pages: Moved under Networks
  Show more: Changed "Show More" to "show more"
  rembemberoid: save openid url in cookie on user request and use it to automatically login
  widgets: only local user can change settings

* master:

12 years agoMerge pull request #31 from annando/master
friendica [Wed, 28 Mar 2012 22:09:18 +0000 (15:09 -0700)]
Merge pull request #31 from annando/master

Improved facebook export, small changes to pages and showmore

12 years agoAnother proposal for notifications after FB-Connection-Invalidation
Tobias Hößl [Wed, 28 Mar 2012 19:23:32 +0000 (19:23 +0000)]
Another proposal for notifications after FB-Connection-Invalidation

12 years agoMerge commit 'upstream/master'
Michael Vogel [Wed, 28 Mar 2012 17:53:07 +0000 (19:53 +0200)]
Merge commit 'upstream/master'

12 years agoMerge pull request #30 from fabrixxm/master
friendica [Wed, 28 Mar 2012 12:14:53 +0000 (05:14 -0700)]
Merge pull request #30 from fabrixxm/master

viewsrc: show message source in a fancybox via ajax

12 years agoviewsrc: show message source in a fancybox via ajax
Fabio Comuni [Wed, 28 Mar 2012 09:44:04 +0000 (11:44 +0200)]
viewsrc: show message source in a fancybox via ajax

12 years agoMerge pull request #29 from beardy-unixer/master
friendica [Wed, 28 Mar 2012 04:41:02 +0000 (21:41 -0700)]
Merge pull request #29 from beardy-unixer/master

Minor smiley_pack fix

12 years agoFixed typo in smiley name.
Thomas Willingham [Wed, 28 Mar 2012 03:27:00 +0000 (04:27 +0100)]
Fixed typo in smiley name.

12 years agoMerge remote-tracking branch 'upstream/master'
Thomas Willingham [Wed, 28 Mar 2012 03:26:46 +0000 (04:26 +0100)]
Merge remote-tracking branch 'upstream/master'

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Tue, 27 Mar 2012 04:55:43 +0000 (00:55 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  package updates
  Send a notification to the user if his/her FB-Connections became invalid (usualle after changing the FB-Password)

* master:

12 years agopackage updates
friendica [Mon, 26 Mar 2012 21:57:09 +0000 (14:57 -0700)]
package updates

12 years agoMerge pull request #28 from CatoTH/master
Simon [Mon, 26 Mar 2012 18:34:27 +0000 (11:34 -0700)]
Merge pull request #28 from CatoTH/master

User notification when Facebook-Connection is invalid

12 years agoSend a notification to the user if his/her FB-Connections became invalid (usualle...
Tobias Hößl [Mon, 26 Mar 2012 13:08:22 +0000 (13:08 +0000)]
Send a notification to the user if his/her FB-Connections became invalid (usualle after changing the FB-Password)

12 years agoMerge branch 'master', remote-tracking branch 'remotes/upstream/master'
Simon L'nu [Sun, 25 Mar 2012 05:06:15 +0000 (01:06 -0400)]
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  Few more smileys
  tweaks to page plugin
  deleted:    smiley_pack/.smiley_pack.php.kate-swp
  modified:   .gitignore Commented out bits that don't seem relevant to friendica-addons.  Somebody should do this properly, but I'm not confident.
  new file:   .gitignore .gitignore file
  a few new smilieys, plus case-insensitivty for a couple of core smileys

* master: