Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge git://github.com/friendica/friendica | Zvi ben Yaakov (a.k.a rdc) | 2012-06-19 | 13 | -661/+1254 |
|\ | |||||
| * | Merge pull request #342 from fabrixxm/master | tobiasd | 2012-06-19 | 1 | -0/+16 |
| |\ | | | | | | | quattro: auto scroll and flash comment in display page | ||||
| | * | quattro: in post display page, scroll to and flash selected comment | Fabio Comuni | 2012-06-19 | 1 | -0/+16 |
| | | | |||||
| * | | position tweak | friendica | 2012-06-19 | 1 | -0/+5 |
| | | | |||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-19 | 2 | -655/+964 |
| |\ \ | |||||
| | * | | [DE] strings | Tobias Diekershoff | 2012-06-19 | 2 | -655/+964 |
| | |/ | |||||
| * / | missing $submit | friendica | 2012-06-19 | 2 | -1/+2 |
| |/ | |||||
| * | minor nits | friendica | 2012-06-18 | 1 | -1/+2 |
| | | |||||
| * | a bit more description of message passing | friendica | 2012-06-18 | 1 | -0/+6 |
| | | |||||
| * | add plugin hooks to every module_function (allows plugins to be triggered ↵ | friendica | 2012-06-18 | 1 | -1/+11 |
| | | | | | | | | off specific pages/urls) | ||||
| * | exif_read_data may not be available and isn't a requirement - check and ↵ | friendica | 2012-06-18 | 1 | -0/+3 |
| | | | | | | | | silently ignore exif orientation if it isn't there | ||||
| * | Merge pull request #341 from fermionic/auto-orient-uploaded-images | friendica | 2012-06-18 | 2 | -1/+62 |
| |\ | | | | | | | rotate uploaded images if an EXIF rotation is present | ||||
| | * | fix some whitespace issues | Zach Prezkuta | 2012-06-18 | 1 | -13/+13 |
| | | | |||||
| | * | rotate uploaded images if an EXIF rotation is present | Zach Prezkuta | 2012-06-18 | 2 | -1/+62 |
| | | | |||||
| * | | some doco to explain what's happening | friendica | 2012-06-18 | 1 | -5/+26 |
| | | | |||||
| * | | some psuedo code for the basic building blocks of zot-2012 - these are just ↵ | friendica | 2012-06-18 | 1 | -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 ↵ | friendica | 2012-06-18 | 3 | -3/+9 |
| | | | | | | | | downstream. | ||||
| * | Typo breaking tag notifications | Thomas Willingham | 2012-06-18 | 1 | -1/+1 |
| | | |||||
* | | Added App::get_cached_avater_image usage in profile_sidebar function for | Zvi ben Yaakov (a.k.a rdc) | 2012-06-19 | 1 | -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 View | Zvi ben Yaakov (a.k.a rdc) | 2012-06-19 | 1 | -1/+1 |
| | | |||||
* | | Now using App::get_cached_avatar_image for /photos page | Zvi ben Yaakov (a.k.a rdc) | 2012-06-18 | 1 | -2/+2 |
| | | |||||
* | | Now using App::get_cached_avatar_image for /profile/{nickname} page | Zvi ben Yaakov (a.k.a rdc) | 2012-06-18 | 1 | -2/+2 |
| | | |||||
* | | Now using App::get_cached_avatar_image for navigation bar | Zvi ben Yaakov (a.k.a rdc) | 2012-06-18 | 1 | -2/+2 |
| | | |||||
* | | Now using App::get_cached_avatar_image for /directory page | Zvi ben Yaakov (a.k.a rdc) | 2012-06-18 | 1 | -2/+2 |
| | | |||||
* | | Beginning to use App::get_cached_avatar_image for loading profile images | Zvi ben Yaakov (a.k.a rdc) | 2012-06-18 | 1 | -1/+1 |
| | | | | | | | | in conversations | ||||
* | | Added get_cached_avatar_image to App class for shared profile image | Zvi ben Yaakov (a.k.a rdc) | 2012-06-18 | 1 | -0/+25 |
|/ | | | | access and reduced sql queries/load | ||||
* | make subdued elements jump out at you on hover | friendica | 2012-06-17 | 1 | -0/+15 |
| | |||||
* | too many profiles | friendica | 2012-06-17 | 1 | -1/+1 |
| | |||||
* | rev update | friendica | 2012-06-17 | 2 | -7/+7 |
| | |||||
* | Enabled Profile photo revisions to be displayed on /photos page | Zvi ben Yaakov (a.k.a rdc) | 2012-06-17 | 1 | -2/+2 |
| | |||||
* | Added missing backticks to navigation bar query | Zvi ben Yaakov (a.k.a rdc) | 2012-06-17 | 1 | -1/+1 |
| | |||||
* | Enabled Profile photo revisions to be displayed on /profiles page | Zvi ben Yaakov (a.k.a rdc) | 2012-06-17 | 1 | -2/+2 |
| | |||||
* | Enabled Profile photo revisions to be displayed in navigation bar | Zvi ben Yaakov (a.k.a rdc) | 2012-06-17 | 1 | -2/+2 |
| | |||||
* | Enabled Profile photo revisions to be displayed on /directory page | Zvi ben Yaakov (a.k.a rdc) | 2012-06-17 | 1 | -2/+2 |
| | |||||
* | rev update | friendica | 2012-06-16 | 3 | -7/+7 |
| | |||||
* | Merge pull request #336 from hauke68/master | friendica | 2012-06-16 | 1 | -4/+2 |
|\ | | | | | Pull request | ||||
| * | Merge remote branch 'upstream/master' | Hauke Zuehl | 2012-06-16 | 2 | -72/+109 |
| |\ | |/ |/| | |||||
* | | Merge pull request #338 from ↵ | fermionic | 2012-06-16 | 1 | -71/+108 |
|\ \ | | | | | | | | | | | | | fermionic/diaspora-dont-check-more-signatures-than-diaspora-does Diaspora dont check more signatures than diaspora does | ||||
| * | | more cleanup | Zach Prezkuta | 2012-06-16 | 1 | -15/+0 |
| | | | |||||
| * | | some cleanup of obsolete code | Zach Prezkuta | 2012-06-16 | 1 | -31/+6 |
| | | | |||||
| * | | still need the original author information for comments and likes | Zach Prezkuta | 2012-06-16 | 1 | -0/+24 |
| | | | |||||
| * | | update signature checking for relayables | Zach Prezkuta | 2012-06-16 | 1 | -69/+122 |
| | | | |||||
* | | | Merge pull request #337 from fermionic/fix-api_php-logging-typo | fermionic | 2012-06-16 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | fix small typo for logging command in api.php | ||||
| * | | fix small typo for logging command in api.php | Zach Prezkuta | 2012-06-16 | 1 | -1/+1 |
|/ / | |||||
| * | Merge remote branch 'upstream/master' | Hauke Zuehl | 2012-06-16 | 34 | -524/+979 |
| |\ | |/ |/| | |||||
* | | rev update | friendica | 2012-06-16 | 3 | -90/+84 |
| | | |||||
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-15 | 1 | -6/+21 |
|\ \ | |||||
| * \ | Merge pull request #335 from fabrixxm/master | fabrixxm | 2012-06-15 | 1 | -6/+21 |
| |\ \ | | | | | | | | | The missing mod/network.php | ||||
| | * | | the missing mod/network.php | fabrixxm | 2012-06-15 | 1 | -6/+21 |
| |/ / | |||||
* / / | redundant log entry | friendica | 2012-06-14 | 1 | -1/+0 |
|/ / |