Domovoy
6608cc5018
Merge branch 'master' of https://github.com/friendica/friendica into Imagick
2012-07-22 12:10:48 +02:00
friendica
691e770a68
Merge pull request #401 from copyninja/master
...
Image part of Site should be accessed only if its present
2012-07-22 00:47:56 -07:00
Vasudev Kamath
d3baaadf23
Merge branch 'master' of git://github.com/friendica/friendica
2012-07-22 12:43:32 +05:30
Vasudev Kamath
863617013c
Access image part of siteinfo only if $siteinfo["images"] is actually set. The current
...
code didn't check this so I was getting an error
Warning: Invalid argument supplied for foreach() in /home/vasudev/Public/friendica/mod/parse_url.php on line 305
Implemented a check before accessing $siteinfo["images"] with this commit and now warning doesn't come when giving URL of a site which doesn't have image from link button of post area
2012-07-22 12:41:07 +05:30
friendica
5255a5c9a9
rev update
2012-07-21 16:44:15 -07:00
Domovoy
fb2f4b6b35
Photo now uses Imagick instead of gd.
2012-07-21 17:17:19 +02:00
friendica
8c83828f83
rev update
2012-07-20 15:12:21 -07:00
friendica
0ff93edeee
poke privacy
2012-07-20 04:03:32 -07:00
friendica
43d986cab2
one for the ladies who get poked by undesirables.
2012-07-20 00:47:30 -07:00
friendica
700569c7d6
this is the one I'll probably use the most
2012-07-19 22:40:45 -07:00
friendica
9c72b45f36
and the main photo menu
2012-07-19 21:27:22 -07:00
friendica
64bd634582
add poke to contact photo menu
2012-07-19 21:03:31 -07:00
friendica
d1243c9ad7
allow to prefill - url/poke?f=&c=nn - nn is contact id
2012-07-19 20:54:23 -07:00
friendica
1a75507f78
check permission
2012-07-19 20:30:40 -07:00
friendica
a54278649f
poke notifications
2012-07-19 20:13:40 -07:00
friendica
b78bd8cc94
duplicate input names
2012-07-19 19:48:33 -07:00
friendica
2f641ecdc8
id mismatch
2012-07-19 18:50:33 -07:00
friendica
d442bbc482
have fun...
2012-07-19 18:17:16 -07:00
friendica
b6a3471608
rev update
2012-07-19 15:27:22 -07:00
friendica
b11f3b702f
Merge https://github.com/friendica/friendica into pull
2012-07-18 16:31:11 -07:00
friendica
082ad499c6
Merge pull request #400 from annando/master
...
New bb2markdown, parse_url improved
2012-07-18 16:30:12 -07:00
friendica
ac47edb775
rev update
2012-07-18 16:28:19 -07:00
Michael Vogel
222635d15a
parse_url: Just added a comment for future elements that should be added as well.
2012-07-18 21:06:38 +02:00
Michael Vogel
c8f99a8a66
Merge remote branch 'upstream/master'
2012-07-18 21:03:57 +02:00
friendica
749ae9b297
filter the protocol specifier in bbcode links.
2012-07-17 18:33:04 -07:00
friendica
884454f7ed
Merge https://github.com/friendica/friendica into pull
2012-07-16 17:04:23 -07:00
friendica
e477683987
rev update
2012-07-16 17:03:23 -07:00
friendica
7be921594b
Merge pull request #399 from mschmitt/master
...
Esperanto at 100% again
2012-07-16 15:38:06 -07:00
Martin Schmitt
eae6e665c0
Esperanto -> 100%
2012-07-16 22:33:23 +02:00
friendica
f440d76200
recover from datetime parse issues, inspired by https://github.com/friendica/friendica/pull/396
2012-07-15 21:00:11 -07:00
friendica
02d88e7cbe
name mixup in wall-to-wall hovertips
2012-07-15 20:56:09 -07:00
friendica
210fe188b2
missing param
2012-07-15 17:07:53 -07:00
friendica
c4643df01b
Merge https://github.com/friendica/friendica into pull
2012-07-15 14:23:43 -07:00
friendica
3408a56dd3
rev update
2012-07-15 14:22:45 -07:00
Simon
426b436610
Merge pull request #397 from simonlnu/master
...
re-add the sparkle stuff
2012-07-15 09:05:54 -07:00
Simon L'nu
021f0829e6
re-add the sparkle stuff
...
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-07-15 12:03:53 -04:00
Michael Vogel
7aa10d1935
Merge remote branch 'upstream/master'
2012-07-15 17:26:00 +02:00
Michael Vogel
335c15ede5
Hopefully the final fix for image links in bb2diaspora
2012-07-15 13:40:01 +02:00
Michael Vogel
8aeb3ec2fb
Corrected the fix for images with links
2012-07-15 13:12:24 +02:00
Michael Vogel
4e9086f9b0
Changes in the bbcode to markdown converter to make it more compatible with Diaspora
2012-07-15 12:47:24 +02:00
friendica
8767eedaac
sql fix - this should work a bit better
2012-07-14 20:38:30 -07:00
friendica
79b5520e77
sql errors on profile page
2012-07-14 20:28:17 -07:00
friendica
c87d3cb86f
rev update
2012-07-14 14:16:24 -07:00
friendica
e7acdffaf9
Merge pull request #395 from unary/altpager
...
add alt_pager function, add ability to use new pager logic on network, p...
2012-07-14 14:10:57 -07:00
Michael Johnston
717fd8539b
add alt_pager function, add ability to use new pager logic on network, profile, community, and search.
2012-07-14 14:21:58 -04:00
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
friendica
7fc1bae515
Merge pull request #394 from unary/community-pagination
...
fix pagination on community page
2012-07-14 00:28:39 -07:00
Michael Johnston
476b86e1a2
fix pagination on community page
2012-07-14 00:46:41 -04:00
friendica
8b6942c572
don't use language detection if < php 5.3
2012-07-13 15:38:02 -07:00
