| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 1 | -0/+1 | |
| |\| | ||||||
| | * | turn the connection filter into a feature. | redmatrix | 2015-06-29 | 1 | -0/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-29 | 1 | -2/+1 | |
| |\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | |||||
| | * | fix directory location | Mario Vavti | 2015-06-29 | 1 | -2/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 2 | -4/+13 | |
| |\| | | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-28 | 1 | -2/+2 | |
| | |\ | ||||||
| | | * | simply 'post' is a better default term than 'status' | Alexandre Hannud Abdo | 2015-06-27 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 1 | -2/+10 | |
| | |/ | | | | | | | still pretty cool. | |||||
| * | | undo the disabling of browser_prefetch and for the time being revert the ↵ | redmatrix | 2015-06-25 | 7 | -7/+7 | |
| | | | | | | | | | HTML cache until we can isolate all the zid and observer calls. Also get rid of youtube and vimeo bbcode tags which we should not be using any more. | |||||
| * | | remove all QR-code stuff from core - now in qrator addon | redmatrix | 2015-06-25 | 1 | -8/+0 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-24 | 2 | -4/+5 | |
| |\| | | | | | | | | | | | | | Conflicts: doc/de/features.bb view/de/messages.po view/de/strings.php | |||||
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-24 | 1 | -1/+1 | |
| | |\ | ||||||
| | * | | Reflect in directory title if we watch the local or the global directory | Mario Vavti | 2015-06-24 | 1 | -2/+3 | |
| | | | | ||||||
| * | | | more work on mail flags | redmatrix | 2015-06-23 | 3 | -15/+8 | |
| | | | | ||||||
| * | | | item flag fixes discovered after a few merges | redmatrix | 2015-06-23 | 4 | -5/+3 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-23 | 3 | -18/+29 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: include/items.php mod/item.php | |||||
| | * | | typo | redmatrix | 2015-06-23 | 1 | -1/+1 | |
| | |/ | ||||||
| | * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-23 | 1 | -3/+3 | |
| | |\ | ||||||
| | | * | Merge pull request #356 from solstag/signature_edit_fix | redmatrix | 2015-06-23 | 1 | -2/+2 | |
| | | |\ | | | | | | | | | properly trims edited posts before signing so signature verification … | |||||
| | | | * | properly trims edited posts before signing so signature verification works | Alexandre Hannud Abdo | 2015-06-23 | 1 | -2/+2 | |
| | | | | | ||||||
| | | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-22 | 1 | -0/+1 | |
| | | |\| | ||||||
| | | * | | ensure we always sign a trimmed item body. | redmatrix | 2015-06-22 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | some work on directory | Mario Vavti | 2015-06-23 | 1 | -14/+23 | |
| | | |/ | |/| | ||||||
| | * | | Bring /help in line with the rest of the app | Mario Vavti | 2015-06-22 | 1 | -0/+1 | |
| | |/ | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-21 | 1 | -4/+20 | |
| |\| | | | | | | | | | | | Conflicts: include/items.php util/messages.po | |||||
| | * | import: Improve the descriptive text for this feature | redmatrix | 2015-06-21 | 1 | -2/+2 | |
| | | | ||||||
| | * | some diaspora import issues uncovered during dry-run tests | redmatrix | 2015-06-21 | 1 | -6/+6 | |
| | | | ||||||
| | * | automatically gunzip Diaspora export files if we're on a *nix system | redmatrix | 2015-06-19 | 1 | -0/+9 | |
| | | | ||||||
| | * | very early attempt diaspora import from diaspora export file. Currently the ↵ | redmatrix | 2015-06-19 | 1 | -1/+8 | |
| | | | | | | | | | json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later. | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-18 | 2 | -1/+3 | |
| |\| | ||||||
| | * | set return url from apps page | redmatrix | 2015-06-18 | 2 | -1/+3 | |
| | | | ||||||
| * | | more photos work | redmatrix | 2015-06-17 | 2 | -4/+13 | |
| | | | ||||||
| * | | lots of work on merging photo and file albums/folders | redmatrix | 2015-06-17 | 2 | -5/+9 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-16 | 2 | -1/+24 | |
| |\| | | | | | | | | | | | Conflicts: mod/photos.php mod/siteinfo.php | |||||
| | * | Merge pull request #349 from git-marijus/master | redmatrix | 2015-06-17 | 1 | -1/+13 | |
| | |\ | | | | | | | make photo upload work for remote channels with perms | |||||
| | | * | make photo upload work for remote channels with perms | Mario Vavti | 2015-06-16 | 1 | -1/+13 | |
| | | | | ||||||
| | * | | Small fix in siteinfo | jeroenpraat | 2015-06-16 | 1 | -1/+1 | |
| | |/ | ||||||
| * | | remove file/attachments when their associated photos are removed | redmatrix | 2015-06-16 | 1 | -0/+7 | |
| | | | ||||||
| * | | move profile photos to new methods | redmatrix | 2015-06-15 | 2 | -49/+39 | |
| | | | ||||||
| * | | fix attachment permissions when they also contain an image. | redmatrix | 2015-06-15 | 2 | -1/+16 | |
| | | | ||||||
| * | | photo upload: pass in the contact_allow and resource_id via include/attach.php | redmatrix | 2015-06-15 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-15 | 1 | -3/+3 | |
| |\| | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | |||||
| | * | do not allow/show acl button on photo edit if not owner | Mario Vavti | 2015-06-15 | 1 | -3/+3 | |
| | | | ||||||
| * | | DB changes for some channel flags | redmatrix | 2015-06-15 | 7 | -33/+17 | |
| | | | ||||||
| * | | sql errors after last major edit adventure | redmatrix | 2015-06-14 | 2 | -2/+2 | |
| | | | ||||||
| * | | 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 | |
| | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |