| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #367 from simonlnu/master | Simon | 2012-06-28 | 4 | -12/+12 |
| |\ | | | | | fix item-delete-selected* css | ||||
| | * | fix item-delete-selected* css | Simon L'nu | 2012-06-28 | 4 | -12/+12 |
| | | | | | | | | | Signed-off-by: Simon L'nu <simon.lnu@gmail.com> | ||||
| | * | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-28 | 2 | -6/+6 |
| | |\ | |/ |/| | | | | | * remotes/upstream/master: fix logic for nested lists--should be OR, not AND | ||||
| * | | Merge pull request #366 from fermionic/fix-big-monster-list-logic | fermionic | 2012-06-27 | 2 | -6/+6 |
| |\ \ | | | | | | | fix logic for nested lists--should be OR, not AND | ||||
| | * | | fix logic for nested lists--should be OR, not AND | Zach Prezkuta | 2012-06-27 | 2 | -6/+6 |
| |/ / | |||||
| | * | Merge remote-tracking branch 'remotes/upstream/master' | Simon L'nu | 2012-06-27 | 4 | -64/+119 |
| | |\ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * remotes/upstream/master: Friendicaland - couple of new 'countries' insidious little parsing bug have no idea why the if/endif macro block was getting printed and not processed. highlight js events-reminder on birthday events moved api direct message formating to own function. added same formating to direct reply message, when posting a new message. fixed direct message reply in api call. modified api message reply to set title to conversion title, when replying. add reliable way to get server version make it selectable I want HTML code! new param getUserObjects to avoid retransmitting the whole user info objects bugfix changes on api_direct_messages_box to allow to retrieve conversations and all messages modified direct_messages added replyto and subject to direct messages. modified conversion to use x function for parameter checking. | ||||
| * | | Friendicaland - couple of new 'countries' | Thomas Willingham | 2012-06-27 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #365 from ridcully/master | friendica | 2012-06-27 | 1 | -63/+108 |
| |\ \ | | | | | | | Direct-Message Api-Modified | ||||
| | * | | moved api direct message formating to own function. | Sebastian Egbers | 2012-06-26 | 1 | -54/+54 |
| | | | | | | | | | | | | | added same formating to direct reply message, when posting a new message. | ||||
| | * | | Merge branch 'master' of https://github.com/friendica/friendica | Sebastian Egbers | 2012-06-26 | 27 | -435/+709 |
| | |\ \ | |||||
| | * | | | fixed direct message reply in api call. | Sebastian Egbers | 2012-06-25 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | modified api message reply to set title to conversion title, when replying. | Sebastian Egbers | 2012-06-25 | 1 | -8/+12 |
| | | | | | |||||
| | * | | | Merge branch 'master' of https://github.com/friendica/friendica | Sebastian Egbers | 2012-06-25 | 30 | -227/+544 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'sebastian/master' | Max Weller | 2012-06-23 | 1 | -15/+30 |
| | |\ \ \ \ | |||||
| | | * | | | | added replyto and subject to direct messages. | Sebastian Egbers | 2012-06-22 | 1 | -7/+18 |
| | | | | | | | |||||
| | | * | | | | modified conversion to use x function for parameter checking. | Sebastian Egbers | 2012-06-22 | 1 | -8/+12 |
| | | | | | | | |||||
| | * | | | | | add reliable way to get server version | Max Weller | 2012-06-23 | 1 | -1/+7 |
| | | | | | | | |||||
| | * | | | | | make it selectable | Max Weller | 2012-06-23 | 1 | -1/+3 |
| | | | | | | | |||||
| | * | | | | | I want HTML code! | Max Weller | 2012-06-23 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | new param getUserObjects to avoid retransmitting the whole user info objects | Max Weller | 2012-06-23 | 1 | -0/+3 |
| | | | | | | | |||||
| | * | | | | | bugfix | Max Weller | 2012-06-23 | 1 | -4/+5 |
| | | | | | | | |||||
| | * | | | | | changes on api_direct_messages_box to allow to retrieve conversations and ↵ | Max Weller | 2012-06-23 | 1 | -13/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | all messages | ||||
| | * | | | | | modified direct_messages | Max Weller | 2012-06-23 | 1 | -7/+29 |
| | | | | | | | |||||
| * | | | | | | insidious little parsing bug | friendica | 2012-06-26 | 2 | -2/+8 |
| | | | | | | | |||||
| * | | | | | | have no idea why the if/endif macro block was getting printed and not processed. | friendica | 2012-06-26 | 1 | -6/+4 |
| | | | | | | | |||||
| * | | | | | | highlight js events-reminder on birthday events | friendica | 2012-06-27 | 1 | -1/+7 |
| | | | | | | | |||||
| | | | | | * | 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: | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |