| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | convert the abook fields | redmatrix | 2015-06-14 | 16 | -132/+98 | |
| | | | ||||||
| * | | first cut at merging files and photos, not yet well integrated but they are ↵ | redmatrix | 2015-06-14 | 1 | -19/+25 | |
| | | | | | | | | | integrated | |||||
| * | | make new os_storage flag work | redmatrix | 2015-06-14 | 2 | -1/+5 | |
| | | | ||||||
| * | | more work on items | redmatrix | 2015-06-11 | 3 | -8/+50 | |
| |\| | | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php | |||||
| * | | diaspora disallowed by default | redmatrix | 2015-06-10 | 1 | -2/+0 | |
| | | | ||||||
| * | | start to partition the dav | redmatrix | 2015-06-10 | 2 | -30/+5 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-10 | 1 | -0/+6 | |
| |\| | ||||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-10 | 1 | -21/+23 | |
| | |\ | ||||||
| | * | | put block_public back where it is needed, which is in mod_public and not ↵ | redmatrix | 2015-06-10 | 1 | -0/+6 | |
| | | | | | | | | | | | | | mod_home | |||||
| * | | | more work on item table optimisation | redmatrix | 2015-06-10 | 13 | -45/+55 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-10 | 2 | -28/+27 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | correctly fix attachment permissions from private mentions | Alexandre Hannud Abdo | 2015-06-10 | 1 | -21/+23 | |
| | |/ | | | | | | | by postponing code that removes the attachment tag from the body | |||||
| | * | show login without checking for block_public, local or remote channel | Mario Vavti | 2015-06-10 | 1 | -6/+3 | |
| | | | ||||||
| | * | really show login form if it is enabled | Mario Vavti | 2015-06-10 | 1 | -2/+2 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 2 | -2/+8 | |
| |\| | ||||||
| | * | put mirror_frontpage setting into admin/site | redmatrix | 2015-06-09 | 1 | -0/+3 | |
| | | | ||||||
| | * | toggle diaspora protocol on a per-channel level in addition to the existing ↵ | redmatrix | 2015-06-09 | 1 | -2/+5 | |
| | | | | | | | | | per site setting. Default is enabled if the site setting is enabled. | |||||
| | * | s/broder/border/ | redmatrix | 2015-06-09 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-09 | 8 | -239/+251 | |
| |\| | | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php | |||||
| | * | add nomadic identities as webfinger aliases | redmatrix | 2015-06-09 | 1 | -1/+10 | |
| | | | ||||||
| | * | provide a mechanism for loading the frontpage without redirecting. | redmatrix | 2015-06-08 | 1 | -0/+5 | |
| | | | ||||||
| | * | remove debugging | redmatrix | 2015-06-08 | 1 | -3/+0 | |
| | | | ||||||
| | * | add site_dead flag to prevent delivery to dead sites. Allow sys channel ↵ | redmatrix | 2015-06-08 | 2 | -6/+16 | |
| | | | | | | | | | webpages to be viewed even if site is configured "block public". | |||||
| | * | magic auth issues on dreamhost | redmatrix | 2015-06-07 | 2 | -3/+6 | |
| | | | ||||||
| | * | make sure these are included | redmatrix | 2015-06-07 | 2 | -0/+189 | |
| | | | ||||||
| | * | more frontpage tweaks | redmatrix | 2015-06-07 | 2 | -3/+3 | |
| | | | ||||||
| | * | reverse logic of homepage login setting | redmatrix | 2015-06-07 | 2 | -4/+8 | |
| | | | ||||||
| | * | frontpage tweaks | redmatrix | 2015-06-07 | 2 | -5/+10 | |
| | | | ||||||
| | * | frontpage changes | redmatrix | 2015-06-07 | 1 | -229/+19 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-06 | 3 | -1/+6 | |
| |\| | | | | | | | | | Conflicts: util/messages.po | |||||
| | * | Added translatable strings to the Display Settings page and refreshed ↵ | jeroenpraat | 2015-06-06 | 1 | -0/+3 | |
| | | | | | | | | | util/messages.po. | |||||
| | * | use the right webpage layout for an installed webpage if it exists | Mario Vavti | 2015-06-04 | 2 | -1/+3 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-02 | 3 | -36/+37 | |
| |\| | ||||||
| | * | update help link | Mario Vavti | 2015-06-02 | 1 | -1/+1 | |
| | | | ||||||
| | * | move the photo and attachment permission syncing past the tag replacement so ↵ | redmatrix | 2015-06-01 | 1 | -34/+36 | |
| | | | | | | | | | that attachments get the correct permissions when private mentions are used. | |||||
| | * | bare bones ASLD | redmatrix | 2015-05-31 | 1 | -1/+0 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-31 | 5 | -15/+60 | |
| |\| | ||||||
| | * | fix unable to crop profile pic on postgres | Habeas Codice | 2015-05-30 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-05-30 | 3 | -12/+18 | |
| | |\ | ||||||
| | | * | whitespace | Mario Vavti | 2015-05-29 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | add some yes/no labels and minor template fixes | Mario Vavti | 2015-05-29 | 2 | -6/+6 | |
| | | | | ||||||
| | | * | some fixes to make menu sharing work and expose it in the ui. | Mario Vavti | 2015-05-29 | 1 | -5/+9 | |
| | | | | ||||||
| | | * | show created/edited dates for menus | Mario Vavti | 2015-05-29 | 1 | -0/+2 | |
| | | | | ||||||
| | * | | strip images from directory text entries | redmatrix | 2015-05-30 | 1 | -1/+1 | |
| | |/ | ||||||
| | * | untested menu element import, be aware that the menu api does not over-write ↵ | redmatrix | 2015-05-28 | 1 | -7/+46 | |
| | | | | | | | | | on duplicate name - it just fails. We'll need to sort this out eventually. Also it was planned to offer a choice of whether to preserve links from the source site or change the baseurl to the local one. Currently we convert them all to local links. | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-28 | 2 | -0/+4 | |
| |\| | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/impel.php view/pt-br/messages.po view/pt-br/strings.php | |||||
| | * | catch a window that wasn't yet saved when the last checkin occurred | redmatrix | 2015-05-27 | 1 | -1/+0 | |
| | | | ||||||
| | * | menu encoding for sharing/exchange | redmatrix | 2015-05-27 | 1 | -0/+4 | |
| | | | ||||||
| | * | missing row in sql query which is used further down | redmatrix | 2015-05-27 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-05-27 | 2 | -58/+84 | |
| |\| | | | | | | | | | Conflicts: mod/impel.php | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |