Commit graph

5914 commits

Author SHA1 Message Date
friendica
181a17bd05 share RSS items 2012-06-22 15:27:06 -07:00
friendica
99000382cd Merge https://github.com/friendica/friendica into pull 2012-06-22 00:25:46 -07:00
friendica
eeceecc9ba unterminated sql string 2012-06-22 00:25:01 -07:00
friendica
2961e6efaf Merge pull request #348 from max-weller/master
List statuses by conversation_id
2012-06-21 05:36:55 -07:00
Max Weller
6fe8a13b64 Added ORDER BY clause for conversation view 2012-06-21 12:55:03 +02:00
Max Weller
0f5a6bfcdb Added statuses/show parameter ?conversation=true 2012-06-21 10:53:48 +02:00
friendica
53c9ea7606 show last.fm source in username 2012-06-20 23:04:55 -07:00
friendica
91a3a2d551 follow last.fm scrobbles 2012-06-20 22:59:01 -07:00
friendica
788a6626ef Merge https://github.com/friendica/friendica into pull 2012-06-20 21:11:00 -07:00
friendica
0a302e100d try and eliminate the openssl warnings for forums trying to talk back to fans 2012-06-20 21:09:52 -07:00
friendica
a64d0ac905 Merge pull request #346 from fermionic/add-rotate-ccw-option
allow rotation to be either CW or CCW
2012-06-20 20:34:41 -07:00
fermionic
ec83a62f70 Merge pull request #347 from fermionic/diaspora-more-signature-refinements
create new signed text for relayables right when relaying them
2012-06-20 20:02:07 -07:00
Zach Prezkuta
73c6f40ebc create new signed text for relayables right when relaying them 2012-06-20 20:52:09 -06:00
Zach Prezkuta
54c76ca822 allow rotation either CW or CCW 2012-06-20 20:51:03 -06:00
Thomas Willingham
75e82dc077 Darkzero-NS fix weeks old BBIcon error 2012-06-21 03:14:41 +01:00
Thomas Willingham
c4df339b92 Darkzero/NS - make the archives font the same colour as the other widgets. 2012-06-21 02:42:38 +01:00
friendica
bf0ab10caf undefined unmark_for_death 2012-06-20 16:35:49 -07:00
friendica
f4e434cd46 sort out contact search oddities 2012-06-20 16:20:55 -07:00
friendica
03c05d8a28 missing paren 2012-06-20 16:07:41 -07:00
friendica
0f0e5be549 contact search oddities 2012-06-20 16:05:46 -07:00
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
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