Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | minor tweaks to some tpl files | Simon L'nu | 2012-06-22 | 3 | -3/+4 |
| | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-22 | 1 | -10/+17 |
|\ | |||||
| * | Merge pull request #348 from max-weller/master | friendica | 2012-06-21 | 1 | -10/+17 |
| |\ | | | | | | | List statuses by conversation_id | ||||
| | * | Added ORDER BY clause for conversation view | Max Weller | 2012-06-21 | 1 | -1/+1 |
| | | | |||||
| | * | Added statuses/show parameter ?conversation=true | Max Weller | 2012-06-21 | 1 | -10/+17 |
| |/ | |||||
* / | unterminated sql string | friendica | 2012-06-22 | 3 | -68/+76 |
|/ | |||||
* | show last.fm source in username | friendica | 2012-06-20 | 1 | -0/+1 |
| | |||||
* | follow last.fm scrobbles | friendica | 2012-06-20 | 1 | -1/+9 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-20 | 5 | -65/+56 |
|\ | |||||
| * | Merge pull request #346 from fermionic/add-rotate-ccw-option | friendica | 2012-06-20 | 2 | -11/+18 |
| |\ | | | | | | | allow rotation to be either CW or CCW | ||||
| | * | allow rotation either CW or CCW | Zach Prezkuta | 2012-06-20 | 2 | -11/+18 |
| | | | |||||
| * | | Merge pull request #347 from fermionic/diaspora-more-signature-refinements | fermionic | 2012-06-20 | 1 | -52/+28 |
| |\ \ | | |/ | |/| | create new signed text for relayables right when relaying them | ||||
| | * | create new signed text for relayables right when relaying them | Zach Prezkuta | 2012-06-20 | 1 | -52/+28 |
| |/ | |||||
| * | Darkzero-NS fix weeks old BBIcon error | Thomas Willingham | 2012-06-21 | 1 | -2/+2 |
| | | |||||
| * | Darkzero/NS - make the archives font the same colour as the other widgets. | Thomas Willingham | 2012-06-21 | 2 | -0/+8 |
| | | |||||
* | | try and eliminate the openssl warnings for forums trying to talk back to fans | friendica | 2012-06-20 | 1 | -1/+1 |
|/ | |||||
* | undefined unmark_for_death | friendica | 2012-06-20 | 1 | -0/+1 |
| | |||||
* | sort out contact search oddities | friendica | 2012-06-20 | 1 | -4/+3 |
| | |||||
* | missing paren | friendica | 2012-06-20 | 1 | -1/+1 |
| | |||||
* | contact search oddities | friendica | 2012-06-20 | 3 | -63/+64 |
| | |||||
* | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-20 | 8 | -3814/+3907 |
|\ | |||||
| * | Merge pull request #345 from simonlnu/master | Simon | 2012-06-20 | 7 | -3812/+3898 |
| |\ | | | | | | | theme tweaks | ||||
| | * | icon change; tweak button in toolbar; move site-location | Simon L'nu | 2012-06-20 | 7 | -3812/+3898 |
| |/ | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | Merge pull request #344 from ridcully/master | friendica | 2012-06-20 | 1 | -2/+9 |
| |\ | | | | | | | exclude_replies for twitter api | ||||
| | * | added exclude_replies option to api call statuses/user_timeline. | Sebastian Egbers | 2012-06-19 | 1 | -1/+4 |
| | | | |||||
| | * | added exclude_replies option to api call statuses/home_timeline. | Sebastian Egbers | 2012-06-19 | 1 | -1/+5 |
| | | | |||||
* | | | iframes were getting stripped at the rss/atom parser level. We can preserve ↵ | friendica | 2012-06-20 | 2 | -3/+5 |
| | | | | | | | | | | | | these because we will strip them in the purifier after checking for supported video sources | ||||
* | | | allow dfrn_deliver to undo a mark_for_death just in case the poller is ↵ | friendica | 2012-06-19 | 1 | -0/+5 |
|/ / | | | | | | | consistently getting killed. | ||||
* | | plugin optimisation - don't loop through every single plugin callback for ↵ | friendica | 2012-06-19 | 2 | -25/+18 |
| | | | | | | | | every hook call, only those registered for that hook | ||||
* | | rework fallback themes, glob pattern was wrong | friendica | 2012-06-19 | 1 | -2/+2 |
| | | |||||
* | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-19 | 1 | -0/+16 |
|\ \ | |||||
| * \ | 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 |
| | | | |||||
* | | | 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-19 | 1 | -2/+2 |
| | | | |||||
* | | | Now using App::get_cached_avatar_image for /profile/{nickname} page | Zvi ben Yaakov (a.k.a rdc) | 2012-06-19 | 1 | -2/+2 |
| | | | |||||
* | | | Now using App::get_cached_avatar_image for navigation bar | Zvi ben Yaakov (a.k.a rdc) | 2012-06-19 | 1 | -2/+2 |
| | | | |||||
* | | | Now using App::get_cached_avatar_image for /directory page | Zvi ben Yaakov (a.k.a rdc) | 2012-06-19 | 1 | -2/+2 |
| | | | |||||
* | | | Beginning to use App::get_cached_avatar_image for loading profile images in ↵ | Zvi ben Yaakov (a.k.a rdc) | 2012-06-19 | 1 | -1/+1 |
| | | | | | | | | | | | | conversations | ||||
* | | | Added get_cached_avatar_image to App class for shared profile image access ↵ | Zvi ben Yaakov (a.k.a rdc) | 2012-06-19 | 1 | -0/+25 |
| | | | | | | | | | | | | and reduced sql queries/load | ||||
* | | | rev update | friendica | 2012-06-19 | 2 | -72/+89 |
|/ / | |||||
* | | 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 |