2792 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
friendica	6916fa594c	beyond "page" and "pages"	2012-09-27 02:27:29 -07:00
friendica	8f94568ada	fromapp force setting	2012-09-24 17:21:30 -07:00
friendica	1ea5df563f	trim result	2012-09-24 12:24:46 -07:00
friendica	6c1a20968c	posted 3 seconds ago from _________	2012-09-24 01:20:36 -07:00
friendica	2dd4220084	allow facebook_enable to work over api when post_by_default is true	2012-09-17 15:51:59 -07:00
friendica	cca08179de	ignore embedded photo binary blobs in n-s-f-w processing	2012-09-16 17:42:36 -07:00
friendica	62f275a9a1	Merge https://github.com/friendica/friendica-addons into apull	2012-09-13 03:47:42 -07:00
friendica	7d3c6362cf	post only facebook connector (untested - I no longer have a FB account)	2012-09-13 03:46:37 -07:00
Thomas Willingham	16ff3a8268	Morepokes - get rid of a translation PITA	2012-09-01 00:59:12 +01:00
fabrixxm	7b71fec622	Merge remote branch 'friendica/master'	2012-08-31 09:03:27 -04:00
Tobias Diekershoff	b258236022	jappixmini: mark the changes in the version number	2012-08-28 10:02:46 +02:00
Tobias Diekershoff	5b3bb96178	jappixmini: reverse logic for the option to do not add so not set yields the ... known behavior of inserting the chat witget	2012-08-28 09:56:00 +02:00
Tobias Diekershoff	fc2f3ef757	jappixmini: made the settings strings translateable and the insertion of the ... chat widget optional	2012-08-28 09:17:35 +02:00
Tobias Diekershoff	e63e8bb2f0	IMPRESSUM: added 'clear' before footer	2012-08-27 17:39:52 +02:00
tobiasd	6272aed8f2	Merge pull request #77 from cohan/master ... Changes for HTTPs sites	2012-08-18 04:45:19 -07:00
friendica	4b7f346ac1	bad html in blockem photo menu	2012-08-14 14:10:19 -07:00
Cohan Robinson	0fe4dbe598	That one didn't need changing for https installs	2012-08-14 17:33:24 +01:00
Cohan Robinson	37db2e3631	Removed misplaced(?) Google analytics code	2012-08-14 17:29:10 +01:00
Cohan Robinson	179bf75565	Include js with HTTPS-friendly URL	2012-08-14 17:28:43 +01:00
Cohan Robinson	cb654f24bb	Changed iframe to work nicely with HTTPS	2012-08-14 17:26:54 +01:00
Cohan Robinson	cfaf6d96f0	gzipped new change up	2012-08-14 17:25:00 +01:00
Cohan Robinson	1a1c268638	Changed piwik image failback to work with HTTPS installs	2012-08-14 17:22:31 +01:00
Tobias Hößl	5aa4e7d967	v0.3 - Only refactoring, no new features; please note that this is still alpha-software	2012-08-12 09:31:34 +00:00
Tobias Hößl	d233ccbcc7	An additional check to prevent PHP-notices that might corrupt the image data	2012-08-12 08:27:05 +00:00
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