| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Clean up the Diaspora connectivity: | Zach Prezkuta | 2012-06-25 | 5 | -128/+215 |
| | | | | | | - Move Diaspora code into separate functions to make it more modular - Create more checks for whether Diaspora connectivity has been enabled | ||||
| * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-25 | 5 | -4/+5 |
| |\ | | | | | | | | | Conflicts: include/bbcode.php | ||||
| | * | Merge pull request #363 from simonlnu/master | Simon | 2012-06-25 | 1 | -1/+1 |
| | |\ | | | | | | | fix typo and syntax error in include/bbcode.php | ||||
| | | * | fix typo and syntax error | Simon L'nu | 2012-06-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | Merge pull request #362 from simonlnu/master | Simon | 2012-06-25 | 4 | -4/+4 |
| | |\| | | | | | | | fix margin of .wall-item-body | ||||
| | | * | fix margin of wall-item-body | Simon L'nu | 2012-06-25 | 4 | -4/+4 |
| | |/ | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | typos in bbcode, add service class restrictions to jot uploads | friendica | 2012-06-25 | 5 | -11/+40 |
| | | | |||||
| * | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-25 | 10 | -60/+40 |
| |\| | |||||
| | * | Merge pull request #361 from simonlnu/master | Simon | 2012-06-25 | 4 | -38/+14 |
| | |\ | | | | | | | cleaned up the css a bit | ||||
| | | * | fix delete thingy, and minor clean up | Simon L'nu | 2012-06-25 | 4 | -38/+14 |
| | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | | Merge pull request #360 from fermionic/more-nested-lists | friendica | 2012-06-25 | 2 | -10/+13 |
| | |\ \ | | | | | | | | | allow nested [ol] and [ul] lists too | ||||
| | | * | | allow nested [ol] and [ul] lists too | Zach Prezkuta | 2012-06-25 | 2 | -10/+13 |
| | | |/ | |||||
| | * | | Merge pull request #359 from fermionic/mustard-prevent-comment-doubles | friendica | 2012-06-25 | 3 | -11/+12 |
| | |\ \ | | | | | | | | | fix check for parent of StatusNet API post | ||||
| | | * | | fix check for parent of StatusNet API post | Zach Prezkuta | 2012-06-25 | 3 | -11/+12 |
| | | |/ | |||||
| | * | | Merge pull request #358 from rdc/master | friendica | 2012-06-25 | 1 | -1/+1 |
| | |\ \ | | |/ | |/| | Added App::get_cached_avatar_image usage for displaying "Last users" avatar thumbs in right sidebar | ||||
| | | * | Added App::get_cached_avatar_image usage for displaying "Last users" | Zvi ben Yaakov (a.k.a rdc) | 2012-06-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | avatar thumbs in right sidebar | ||||
| | | * | Merge git://github.com/friendica/friendica | Zvi ben Yaakov (a.k.a rdc) | 2012-06-25 | 20 | -179/+472 |
| | | |\ | | |/ | |/| | |||||
| | | * | Merge git://github.com/friendica/friendica | Zvi ben Yaakov (a.k.a rdc) | 2012-06-23 | 32 | -217/+3247 |
| | | |\ | |||||
| | | * \ | Merge git://github.com/friendica/friendica | Zvi ben Yaakov (a.k.a rdc) | 2012-06-21 | 21 | -4036/+4147 |
| | | |\ \ | |||||
| | | * \ \ | Merge git://github.com/friendica/friendica | Zvi ben Yaakov (a.k.a rdc) | 2012-06-19 | 13 | -661/+1254 |
| | | |\ \ \ | |||||
| | | * | | | | 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 | ||||
| * | | | | | | rev update | friendica | 2012-06-25 | 2 | -208/+246 |
| |/ / / / / | |||||
| * | | | | | more service class functionality | friendica | 2012-06-25 | 1 | -0/+5 |
| | | | | | | |||||
| * | | | | | service limits for photo uploads | friendica | 2012-06-25 | 4 | -1/+63 |
| | | | | | | |||||
| * | | | | | implement "follow" service limits | friendica | 2012-06-24 | 3 | -2/+51 |
| | | | | | | |||||
| * | | | | | add like/dislike to profiles | friendica | 2012-06-24 | 7 | -3/+75 |
| | | | | | | |||||
| * | | | | | sidebar photo album list not visible to anybody if user['hidewall'] set | friendica | 2012-06-24 | 3 | -96/+115 |
| | | | | | | |||||
| * | | | | | service class basics | friendica | 2012-06-24 | 4 | -8/+52 |
| | | | | | | |||||
| * | | | | | Merge pull request #357 from fermionic/fix-relayable-signature-handle | fermionic | 2012-06-23 | 1 | -77/+20 |
| |\ \ \ \ \ | | | | | | | | | | | | | ok now I'm just making silly mistakes--take out premature function locki... | ||||
| | * | | | | | ok now I'm just making silly mistakes--take out premature function locking code | Zach Prezkuta | 2012-06-23 | 1 | -77/+20 |
| | | | | | | | |||||
| * | | | | | | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-23 | 2 | -24/+90 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Merge pull request #356 from fermionic/fix-relayable-signature-handle | fermionic | 2012-06-23 | 1 | -24/+84 |
| | |\| | | | | | | | | | | | | | | | | | | | use author handle instead of sender handle | ||||
| | | * | | | | | use author handle instead of sender handle | Zach Prezkuta | 2012-06-23 | 1 | -24/+84 |
| | | | | | | | | |||||
| | * | | | | | | Merge pull request #355 from ↵ | fermionic | 2012-06-23 | 1 | -0/+6 |
| | |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | fermionic/missing-urls-after-strip_tags-in-bb2diaspora allow bare URLS to make it through to Diaspora | ||||
| | | * | | | | | allow bare URLS to make it through to Diaspora | Zach Prezkuta | 2012-06-23 | 1 | -0/+6 |
| | |/ / / / / | |||||
| * / / / / / | sort out some "like" issues | friendica | 2012-06-23 | 4 | -78/+73 |
| |/ / / / / | |||||
| * | | | | | Merge pull request #354 from fermionic/always-terminate-bbcode-list-elements | fermionic | 2012-06-23 | 1 | -3/+41 |
| |\ \ \ \ \ | |_|_|_|/ |/| | | | | Fix Diaspora list formatting | ||||
| | * | | | | small optimization | Zach Prezkuta | 2012-06-23 | 1 | -5/+3 |
| | | | | | | |||||
| | * | | | | fix BB-to-Diaspora list formatting | Zach Prezkuta | 2012-06-23 | 1 | -3/+43 |
| |/ / / / | |||||
| * | | | | Merge pull request #352 from fermionic/diaspora-display-scaled-down-image | Simon | 2012-06-23 | 2 | -4/+17 |
| |\ \ \ \ | | | | | | | | | | | allow linking to Diaspora's scaled-down images | ||||
| | * | | | | allow linking to Diaspora's scaled-down images | Zach Prezkuta | 2012-06-23 | 2 | -4/+17 |
| | | | | | | |||||
| * | | | | | Merge pull request #353 from simonlnu/master | Simon | 2012-06-23 | 9 | -43/+53 |
| |\ \ \ \ \ | |/ / / / |/| | | | | jquery update; templates | ||||
| | * | | | | update jquery to 1.7.2; fix some dispy templates to be more in sync with view/ | Simon L'nu | 2012-06-23 | 9 | -43/+53 |
| |/ / / / | | | | | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |