Commit Graph

5268 Commits (14fd9006286f338848876b843d060c629b59afb5)

Author SHA1 Message Date
Tobias Hößl a30ee1587f Merge branch 'master' of git://github.com/friendica/friendica-addons 2012-08-12 08:24:40 +00:00
Tobias Hößl 7f4cb9cf06 Merge branch 'master' of github.com:CatoTH/friendica-addons
Conflicts:
	dav/common/calendar_rendering.fnk.php
2012-08-11 08:08:23 +00:00
Tobias Hößl 6186153f68 Second part of refactoring; should be runnable again, yet not thoroughly tested 2012-08-11 08:07:19 +00:00
Tobias Hößl 87d314170b First part of Refactoring to stay compatible with v2.0 of the VObject library 2012-08-10 21:41:17 +02:00
fabrixxm 84a50a08c4 Merge remote branch 'friendica/master' 2012-08-09 05:09:36 -04:00
Tobias Hößl 8751d2221b Merge branch 'master' of github.com:CatoTH/friendica-addons 2012-08-04 10:48:42 +02:00
Tobias Hößl 9b1de8593f Change in database scheme 2012-08-04 10:48:25 +02:00
Tobias Hößl b8234a1cb8 Move friendica-specific parts into an own subdirectory 2012-08-04 08:46:11 +00:00
Tobias Hößl 8f5a88aa10 Fix some edge cases 2012-08-02 22:39:19 +02:00
Tobias Hößl f039582421 More refactoring, mainly of the addressbook/VCARD-part 2012-08-02 20:26:52 +00:00
friendica 999f189c5a package updates 2012-08-02 04:40:03 -07:00
friendica e6d6a12bd7 Merge pull request #75 from annando/master
Caching and secondary recycle sign detection
2012-08-02 03:48:43 -07:00
Michael Vogel 47396b1d28 Merge remote branch 'upstream/master' 2012-08-02 00:20:44 +02:00
Michael Vogel 14e10be1c4 privacy_image_cache: checking if the cached file really is an image 2012-08-02 00:16:56 +02:00
fabrixxm 418bb9e711 Merge remote branch 'friendica/master' 2012-08-01 02:42:40 -04:00
Tobias Hößl a9924ea443 Prevent a notice 2012-07-30 19:18:10 +00:00
Tobias Hößl a27f28d7bf Refactoring to make common/ more independent of the framework 2012-07-30 19:07:20 +00:00
friendica 4b3421df24 package update 2012-07-28 16:16:37 -07:00
friendica 1ff91aaf65 Merge pull request #73 from CatoTH/master
CalDAV Calendar: version 0.2
2012-07-28 16:12:37 -07:00
Thomas Willingham 74ce95da0b Merge pull request #74 from beardy-unixer/master
morepokes typo
2012-07-28 08:27:01 -07:00
Thomas Willingham 6009ab6c73 Merge remote-tracking branch 'upstream/master' 2012-07-28 16:23:57 +01:00
Thomas Willingham 7b889cc4b7 Fix a rather ironic typo. 2012-07-28 16:22:51 +01:00
Tobias Hößl a11f43472c Update Changelog, + CalDAV-related bugfix 2012-07-28 10:58:12 +00:00
Tobias Hößl ca54de9053 Merge branch 'master' of git://github.com/friendica/friendica-addons 2012-07-28 09:31:23 +00:00
Tobias Hößl d75d8b64fc Select only one day by default for weekly recurrence 2012-07-28 09:30:39 +00:00
Tobias Hößl 9c757b18ab Database Upgrade routine, and some bugfixes 2012-07-28 09:10:48 +00:00
friendica 6bb9446302 Merge pull request #72 from beardy-unixer/master
morepoke addon, group_text addon, and a couple of minor fixes.
2012-07-27 17:57:58 -07:00
friendica 89a43a2d0a package updates 2012-07-27 17:57:06 -07:00
Thomas Willingham 04e57fc374 missing CSS 2012-07-28 00:48:59 +01:00
Thomas Willingham 49aef48076 Extend openstreetmap description since quite a few people have installed it and been unable to work out what it did.
Update my URL in infiniteimprobabilitydrive so people can shout at the right person.

Remove pokes from morechoice, and put them in their own addon.  We'll leave the really "out there" ones away from the git.

Group text, created by user request.  Sets the group editor to text mode.  This is possibly too 'special interest' for the git, but I'll let somebody else decide.
2012-07-28 00:26:14 +01:00
Tobias Hößl 5b83872773 Notifications by E-Mail implemented 2012-07-27 18:35:14 +00:00
Tobias Hößl 5dcbe8eaa5 Notifications by E-Mail implemented 2012-07-27 18:35:12 +00:00
friendica fc3329e956 Merge pull request #71 from CyberDomovoy/nsfw_showmore
return 0 from get_body_length before loading the body to DomDocument if body is empty
2012-07-27 04:19:12 -07:00
Domovoy 7639f91179 Oooops, put back the warnings ignore for DomDocument 2012-07-27 10:12:12 +02:00
Domovoy 27a924f286 return 0 from get_body_length before loading the body to DomDocument if body is empty 2012-07-27 10:08:30 +02:00
Michael Vogel d33c565745 privacy_image_cache: removed experimental resize 2012-07-26 00:25:43 +02:00
Michael Vogel 88048bc18e privacy_image_cache: removed experimentual resize of pictures 2012-07-25 23:44:57 +02:00
Michael Vogel cd8944cdcc privacy_image_cache: Adding a file cache
statusnet/twitter: Adding detection of another recycle sign
2012-07-25 21:37:48 +02:00
Tobias Hößl ef8a46da2c Merge branch 'master' of git://github.com/friendica/friendica-addons 2012-07-25 17:13:14 +00:00
fabrixxm a3de3d8008 Merge remote branch 'friendica/master' 2012-07-24 10:40:33 -04:00
friendica 2eccbcae25 Merge pull request #70 from fermionic/twitter-plugin-messes-up-settings-display
errant closing div in twitter addon
2012-07-23 20:22:36 -07:00
Zach Prezkuta 35ac90f03d errant closing div in twitter addon 2012-07-23 20:39:21 -06:00
friendica bbdf6c1f78 Merge pull request #69 from CyberDomovoy/nsfw_showmore
Nsfw showmore
2012-07-23 17:39:20 -07:00
Tobias Hößl 8196f9b900 Set notifications of events; the actual notification routine is not yet implemented 2012-07-23 21:15:47 +00:00
Domovoy 47a5a5c03a Supree the warning of DomDocument::loadHTML 2012-07-23 21:22:20 +02:00
Tobias Hößl 62ec9bfa69 Merge branch 'master' of git://github.com/friendica/friendica-addons 2012-07-23 18:48:56 +00:00
Domovoy 7f34be5a9a The $node parameter of DomDocument::saveHTML was added only in php version 5.3.6.
No problem, strip_tags gets out anything we don't want anyway.
2012-07-23 20:46:09 +02:00
Domovoy 7b786e0214 showmore now only count what is visible to know if it should act, fixes #1 2012-07-23 20:07:15 +02:00
Domovoy 5f22a40974 Hook prepare_body now have a priority of 10, it is runned before showmore 2012-07-23 15:48:00 +02:00
friendica bbf6f71d03 morechoice update, package updates 2012-07-19 18:13:29 -07:00