aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-06174-11/+741
|\
| * more hook docoredmatrix2015-11-052-0/+20
| |
| * a bit of explanation at the beginningredmatrix2015-11-051-0/+5
| |
| * add the hook detail to the doco listredmatrix2015-11-051-0/+1
| |
| * more work on hook docoredmatrix2015-11-055-6/+8
| |
| * update hooklistredmatrix2015-11-052-4/+121
| |
| * the journey of 1000 miles begins with a single stepredmatrix2015-11-051-0/+28
| |
| * preliminary hook detail filesredmatrix2015-11-05162-0/+162
| |
| * typoredmatrix2015-11-051-1/+1
| |
| * Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-054-3/+8
| |\
| | * Firefox Share app. Paper plane icon is public domain. Shorted the name in ↵jeroenpraat2015-11-054-3/+8
| | | | | | | | | | | | ffsapi > compare it with other providers. Changed bookmark (checkmark) item to selfmade Hubzilla bookmark icon for Firefox (bookmark icon = bootstrap icon).
| * | handle old files with partial pathsredmatrix2015-11-053-6/+18
| | |
| * | first cut at some much better hook documentation derived from bamfic's ↵redmatrix2015-11-052-1/+379
| |/ | | | | | | automated list (doc/hooks.html)
* | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-059-26/+58
|\|
| * Firefox share (that seems now the official name) button added to misc. settings.jeroenpraat2015-11-053-7/+20
| |
| * Style the buttonjeroenpraat2015-11-051-2/+2
| |
| * fix the file chunking api now that we've got working data to test withredmatrix2015-11-052-2/+2
| |
| * fix path for attachments using os_storage uploaded through attach_storeredmatrix2015-11-042-3/+3
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-11-043-15/+34
| |\ | | | | | | | | | | | | Conflicts: install/update.php
| | * dummy updateredmatrix2015-11-042-2/+6
| | |
* | | Merge remote-tracking branch 'upstream/master'Haakon Meland Eriksen2015-11-0524-659/+1649
|\| |
| * | re-arrange file api calls so the api pathnames don't shadow each otherredmatrix2015-11-041-21/+25
| | |
| * | api calls to fetch file (attach) meta data and to chunk file content ↵redmatrix2015-11-041-0/+57
| | | | | | | | | | | | fetching which will eventually allow us to clone large videos without hitting memory limits
| * | menu_list() takes a channel_id, not the whole channel arrayredmatrix2015-11-041-1/+3
| | |
| * | typoredmatrix2015-11-041-1/+1
| | |
| * | add bookmarking to FF social api providerredmatrix2015-11-043-3/+3
| | |
| * | Merge https://github.com/redmatrix/hubzilla into pending_mergeredmatrix2015-11-0418-657/+1520
| |\ \
| | * \ Merge pull request #124 from kenrestivo/add-app-example2redmatrix2015-11-051-0/+421
| | |\ \ | | | | | | | | | | Add app example
| | | * | Clarify format.ken restivo2015-11-041-2/+1
| | | | |
| | | * | Add app object detailed example.ken restivo2015-11-041-0/+422
| | | | |
| | * | | Chat page improved (I think). Works now better with diff. resolutions, font ↵jeroenpraat2015-11-046-18/+39
| | | | | | | | | | | | | | | | | | | | sizes and languages. Fixed follow field on conn. page. Small schemas updates.
| | * | | Merge pull request #125 from wave72/masterWave2015-11-042-638/+678
| | |\ \ \ | | | |/ / | | |/| | Updated Italian strings
| | | * | Updated Italian stringsPaolo Tacconi2015-11-042-638/+678
| | | | |
| | * | | Merge pull request #122 from kenrestivo/add-hook-docsredmatrix2015-11-049-1/+382
| | |\ \ \ | | | | | | | | | | | | Commit the tool used to generate the hooks docs.
| | | * | | Put generated date at end of data.ken restivo2015-11-032-3/+3
| | | | | |
| | | * | | Commit the tool used to generate the hooks docs.ken restivo2015-11-039-1/+382
| | | | | |
| * | | | | Firefox Share API provider interface (first cut, only has share ability)redmatrix2015-11-042-1/+65
| |/ / / /
| * | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-11-030-0/+0
| |\ \ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | Conflicts: include/zot.php mod/post.php
| | * | | protocol upgraderedmatrix2015-11-032-37/+58
| | | | |
* | | | | Removed fixed directory server - new list available in admin panel if one ↵Haakon Meland Eriksen2015-11-041-1/+0
|/ / / / | | | | | | | | | | | | becomes unavailable
* | | | Merge pull request #121 from kenrestivo/add-hook-docsredmatrix2015-11-043-136/+2
|\ \ \ \ | | |/ / | |/| | Add generated docs for hooks.
| * | | Add generated docs for hooks. Link them into the developer docs so they can ↵ken restivo2015-11-033-136/+2
| | | | | | | | | | | | | | | | be found more easily.
* | | | Merge pull request #120 from kenrestivo/document-argvredmatrix2015-11-041-0/+2
|\ \ \ \ | | | | | | | | | | Add documentation for argv/argc.
| * | | | Add documentation for argv/argc.ken restivo2015-11-031-0/+2
| | | | |
* | | | | Merge pull request #119 from sasiflo/masterredmatrix2015-11-045-20/+20
|\ \ \ \ \ | |_|/ / / |/| | | | Some small rebranding for Hubzilla transition from Red Matrix
| * | | | Merge branch 'rebranding'sasiflo2015-11-035-20/+20
| |\ \ \ \
| | * | | | Some small rebranding for Hubzilla transition from Red Matrixsasiflo2015-11-035-20/+20
| | | | | |
* | | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-11-037-393/+409
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/photo/photo_driver.php include/text.php mod/post.php
| * | | | | backport small bits of the re-install fix; at least the damaging bitsredmatrix2015-11-031-6/+6
| | | | | |
| * | | | | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-11-035-9/+28
| |\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 07:22:02 +0000