| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #379 from fermionic/events-display-wrong-in-diaspora | friendica | 2012-07-07 | 1 | -1/+1 |
| |\ | | | | | remove check for event description in bb2diaspora | ||||
| | * | remove check for event description, since it's not required to create an event | Zach Prezkuta | 2012-07-06 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of git://github.com/friendica/friendica | Vasudev Kamath | 2012-07-06 | 32 | -351/+3899 |
| |\| | |||||
| | * | remove obsolete zot encapsulation functions | friendica | 2012-07-05 | 1 | -33/+0 |
| | | | |||||
| | * | my php thinks this is a typo | Zach Prezkuta | 2012-07-05 | 1 | -1/+1 |
| | | | |||||
| | * | clear title and body of items on local delete | Zach Prezkuta | 2012-07-05 | 1 | -2/+4 |
| | | | |||||
| | * | Merge pull request #376 from fermionic/diaspora-prevent-fcontact-race-conditions | friendica | 2012-07-05 | 1 | -1/+3 |
| | |\ | | | | | | | slightly better way of handling last loop | ||||
| | | * | slightly better way of handling last loop | Zach Prezkuta | 2012-07-05 | 1 | -1/+3 |
| | | | | |||||
| | * | | Merge pull request #375 from fermionic/diaspora-prevent-fcontact-race-conditions | friendica | 2012-07-05 | 2 | -9/+18 |
| | |\| | | | | | | | add some timeouts to prevent deadlock | ||||
| | | * | add some timeouts to prevent deadlock | Zach Prezkuta | 2012-07-05 | 2 | -9/+18 |
| | | | | |||||
| | * | | Merge pull request #373 from fermionic/more-list-fixes | friendica | 2012-07-05 | 2 | -21/+54 |
| | |\ \ | | |/ | |/| | fix small bug in lists and revert Diaspora list processing to non-Markdo... | ||||
| | | * | fix small bug in lists and revert Diaspora list processing to ↵ | Zach Prezkuta | 2012-07-05 | 2 | -21/+54 |
| | | | | | | | | | | | | | non-Markdownify version | ||||
| | * | | cleanup some syntax errors in lock.php | Zach Prezkuta | 2012-07-05 | 1 | -4/+4 |
| | | | | |||||
| | * | | "lock" is a reserved MySQL keyword | Zach Prezkuta | 2012-07-05 | 1 | -6/+6 |
| | | | | |||||
| | * | | minor cleanup in lock.php | Zach Prezkuta | 2012-07-05 | 1 | -0/+2 |
| | | | | |||||
| | * | | cleanup obsolete comments | Zach Prezkuta | 2012-07-05 | 1 | -2/+0 |
| | | | | |||||
| | * | | add rudimentary locking capability to Friendica functions | Zach Prezkuta | 2012-07-05 | 3 | -21/+154 |
| | |/ | |||||
| | * | recycle symbol woes with multiple html entity encode/decode cycles going on | friendica | 2012-07-04 | 1 | -0/+3 |
| | | | |||||
| | * | render the recycle symbol correctly on Diaspora reshares | friendica | 2012-07-04 | 1 | -1/+1 |
| | | | |||||
| | * | some initial code and benchmarking for "red" content rendering engine | friendica | 2012-07-04 | 1 | -0/+6 |
| | | | |||||
| | * | restore translation of bbcode videos, events, bookmarks, etc. to diaspora | friendica | 2012-07-04 | 1 | -10/+27 |
| | | | |||||
| | * | fix !@#$ tinymce linebreaks for the thousandth time | friendica | 2012-07-04 | 2 | -2/+1 |
| | | | |||||
| | * | punycode hostname | friendica | 2012-07-03 | 1 | -0/+14 |
| | | | |||||
| | * | fix double lines | friendica | 2012-07-02 | 1 | -1/+5 |
| | | | |||||
| | * | try and get unadulterated bb2md2html2bb for simple stuff, then we'll work up ↵ | friendica | 2012-07-02 | 3 | -4/+8 |
| | | | | | | | | | to harder stuff | ||||
| | * | config to disable email validation | friendica | 2012-07-01 | 3 | -2/+9 |
| | | | |||||
| | * | restore 'shareable' to feeds after recent feed privacy re-factoring | friendica | 2012-06-30 | 1 | -1/+1 |
| | | | |||||
| | * | nav: pass $baseurl to template | Fabrixxm | 2012-06-29 | 1 | -0/+1 |
| | | | |||||
| | * | wrong column name (- vs _) | friendica | 2012-06-28 | 1 | -1/+1 |
| | | | |||||
| | * | remote_self feeds are not private | friendica | 2012-06-28 | 1 | -1/+5 |
| | | | |||||
| | * | create third privacy state - public post but not searchable or publicly visible | friendica | 2012-06-28 | 5 | -16/+17 |
| | | | |||||
| | * | css smiley class | friendica | 2012-06-28 | 1 | -35/+35 |
| | | | |||||
| | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-28 | 2 | -6/+6 |
| | |\ | |||||
| | | * | fix logic for nested lists--should be OR, not AND | Zach Prezkuta | 2012-06-27 | 2 | -6/+6 |
| | | | | |||||
| | * | | remove titles in ostatus even when edited date differs from created date | friendica | 2012-06-28 | 1 | -18/+22 |
| | |/ | |||||
| | * | 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 | 10 | -78/+190 |
| | |\ | |||||
| | | * | 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 | 1 | -2/+2 |
| | | | | |||||
| | | * | event summary/title | friendica | 2012-06-25 | 2 | -2/+15 |
| | | | | |||||
| | | * | Merge https://github.com/friendica/friendica into pull | friendica | 2012-06-25 | 3 | -37/+55 |
| | | |\ | |||||
| | | | * | add some debug logging | Zach Prezkuta | 2012-06-25 | 1 | -0/+1 |
| | | | | | |||||
| | | | * | 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 | 3 | -55/+92 |
| | | | | | | | | | | | | | | | | | | | | | - 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 | 1 | -0/+1 |
| | | |\ | | | | | | | | | | | | | | | | | Conflicts: include/bbcode.php | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |