Commit graph

4245 commits

Author SHA1 Message Date
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
Tobias Diekershoff
abecbd9212 Merge branch 'master' of https://github.com/friendica/friendica-addons 2012-03-31 10:20:45 +02:00
Tobias Diekershoff
a2ff679d2d Twitter: add option to send #tag links to connected account 2012-03-31 10:19:36 +02:00
Tobias Hößl
62022eddb9 Merge branch 'master' of git://github.com/friendica/friendica-addons 2012-03-31 08:16:12 +00:00
Tobias Hößl
fc4250303b Provide a link to reactivate Real-Time Updated 2012-03-31 08:16:09 +00:00
Tobias Diekershoff
b6ab56fd7f SN: added option to not send #tag links to the SN account 2012-03-31 09:59:27 +02:00
friendica
9ffb8f131d viewsrc only on your own stuff 2012-03-30 23:19:14 -07:00
Tobias Diekershoff
c388a7f6c9 Twitter: if there is a title include it into the outgoing tweet 2012-03-31 08:06:07 +02:00
Tobias Diekershoff
39edf6a500 SN: if there is a title, include in into the outgoing dent 2012-03-31 08:04:45 +02:00
friendica
81160d4046 added namethingy app 2012-03-30 05:35:55 -07:00
Simon L'nu
fdeac4284f Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  package updates
  Remove rembemberoid plugin

* master:
2012-03-30 08:24:45 -04:00
Michael Vogel
e688a2608a The "bookmark" element is now supported 2012-03-29 20:04:54 +02:00
friendica
48c02fcfe5 package updates 2012-03-29 03:53:54 -07:00
fabrixxm
07752ebafa Merge pull request #32 from fabrixxm/master
Remove rembemeroid plugin
2012-03-29 01:37:36 -07:00
Fabio Comuni
40d3a39d49 Remove rembemberoid plugin 2012-03-29 09:34:59 +02:00
Simon L'nu
beffd91100 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:
2012-03-29 00:10:38 -04:00
friendica
74fdd56ced Merge pull request #31 from annando/master
Improved facebook export, small changes to pages and showmore
2012-03-28 15:09:18 -07:00
Tobias Hößl
df8163fe0d Another proposal for notifications after FB-Connection-Invalidation 2012-03-28 19:23:32 +00:00
Michael Vogel
1fce805ee9 Merge commit 'upstream/master' 2012-03-28 19:53:07 +02:00
friendica
64a429ed31 Merge pull request #30 from fabrixxm/master
viewsrc: show message source in a fancybox via ajax
2012-03-28 05:14:53 -07:00
Fabio Comuni
5adb4ef803 viewsrc: show message source in a fancybox via ajax 2012-03-28 11:44:04 +02:00
friendica
b7bb933fa8 Merge pull request #29 from beardy-unixer/master
Minor smiley_pack fix
2012-03-27 21:41:02 -07:00
Thomas Willingham
47449e6238 Fixed typo in smiley name. 2012-03-28 04:27:00 +01:00
Thomas Willingham
73ec380c7c Merge remote-tracking branch 'upstream/master' 2012-03-28 04:26:46 +01:00
Simon L'nu
4df92de9eb 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:
2012-03-27 00:55:43 -04:00
friendica
fb9bb64689 package updates 2012-03-26 14:57:09 -07:00
Simon
008055c861 Merge pull request #28 from CatoTH/master
User notification when Facebook-Connection is invalid
2012-03-26 11:34:27 -07:00
Tobias Hößl
1adc9433a5 Send a notification to the user if his/her FB-Connections became invalid (usualle after changing the FB-Password) 2012-03-26 13:08:22 +00:00
Simon L'nu
0f87f3400f 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:
2012-03-25 01:06:15 -04:00
Simon
09f36c856a Merge pull request #27 from beardy-unixer/78a1f3277f72b15221c224262019a849b4c1edec
Update to smiley pack
2012-03-24 22:05:38 -07:00
Thomas Willingham
3a57b092d2 Merge branch 'master' of github.com:beardy-unixer/friendica-addons
Conflicts:
	.gitignore
2012-03-25 00:13:13 +00:00
Thomas Willingham
b388a8e2a2 deleted: .gitignore
On second thoughts, better leave that to Mike since I don't really know what I'm doing
2012-03-25 00:10:22 +00:00
Thomas Willingham
83670ac5bd Update .gitignore 2012-03-25 00:09:19 +00:00
Thomas Willingham
4a4bf31fae Merge remote-tracking branch 'upstream/master' 2012-03-25 00:02:16 +00:00
Thomas Willingham
78a1f3277f Few more smileys 2012-03-25 00:00:37 +00:00
friendica
4f925a9e4a tweaks to page plugin 2012-03-24 03:29:17 -07:00
Simon L'nu
1a2c142a9e Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  updated page plugin
  "page" addon - higher performance version of "pages" addon
  update pkg

* master:
2012-03-23 10:40:40 -04:00
friendica
2a193c4f09 updated page plugin 2012-03-23 01:44:24 -07:00
friendica
580bc49308 "page" addon - higher performance version of "pages" addon 2012-03-23 01:18:45 -07:00
friendica
16bdb3c9b3 update pkg 2012-03-22 18:28:05 -07:00
Thomas
b1d2020db5 deleted: smiley_pack/.smiley_pack.php.kate-swp 2012-03-22 21:15:54 +00:00
Thomas
85b05aa980 modified: .gitignore
Commented out bits that don't seem relevant to friendica-addons.  Somebody should do this properly, but I'm not confident.
2012-03-22 21:09:32 +00:00
Thomas
72e8ad0f94 Merge remote-tracking branch 'upstream/master' 2012-03-22 20:56:09 +00:00
Thomas
78427f5457 new file: .gitignore
.gitignore file
2012-03-22 20:54:32 +00:00
Thomas
184e2b776b a few new smilieys, plus case-insensitivty for a couple of core smileys 2012-03-22 20:53:03 +00:00
Michael Vogel
40d779af57 Facebook: detecting of images when exporting 2012-03-21 10:07:29 +01:00
Simon L'nu
6abe6b0a65 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
  updated default profile photo
  modified:   smiley_pack/smiley_pack.php
  clean up

* master:
2012-03-20 21:41:53 -04:00
Simon
e4aa572a25 Merge pull request #26 from beardy-unixer/master
Fixed regex problems
2012-03-20 18:41:08 -07:00
friendica
9ee713776e updated default profile photo 2012-03-20 15:44:53 -07:00