| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-26 | 22 | -439/+741 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: service class restrict the email connector stray s typos add event titles to discovered birthday events change required doco change event behaviour so that title is required but description is not event summary/title propagate remote deletes remove possibly unnecessary checks for likes or comments created by Diaspora users store signature info for remote users too was passing the wrong arguments to the signature storage function add some debug logging revert extra Diaspora disabling changes to try to eliminate Mustard double-posting Clean up the Diaspora connectivity: improve remote delete forwarding typos in bbcode, add service class restrictions to jot uploads rev update | ||||
| | * | service class restrict the email connector | friendica | 2012-06-26 | 3 | -75/+83 |
| | | | |||||
| | * | stray s | friendica | 2012-06-25 | 1 | -1/+1 |
| | | | |||||
| | * | typos | friendica | 2012-06-25 | 2 | -2/+2 |
| | | | |||||
| | * | add event titles to discovered birthday events | friendica | 2012-06-25 | 2 | -6/+11 |
| | | | |||||
| | * | change required doco | friendica | 2012-06-25 | 1 | -2/+5 |
| | | | |||||
| | * | change event behaviour so that title is required but description is not | friendica | 2012-06-25 | 3 | -8/+32 |
| | | | |||||
| | * | event summary/title | friendica | 2012-06-25 | 9 | -9/+58 |
| | | | |||||
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-25 | 5 | -130/+210 |
| | |\ | |||||
| | | * | Merge pull request #364 from fermionic/diaspora-refactor-and-better-disabling | fermionic | 2012-06-25 | 5 | -130/+210 |
| | | |\ | | | | | | | | | Diaspora refactor and better disabling | ||||
| | | | * | remove possibly unnecessary checks for likes or comments created by Diaspora ↵ | Zach Prezkuta | 2012-06-25 | 2 | -51/+51 |
| | | | | | | | | | | | | | | | | | users | ||||
| | | | * | store signature info for remote users too | Zach Prezkuta | 2012-06-25 | 2 | -17/+24 |
| | | | | | |||||
| | | | * | was passing the wrong arguments to the signature storage function | Zach Prezkuta | 2012-06-25 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | add some debug logging | Zach Prezkuta | 2012-06-25 | 3 | -2/+8 |
| | | | | | |||||
| | | | * | revert extra Diaspora disabling changes to try to eliminate Mustard ↵ | Zach Prezkuta | 2012-06-25 | 3 | -43/+23 |
| | | | | | | | | | | | | | | | | | double-posting | ||||
| | | | * | 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 | ||||
| | * | | propagate remote deletes | friendica | 2012-06-25 | 1 | -5/+8 |
| | | | | |||||
| | * | | improve remote delete forwarding | friendica | 2012-06-25 | 2 | -2/+64 |
| | |/ | |||||
| | * | 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 | ||||
| | * | | | 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 |
| | |\ \ \ | |||||
| | * | | | | rev update | friendica | 2012-06-25 | 2 | -208/+246 |
| | | | | | | |||||
| * | | | | | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-25 | 0 | -0/+0 |
| |\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | | | * remotes/upstream/master: | ||||
| | * | | | Merge pull request #362 from simonlnu/master | Simon | 2012-06-25 | 4 | -4/+4 |
| | |\ \ \ | | |_|/ | |/| | | fix margin of .wall-item-body | ||||
| * | | | | fix typo and syntax error | Simon L'nu | 2012-06-25 | 1 | -1/+1 |
| | |/ / |/| | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| * | | | 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> | ||||
| * | | 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 |
| | |\ | |/ |/| | |||||
| * | | 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 |
| |/ / | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |