Commit graph

1756 commits

Author SHA1 Message Date
Michael Vogel
52569e536e Tests considering removing of the title 2012-06-29 21:40:54 +02:00
Michael Vogel
a81af2e042 Merge remote branch 'upstream/master'
Conflicts:
	include/bb2diaspora.php
2012-06-23 12:50:00 +02:00
Michael Vogel
7a4ad4564d Diaspora: Messages are now looking better 2012-06-23 12:42:01 +02:00
Zach Prezkuta
9c9e727042 cleanup lists and more comment signature stuff 2012-06-22 20:45:37 -06:00
Zach Prezkuta
7b219649a4 expand support for BB code-to-Diaspora conversion 2012-06-22 20:45:37 -06: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
Zach Prezkuta
73c6f40ebc create new signed text for relayables right when relaying them 2012-06-20 20:52:09 -06:00
friendica
bf0ab10caf undefined unmark_for_death 2012-06-20 16:35:49 -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
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
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)
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)
ac50c9e84d Beginning to use App::get_cached_avatar_image for loading profile images in conversations 2012-06-19 16:05:38 -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
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
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
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
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
Michael Vogel
cc56f33b80 New option in the bbcode parser to disable oembed. 2012-06-18 01:29:08 +02:00
Zvi ben Yaakov (a.k.a rdc)
8af9fe8df7 Added missing backticks to navigation bar query 2012-06-17 23:39:28 +03:00
Zvi ben Yaakov (a.k.a rdc)
b0021a4637 Enabled Profile photo revisions to be displayed in navigation bar 2012-06-17 23:22:37 +03:00
Michael Vogel
3968e77f9e New function to convert bbcode to markdown. 2012-06-17 19:49:05 +02:00
friendica
7c2d27e275 rev update 2012-06-16 17:29:42 -07:00
Hauke Zuehl
cc7d849ce3 Merge remote branch 'upstream/master' 2012-06-16 19:49:04 +02:00
fermionic
950dacbbdd Merge pull request #338 from fermionic/diaspora-dont-check-more-signatures-than-diaspora-does
Diaspora dont check more signatures than diaspora does
2012-06-16 09:49:19 -07:00
Zach Prezkuta
3132ed2979 more cleanup 2012-06-16 10:45:26 -06:00
Zach Prezkuta
577cfdd314 some cleanup of obsolete code 2012-06-16 10:41:25 -06:00
Zach Prezkuta
0ff86e28bb fix small typo for logging command in api.php 2012-06-16 10:25:46 -06:00
Zach Prezkuta
0946c4a375 still need the original author information for comments and likes 2012-06-16 10:25:33 -06:00
Zach Prezkuta
09eb52810b update signature checking for relayables 2012-06-16 10:25:32 -06:00
Hauke Zuehl
f9a40ccbde Merge remote branch 'upstream/master' 2012-06-16 18:04:59 +02:00
Hauke Zuehl
1231dd72f0 Check if $rr exists 2012-06-16 15:07:23 +02:00
friendica
4faf0e609f rev update 2012-06-16 03:35:45 -07:00
friendica
ff45e11284 redundant log entry 2012-06-14 17:55:30 -07:00
friendica
2efee75557 also mark for death if there isn't any xml to be found 2012-06-14 17:38:39 -07:00
friendica
267681844d poll even if contact hasn't responded recently, so we can update the termination status 2012-06-14 17:27:07 -07:00
friendica
be090cc851 better handling of dead contacts 2012-06-14 16:56:46 -07:00
friendica
79e2ae3791 syntax on sql 2012-06-13 22:34:48 -07:00
friendica
edeca6d815 remove php version restriction on archive widget 2012-06-13 20:59:19 -07:00
friendica
b0a0c1ef4d couple of little fixes to enotify positional params 2012-06-13 20:03:18 -07:00