6175 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	8d7d46ae7a	Bugfix: multiple linefeeds were generated when items where written in the editor. The existing fix didn't really work	2012-07-14 19:54:27 +02:00
Michael Vogel	72f430ae58	parse_url: Problem when resizing images	2012-07-14 13:59:42 +02:00
Michael Vogel	bfca7f47ef	Merge remote branch 'upstream/master' ... Conflicts: include/bb2diaspora.php	2012-07-13 23:39:51 +02:00
Michael Vogel	5f400c4a97	API: Now returns a real 404 when a function isn't implemented ... parse_url: Image handling improved	2012-07-13 23:23:31 +02:00
Simon	a153621f71	Merge pull request #393 from fermionic/live-updates-for-unlikes ... allow live updates for unlikes and undislikes	2012-07-13 12:40:57 -07:00
Zach Prezkuta	88711deceb	allow live updates for unlikes and undislikes	2012-07-13 09:09:01 -06:00
friendica	15cae001d9	move plink sparkles to the right html element in dispy	2012-07-13 04:22:42 -07:00
Simon	c3fc5ddae6	Merge pull request #392 from simonlnu/master ... add doctitle thingy, and update cursor	2012-07-13 01:35:55 -07:00
Simon L'nu	10ce535cac	add doctitle thingy, and update cursor ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-07-13 04:35:16 -04:00
Simon	a6de34605d	Merge pull request #391 from simonlnu/master ... add some sparkle ;)	2012-07-12 23:38:58 -07:00
Simon L'nu	d08a97bb9f	add some sparkle ;) ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-07-13 02:37:45 -04:00
friendica	f30b694ae4	Merge pull request #389 from fermionic/diaspora-likes-on-comments ... make likes on comments work with Diaspora, fix some small bugs	2012-07-12 22:52:00 -07:00
friendica	7b4accec81	Merge pull request #390 from fermionic/diaspora-fixed-mangled-text ... focus preg_replace to prevent it from catching too much	2012-07-12 22:51:20 -07:00
friendica	644b18eb2c	Merge https://github.com/friendica/friendica into pull	2012-07-12 22:49:50 -07:00
Zach Prezkuta	f92338d79b	make likes on comments work with Diaspora, some small bugs	2012-07-12 23:14:39 -06:00
Zach Prezkuta	92db5e5ec2	focus preg_replace to prevent it from catching too much	2012-07-12 23:14:29 -06:00
friendica	7f7e2c5de0	add plink to profile notifications	2012-07-12 16:12:37 -07:00
friendica	ce5ca967c1	rev update	2012-07-12 16:11:43 -07:00
Michael Vogel	02a1fc9cd0	parse_url: Further improvements of the new method to fetch page data	2012-07-12 23:41:04 +02:00
Thomas Willingham	bd08a6b565	Add sparkle cursor to Quattro/Vier/TestBubble	2012-07-12 19:21:21 +01:00
Michael Vogel	09034ce0ee	parse_url: Fetch multiple pictures so that the user can decide what to take.	2012-07-12 08:20:27 +02:00
friendica	9a299920eb	language detection - result is stored in item['postopts']	2012-07-11 22:45:14 -07:00
friendica	085b589468	add some sparkle to plinks	2012-07-11 21:04:08 -07:00
friendica	24ea480276	rev update	2012-07-11 17:55:39 -07:00
Michael Vogel	48f67ead9b	parse_url: complete new code for fetching website information	2012-07-12 01:17:33 +02:00
friendica	86cb638637	notification issue on wall-to-wall posts	2012-07-11 02:58:57 -07:00
friendica	3076f838f6	Merge https://github.com/friendica/friendica into pull	2012-07-10 20:33:28 -07:00
fermionic	bb817cb76d	Merge pull request #388 from fermionic/diaspora-signature-small-cleanup ... small cleanup	2012-07-10 18:30:55 -07:00
Zach Prezkuta	fc6f7daf38	small cleanup	2012-07-10 19:28:38 -06:00
friendica	12255dded5	rev update	2012-07-10 18:05:13 -07:00
friendica	1fda9e9365	rev update	2012-07-10 01:06:11 -07:00
fermionic	2096a5782e	Merge pull request #387 from fermionic/diaspora-slight-signature-bug ... missed a couple of variable names when I redid comment and like code	2012-07-09 19:38:16 -07:00
Zach Prezkuta	d89b4cea64	missed a couple of variable names when I redid comment and like code	2012-07-09 20:36:25 -06:00
friendica	61ff2ecab2	Merge pull request #385 from fermionic/peculiar-queue-hangup ... Prevent long delays in Diaspora delivery	2012-07-09 15:47:55 -07:00
Zach Prezkuta	00eb000e36	don't check for was_recently_delayed in diaspora_transmit during a queue run	2012-07-09 09:39:09 -06:00
friendica	ab710bce3b	Merge https://github.com/friendica/friendica into pull	2012-07-08 22:34:21 -07:00
friendica	caabb43326	diaspora message receive security issue - check message crypto signer against purported message author and bail if they don't match.	2012-07-08 22:32:04 -07:00
friendica	fcf971fea9	Merge pull request #383 from fermionic/auto-orient-all-uploaded-images ... auto-orient uploaded wall photos and profile photos also	2012-07-08 15:32:20 -07:00
tomtom84	9ae7555143	Merge pull request #384 from tomtom84/master ... diabook	2012-07-08 12:53:42 -07:00
tomtom84	f475850739	diabook: add notification in website-title, whenever new notifications arrive	2012-07-08 21:50:17 +02:00
Michael Vogel	47c48aa438	DBA: Possibility to log the database speed	2012-07-08 21:27:20 +02:00
Zach Prezkuta	fb4295f07f	better check for image EXIF support	2012-07-08 11:17:50 -06:00
Michael Vogel	db2f0f7919	Bugfix: API: No extra encoding for the status text - makes it more compatible to statusnet ... Bugfix: BBCode: Fixed charset problems.	2012-07-08 18:27:11 +02:00
tobiasd	5fc47d03bc	Merge pull request #382 from fermionic/archive-widget-bug ... check for posted dates based on month only	2012-07-08 08:39:01 -07:00
Zach Prezkuta	9fbe921051	auto-orient uploaded wall photos and profile photos also	2012-07-08 09:18:05 -06:00
Zach Prezkuta	c8378260bc	check for posted dates based on month only	2012-07-08 08:46:46 -06:00
friendica	63f10f6c6b	Merge https://github.com/friendica/friendica into pull	2012-07-07 21:55:15 -07:00
friendica	a3640b4e9f	Merge pull request #381 from fermionic/embed-multiple-private-photos ... Embed multiple private photos	2012-07-07 21:15:52 -07:00
Zach Prezkuta	6d10374c17	cleanup	2012-07-07 18:50:46 -06:00
Zach Prezkuta	da2ccebed8	fix bugs	2012-07-07 18:50:33 -06:00