Commit graph

6167 commits

Author SHA1 Message Date
friendica
0d0f129d04 Merge https://github.com/friendica/friendica into pull 2012-06-20 05:06:20 -07:00
friendica
f0db196288 iframes were getting stripped at the rss/atom parser level. We can preserve these because we will strip them in the purifier after checking for supported video sources 2012-06-20 05:04:51 -07:00
Simon
3a8c1a4371 Merge pull request #345 from simonlnu/master
theme tweaks
2012-06-20 02:07:16 -07:00
Simon L'nu
0be715d271 icon change; tweak button in toolbar; move site-location
Signed-off-by: Simon L'nu <simon.lnu@gmail.com>
2012-06-20 05:04:04 -04:00
friendica
961c633773 Merge pull request #344 from ridcully/master
exclude_replies for twitter api
2012-06-20 01:01:55 -07:00
friendica
b3bf48782f allow dfrn_deliver to undo a mark_for_death just in case the poller is consistently getting killed. 2012-06-19 20:59:22 -07:00
friendica
1dd33770ed plugin optimisation - don't loop through every single plugin callback for every hook call, only those registered for that hook 2012-06-19 18:26:40 -07:00
friendica
01aa953951 rework fallback themes, glob pattern was wrong 2012-06-19 16:22:38 -07:00
friendica
6e06d415bb Merge https://github.com/friendica/friendica into pull 2012-06-19 16:08:38 -07:00
Zvi ben Yaakov (a.k.a rdc)
4977ef4142 Added App::get_cached_avater_image usage in profile_sidebar function for creating the $diaspora array that is used to populate diaspora_vcard.tpl. This allows the correct profile image revision to be used when dfrn_request friend requests are made. 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
ff2f7dfeef Added App::get_cached_avatar_image usage on conversation wall of Normal View 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
a801888b15 Now using App::get_cached_avatar_image for /photos page 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
d4f4ed730c Now using App::get_cached_avatar_image for /profile/{nickname} page 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
6df74b8cd9 Now using App::get_cached_avatar_image for navigation bar 2012-06-19 16:05:39 -07:00
Zvi ben Yaakov (a.k.a rdc)
f8d9f15879 Now using App::get_cached_avatar_image for /directory page 2012-06-19 16:05:38 -07:00
Zvi ben Yaakov (a.k.a rdc)
ac50c9e84d Beginning to use App::get_cached_avatar_image for loading profile images in conversations 2012-06-19 16:05:38 -07:00
Zvi ben Yaakov (a.k.a rdc)
9058029eef Added get_cached_avatar_image to App class for shared profile image access and reduced sql queries/load 2012-06-19 16:05:37 -07:00
friendica
9c844e3bbe rev update 2012-06-19 16:04:20 -07:00
Zvi ben Yaakov (a.k.a rdc)
d20cdf09ea Merge git://github.com/friendica/friendica 2012-06-19 23:29:24 +03:00
Zvi ben Yaakov (a.k.a rdc)
5b057e5dee Added App::get_cached_avater_image usage in profile_sidebar function for
creating the $diaspora array that is used to populate diaspora_vcard.tpl.
This allows the correct profile image revision to be used when
dfrn_request friend requests are made.
2012-06-19 22:24:31 +03:00
Zvi ben Yaakov (a.k.a rdc)
45b4867bd3 Added App::get_cached_avatar_image usage on conversation wall of Normal View 2012-06-19 21:40:14 +03:00
tobiasd
79357ec60d Merge pull request #342 from fabrixxm/master
quattro: auto scroll and flash comment in display page
2012-06-19 10:12:09 -07:00
Sebastian Egbers
eab3938471 added exclude_replies option to api call statuses/user_timeline. 2012-06-19 16:27:23 +02:00
Sebastian Egbers
43532b7414 added exclude_replies option to api call statuses/home_timeline. 2012-06-19 16:15:19 +02:00
friendica
8b502bb486 position tweak 2012-06-19 03:34:31 -07:00
friendica
6325df3047 Merge https://github.com/friendica/friendica into pull 2012-06-19 00:50:55 -07:00
friendica
777830745f missing $submit 2012-06-19 00:50:24 -07:00
Tobias Diekershoff
c2842efd3f [DE] strings 2012-06-19 08:44:11 +02:00
Fabio Comuni
4c6a432130 quattro: in post display page, scroll to and flash selected comment 2012-06-19 06:54:41 +02:00
friendica
00a01e4520 minor nits 2012-06-18 21:28:13 -07:00
friendica
9dc5111347 a bit more description of message passing 2012-06-18 21:13:36 -07:00
friendica
e9aba87d76 add plugin hooks to every module_function (allows plugins to be triggered off specific pages/urls) 2012-06-18 20:57:43 -07:00
friendica
dbceef04e8 exif_read_data may not be available and isn't a requirement - check and silently ignore exif orientation if it isn't there 2012-06-18 20:21:54 -07:00
friendica
633726e4a9 Merge pull request #341 from fermionic/auto-orient-uploaded-images
rotate uploaded images if an EXIF rotation is present
2012-06-18 20:10:11 -07:00
Zach Prezkuta
7cd516e34f fix some whitespace issues 2012-06-18 21:06:54 -06:00
Zach Prezkuta
42fa47e8f7 rotate uploaded images if an EXIF rotation is present 2012-06-18 21:02:11 -06:00
friendica
9374e1966f some doco to explain what's happening 2012-06-18 20:01:32 -07:00
friendica
3e461abe6e some psuedo code for the basic building blocks of zot-2012 - these are just ideas without a lot of the details yet filled in and this should NOT be used as any kind of definitive reference. 2012-06-18 18:13:36 -07:00
friendica
341a5a2672 public forum author using private posting, correct the comment permissions downstream. 2012-06-18 17:19:56 -07:00
Thomas Willingham
371bdfb19d Typo breaking tag notifications 2012-06-18 22:00:18 +01:00
Zvi ben Yaakov (a.k.a rdc)
d1f81fff6b Now using App::get_cached_avatar_image for /photos page 2012-06-18 22:41:43 +03:00
Zvi ben Yaakov (a.k.a rdc)
0c5476c6f2 Now using App::get_cached_avatar_image for /profile/{nickname} page 2012-06-18 22:18:43 +03:00
Zvi ben Yaakov (a.k.a rdc)
428fce633f Now using App::get_cached_avatar_image for navigation bar 2012-06-18 22:09:00 +03:00
Zvi ben Yaakov (a.k.a rdc)
47650a0ee2 Now using App::get_cached_avatar_image for /directory page 2012-06-18 21:59:58 +03:00
Zvi ben Yaakov (a.k.a rdc)
88e7fe67de Beginning to use App::get_cached_avatar_image for loading profile images
in conversations
2012-06-18 21:17:02 +03:00
Zvi ben Yaakov (a.k.a rdc)
358ffaef24 Added get_cached_avatar_image to App class for shared profile image
access and reduced sql queries/load
2012-06-18 21:12:13 +03:00
Michael
6eaca19f41 Merge branch 'master' of github.com:annando/friendica
Conflicts:
	include/oembed.php
2012-06-18 08:51:12 +02:00
Michael
d53414a333 OEmbed: Don't output the width of images 2012-06-18 08:49:35 +02:00
friendica
d614089582 make subdued elements jump out at you on hover 2012-06-17 22:50:02 -07:00
friendica
83b9a8eb44 too many profiles 2012-06-17 19:40:16 -07:00