aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #351 from annando/masterfriendica2012-06-2311-34/+2980
|\
| * Merge remote branch 'upstream/master'Michael Vogel2012-06-2340-4763/+5539
| |\ | |/ |/|
* | cleanup mod/sharefriendica2012-06-231-14/+11
* | Merge pull request #350 from fermionic/improve-bb2diaspora-conversionsfermionic2012-06-221-20/+53
|\ \
| * | cleanup lists and more comment signature stuffZach Prezkuta2012-06-221-2/+13
| * | expand support for BB code-to-Diaspora conversionZach Prezkuta2012-06-221-20/+42
|/ /
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-223-3/+4
|\ \
| * \ Merge pull request #349 from simonlnu/masterSimon2012-06-223-3/+4
| |\ \
| | * | minor tweaks to some tpl filesSimon L'nu2012-06-223-3/+4
| |/ /
* / / share RSS itemsfriendica2012-06-223-5/+5
|/ /
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-221-10/+17
|\ \
| * \ Merge pull request #348 from max-weller/masterfriendica2012-06-211-10/+17
| |\ \
| | * | Added ORDER BY clause for conversation viewMax Weller2012-06-211-1/+1
| | * | Added statuses/show parameter ?conversation=trueMax Weller2012-06-211-10/+17
| |/ /
* / / unterminated sql stringfriendica2012-06-223-68/+76
|/ /
* | show last.fm source in usernamefriendica2012-06-201-0/+1
* | follow last.fm scrobblesfriendica2012-06-201-1/+9
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-205-65/+56
|\ \
| * \ Merge pull request #346 from fermionic/add-rotate-ccw-optionfriendica2012-06-202-11/+18
| |\ \
| | * | allow rotation either CW or CCWZach Prezkuta2012-06-202-11/+18
| * | | Merge pull request #347 from fermionic/diaspora-more-signature-refinementsfermionic2012-06-201-52/+28
| |\ \ \ | | |/ / | |/| |
| | * | create new signed text for relayables right when relaying themZach Prezkuta2012-06-201-52/+28
| |/ /
| * | Darkzero-NS fix weeks old BBIcon errorThomas Willingham2012-06-211-2/+2
| * | Darkzero/NS - make the archives font the same colour as the other widgets.Thomas Willingham2012-06-212-0/+8
* | | try and eliminate the openssl warnings for forums trying to talk back to fansfriendica2012-06-201-1/+1
|/ /
* | undefined unmark_for_deathfriendica2012-06-201-0/+1
* | sort out contact search odditiesfriendica2012-06-201-4/+3
* | missing parenfriendica2012-06-201-1/+1
* | contact search odditiesfriendica2012-06-203-63/+64
* | Merge https://github.com/friendica/friendica into pullfriendica2012-06-208-3814/+3907
|\ \
| * \ Merge pull request #345 from simonlnu/masterSimon2012-06-207-3812/+3898
| |\ \
| | * | icon change; tweak button in toolbar; move site-locationSimon L'nu2012-06-207-3812/+3898
| |/ /
| * | Merge pull request #344 from ridcully/masterfriendica2012-06-201-2/+9
| |\ \
| | * | added exclude_replies option to api call statuses/user_timeline.Sebastian Egbers2012-06-191-1/+4
| | * | added exclude_replies option to api call statuses/home_timeline.Sebastian Egbers2012-06-191-1/+5
* | | | iframes were getting stripped at the rss/atom parser level. We can preserve t...friendica2012-06-202-3/+5
* | | | allow dfrn_deliver to undo a mark_for_death just in case the poller is consis...friendica2012-06-191-0/+5
|/ / /
* | | plugin optimisation - don't loop through every single plugin callback for eve...friendica2012-06-192-25/+18
* | | rework fallback themes, glob pattern was wrongfriendica2012-06-191-2/+2
* | | Merge https://github.com/friendica/friendica into pullfriendica2012-06-191-0/+16
|\ \ \
| * \ \ Merge pull request #342 from fabrixxm/mastertobiasd2012-06-191-0/+16
| |\ \ \ | | |/ / | |/| |
| | * | quattro: in post display page, scroll to and flash selected commentFabio Comuni2012-06-191-0/+16
* | | | Added App::get_cached_avater_image usage in profile_sidebar function for crea...Zvi ben Yaakov (a.k.a rdc)2012-06-191-3/+3
* | | | 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-191-2/+2
* | | | Now using App::get_cached_avatar_image for /profile/{nickname} pageZvi ben Yaakov (a.k.a rdc)2012-06-191-2/+2
* | | | Now using App::get_cached_avatar_image for navigation barZvi ben Yaakov (a.k.a rdc)2012-06-191-2/+2
* | | | Now using App::get_cached_avatar_image for /directory pageZvi ben Yaakov (a.k.a rdc)2012-06-191-2/+2
* | | | Beginning to use App::get_cached_avatar_image for loading profile images in c...Zvi ben Yaakov (a.k.a rdc)2012-06-191-1/+1
* | | | Added get_cached_avatar_image to App class for shared profile image access an...Zvi ben Yaakov (a.k.a rdc)2012-06-191-0/+25
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-11 20:13:26 +0000