Commit graph

17579 commits

Author SHA1 Message Date
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
Michael Vogel
cc56f33b80 New option in the bbcode parser to disable oembed. 2012-06-18 01:29:08 +02:00
friendica
b385729c17 rev update 2012-06-17 16:00:47 -07:00
Zvi ben Yaakov (a.k.a rdc)
edc68f4876 Enabled Profile photo revisions to be displayed on /photos page 2012-06-17 23:59:29 +03: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)
1ee22a749e Enabled Profile photo revisions to be displayed on /profiles page 2012-06-17 23:24:47 +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
Zvi ben Yaakov (a.k.a rdc)
59e0b6a0e3 Enabled Profile photo revisions to be displayed on /directory page 2012-06-17 23:20:14 +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
friendica
217bd2a704 Merge pull request #336 from hauke68/master
Pull request
2012-06-16 16:25:40 -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
fermionic
bb6027b6b5 Merge pull request #337 from fermionic/fix-api_php-logging-typo
fix small typo for logging command in api.php
2012-06-16 09:33:15 -07: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
4c3598ce2f Merge https://github.com/friendica/friendica into pull 2012-06-15 06:15:59 -07:00
fabrixxm
10e99e9463 Merge pull request #335 from fabrixxm/master
The missing mod/network.php
2012-06-15 01:21:57 -07:00
fabrixxm
6416d09c71 the missing mod/network.php 2012-06-15 03:18:42 -04:00
friendica
ff45e11284 redundant log entry 2012-06-14 17:55:30 -07:00
friendica
ba0ea1e651 mod/network.php was lost 2012-06-14 17:46:58 -07:00
friendica
40e6d87d08 highlight the lost contact message 2012-06-14 17:41:24 -07:00
friendica
8c94fa23bf Merge https://github.com/friendica/friendica into pull 2012-06-14 17:39:17 -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
244d7f9a8f Merge pull request #334 from fabrixxm/master
Fix bug 453 and small update to quattro theme
2012-06-14 16:00:50 -07:00
fabrixxm
f66ae301b8 network: fix bug #453 2012-06-14 10:04:13 -04:00
fabrixxm
2f5e891cd1 quattro theme: show uncollapsed comments on display page 2012-06-14 09:25:18 -04:00
friendica
e68e9ec5f4 Required for github/Windows 2012-06-14 18:39:48 +10:00
friendica
79e2ae3791 syntax on sql 2012-06-13 22:34:48 -07:00
friendica
4229debff8 ajax append placeholder, fix some html warnings 2012-06-13 21:40:02 -07:00
friendica
edeca6d815 remove php version restriction on archive widget 2012-06-13 20:59:19 -07:00