aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge git://github.com/friendica/friendicaZvi ben Yaakov (a.k.a rdc)2012-06-1913-661/+1254
|\
| * Merge pull request #342 from fabrixxm/mastertobiasd2012-06-191-0/+16
| |\ | | | | | | quattro: auto scroll and flash comment in display page
| | * quattro: in post display page, scroll to and flash selected commentFabio Comuni2012-06-191-0/+16
| | |
| * | position tweakfriendica2012-06-191-0/+5
| | |
| * | Merge https://github.com/friendica/friendica into pullfriendica2012-06-192-655/+964
| |\ \
| | * | [DE] stringsTobias Diekershoff2012-06-192-655/+964
| | |/
| * / missing $submitfriendica2012-06-192-1/+2
| |/
| * minor nitsfriendica2012-06-181-1/+2
| |
| * a bit more description of message passingfriendica2012-06-181-0/+6
| |
| * add plugin hooks to every module_function (allows plugins to be triggered ↵friendica2012-06-181-1/+11
| | | | | | | | off specific pages/urls)
| * exif_read_data may not be available and isn't a requirement - check and ↵friendica2012-06-181-0/+3
| | | | | | | | silently ignore exif orientation if it isn't there
| * Merge pull request #341 from fermionic/auto-orient-uploaded-imagesfriendica2012-06-182-1/+62
| |\ | | | | | | rotate uploaded images if an EXIF rotation is present
| | * fix some whitespace issuesZach Prezkuta2012-06-181-13/+13
| | |
| | * rotate uploaded images if an EXIF rotation is presentZach Prezkuta2012-06-182-1/+62
| | |
| * | some doco to explain what's happeningfriendica2012-06-181-5/+26
| | |
| * | some psuedo code for the basic building blocks of zot-2012 - these are just ↵friendica2012-06-181-0/+154
| |/ | | | | | | ideas without a lot of the details yet filled in and this should NOT be used as any kind of definitive reference.
| * public forum author using private posting, correct the comment permissions ↵friendica2012-06-183-3/+9
| | | | | | | | downstream.
| * Typo breaking tag notificationsThomas Willingham2012-06-181-1/+1
| |
* | Added App::get_cached_avater_image usage in profile_sidebar function forZvi ben Yaakov (a.k.a rdc)2012-06-191-3/+3
| | | | | | | | | | | | 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.
* | Added App::get_cached_avatar_image usage on conversation wall of Normal ViewZvi ben Yaakov (a.k.a rdc)2012-06-191-1/+1
| |
* | Now using App::get_cached_avatar_image for /photos pageZvi ben Yaakov (a.k.a rdc)2012-06-181-2/+2
| |
* | Now using App::get_cached_avatar_image for /profile/{nickname} pageZvi ben Yaakov (a.k.a rdc)2012-06-181-2/+2
| |
* | Now using App::get_cached_avatar_image for navigation barZvi ben Yaakov (a.k.a rdc)2012-06-181-2/+2
| |
* | Now using App::get_cached_avatar_image for /directory pageZvi ben Yaakov (a.k.a rdc)2012-06-181-2/+2
| |
* | Beginning to use App::get_cached_avatar_image for loading profile imagesZvi ben Yaakov (a.k.a rdc)2012-06-181-1/+1
| | | | | | | | in conversations
* | Added get_cached_avatar_image to App class for shared profile imageZvi ben Yaakov (a.k.a rdc)2012-06-181-0/+25
|/ | | | access and reduced sql queries/load
* make subdued elements jump out at you on hoverfriendica2012-06-171-0/+15
|
* too many profilesfriendica2012-06-171-1/+1
|
* rev updatefriendica2012-06-172-7/+7
|
* Enabled Profile photo revisions to be displayed on /photos pageZvi ben Yaakov (a.k.a rdc)2012-06-171-2/+2
|
* Added missing backticks to navigation bar queryZvi ben Yaakov (a.k.a rdc)2012-06-171-1/+1
|
* Enabled Profile photo revisions to be displayed on /profiles pageZvi ben Yaakov (a.k.a rdc)2012-06-171-2/+2
|
* Enabled Profile photo revisions to be displayed in navigation barZvi ben Yaakov (a.k.a rdc)2012-06-171-2/+2
|
* Enabled Profile photo revisions to be displayed on /directory pageZvi ben Yaakov (a.k.a rdc)2012-06-171-2/+2
|
* rev updatefriendica2012-06-163-7/+7
|
* Merge pull request #336 from hauke68/masterfriendica2012-06-161-4/+2
|\ | | | | Pull request
| * Merge remote branch 'upstream/master'Hauke Zuehl2012-06-162-72/+109
| |\ | |/ |/|
* | Merge pull request #338 from ↵fermionic2012-06-161-71/+108
|\ \ | | | | | | | | | | | | fermionic/diaspora-dont-check-more-signatures-than-diaspora-does Diaspora dont check more signatures than diaspora does
| * | more cleanupZach Prezkuta2012-06-161-15/+0
| | |
| * | some cleanup of obsolete codeZach Prezkuta2012-06-161-31/+6
| | |
| * | still need the original author information for comments and likesZach Prezkuta2012-06-161-0/+24
| | |
| * | update signature checking for relayablesZach Prezkuta2012-06-161-69/+122
| | |
* | | Merge pull request #337 from fermionic/fix-api_php-logging-typofermionic2012-06-161-1/+1
|\ \ \ | |/ / |/| | fix small typo for logging command in api.php
| * | fix small typo for logging command in api.phpZach Prezkuta2012-06-161-1/+1
|/ /
| * Merge remote branch 'upstream/master'Hauke Zuehl2012-06-1634-524/+979
| |\ | |/ |/|
* | rev updatefriendica2012-06-163-90/+84
| |
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-151-6/+21
|\ \
| * \ Merge pull request #335 from fabrixxm/masterfabrixxm2012-06-151-6/+21
| |\ \ | | | | | | | | The missing mod/network.php
| | * | the missing mod/network.phpfabrixxm2012-06-151-6/+21
| |/ /
* / / redundant log entryfriendica2012-06-141-1/+0
|/ /