| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | | fix deleting of album for remote channel | Mario Vavti | 2015-06-16 | 1 | -2/+2 | |
| | |/ | ||||||
| * | | remove file/attachments when their associated photos are removed | redmatrix | 2015-06-16 | 1 | -2/+3 | |
| | | | ||||||
| * | | move profile photos to new methods | redmatrix | 2015-06-15 | 1 | -1/+7 | |
| | | | ||||||
| * | | fix attachment permissions when they also contain an image. | redmatrix | 2015-06-15 | 1 | -0/+2 | |
| | | | ||||||
| * | | photo upload: pass in the contact_allow and resource_id via include/attach.php | redmatrix | 2015-06-15 | 3 | -4/+8 | |
| | | | ||||||
| * | | DB changes for some channel flags | redmatrix | 2015-06-15 | 11 | -98/+66 | |
| | | | ||||||
| * | | convert the abook fields | redmatrix | 2015-06-14 | 18 | -147/+143 | |
| | | | ||||||
| * | | more file/photo merge work | redmatrix | 2015-06-14 | 2 | -17/+51 | |
| | | | ||||||
| * | | first cut at merging files and photos, not yet well integrated but they are ↵ | redmatrix | 2015-06-14 | 2 | -5/+10 | |
| | | | | | | | | | integrated | |||||
| * | | isolate the os_storage flag | redmatrix | 2015-06-13 | 3 | -23/+29 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-13 | 1 | -2/+10 | |
| |\| | | | | | | | | | Conflicts: util/messages.po | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-11 | 1 | -0/+4 | |
| |\| | ||||||
| | * | don't provide a connect button on the sys channel profile sidebar | redmatrix | 2015-06-11 | 1 | -0/+4 | |
| | | | ||||||
| * | | make cloud work again | redmatrix | 2015-06-11 | 5 | -6/+6 | |
| | | | ||||||
| * | | start on the DAV/photos merger | redmatrix | 2015-06-11 | 1 | -12/+30 | |
| | | | ||||||
| * | | more work on items | redmatrix | 2015-06-11 | 2 | -19/+90 | |
| |\| | | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php | |||||
| | * | hubzilla compatibility function | redmatrix | 2015-06-11 | 1 | -0/+14 | |
| | | | ||||||
| * | | the hubzilla version of this function | redmatrix | 2015-06-11 | 1 | -0/+12 | |
| | | | ||||||
| * | | diaspora disallowed by default | redmatrix | 2015-06-10 | 2 | -6/+0 | |
| | | | ||||||
| * | | more work on item table optimisation | redmatrix | 2015-06-10 | 4 | -37/+59 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-10 | 1 | -28/+0 | |
| |\| | ||||||
| | * | retire old Friendica RINO encryption functions | redmatrix | 2015-06-09 | 1 | -28/+0 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 2 | -0/+28 | |
| |\| | ||||||
| | * | toggle diaspora protocol on a per-channel level in addition to the existing ↵ | redmatrix | 2015-06-09 | 2 | -0/+28 | |
| | | | | | | | | | per site setting. Default is enabled if the site setting is enabled. | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 1 | -8/+17 | |
| |\| | | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php | |||||
| | * | add site_dead flag to prevent delivery to dead sites. Allow sys channel ↵ | redmatrix | 2015-06-08 | 1 | -8/+17 | |
| | | | | | | | | | webpages to be viewed even if site is configured "block public". | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-02 | 2 | -7/+57 | |
| |\| | ||||||
| | * | asjld work | redmatrix | 2015-06-02 | 1 | -3/+13 | |
| | | | ||||||
| | * | error in directory bbcode image filter | redmatrix | 2015-05-31 | 1 | -1/+1 | |
| | | | ||||||
| | * | bare bones ASLD | redmatrix | 2015-05-31 | 1 | -4/+44 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-31 | 3 | -13/+70 | |
| |\| | ||||||
| | * | some basic background work for activitystreams-json-ld-2.0 conversions | redmatrix | 2015-05-31 | 2 | -0/+45 | |
| | | | ||||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-30 | 2 | -9/+14 | |
| | |\ | ||||||
| | | * | should not redefine $var in the function call | Mario Vavti | 2015-05-29 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | fix menu render for menu item edit - menu preview | Mario Vavti | 2015-05-29 | 1 | -1/+5 | |
| | | | | ||||||
| | | * | some fixes to make menu sharing work and expose it in the ui. | Mario Vavti | 2015-05-29 | 2 | -6/+7 | |
| | | | | ||||||
| | * | | strip images from directory text entries | redmatrix | 2015-05-30 | 1 | -0/+5 | |
| | |/ | ||||||
| | * | there was a reason we included that file | redmatrix | 2015-05-28 | 1 | -3/+3 | |
| | | | ||||||
| | * | parse error | redmatrix | 2015-05-28 | 1 | -2/+2 | |
| | | | ||||||
| | * | another case of committing with unsaved changes in a second window | redmatrix | 2015-05-28 | 1 | -2/+4 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-28 | 1 | -4/+70 | |
| |\| | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php | |||||
| | * | add menu_created, menu_edited fields to DB | redmatrix | 2015-05-28 | 1 | -4/+31 | |
| | | | ||||||
| | * | menu encoding for sharing/exchange | redmatrix | 2015-05-27 | 1 | -0/+39 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 8 | -15/+130 | |
| |\| | | | | | | | | | Conflicts: mod/impel.php | |||||
| | * | some high-level stuff we may need for shareable menus. Also make the client ↵ | redmatrix | 2015-05-27 | 1 | -11/+1 | |
| | | | | | | | | | register function do the right thing even though I refuse to make it work. If **you** want service federation with things like pumpio and openid connect, it's time for **you** to put your own skin in the game and quit treating project volunteers like excrement just because you can't get up off your lazy buttocks. | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-27 | 2 | -0/+81 | |
| | |\ | ||||||
| | | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-05-27 | 1 | -1/+1 | |
| | | |\ | ||||||
| | | * | | define some custom attributes and html5 elements for htmlpurifier | Mario Vavti | 2015-05-27 | 1 | -0/+66 | |
| | | | | | ||||||
| | | * | | make it possible to include menus in blocks - this will only work in html ↵ | Mario Vavti | 2015-05-27 | 1 | -0/+15 | |
| | | | | | | | | | | | | | | | | | blocks of course | |||||
| | * | | | fix for forked thread on diaspora | redmatrix | 2015-05-27 | 2 | -11/+5 | |
| | | | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |