| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | * | set return url from apps page | redmatrix | 2015-06-18 | 2 | -1/+3 | |
| | | | ||||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-18 | 9 | -7163/+7428 | |
| | |\ | ||||||
| | * | | issues with markdownify and escaped HTML | redmatrix | 2015-06-18 | 3 | -5/+13 | |
| | | | | ||||||
| * | | | more photos work | redmatrix | 2015-06-17 | 4 | -6/+15 | |
| | | | | ||||||
| * | | | lots of work on merging photo and file albums/folders | redmatrix | 2015-06-17 | 5 | -25/+57 | |
| | | | | ||||||
| * | | | attach_mkdirp - implement force option to return success if dir exists | redmatrix | 2015-06-17 | 1 | -2/+9 | |
| | | | | ||||||
| * | | | recursive mkdir (ala mkdir -p) for file and photo storage | redmatrix | 2015-06-16 | 1 | -1/+90 | |
| | | | | ||||||
| * | | | start work on photo directories | redmatrix | 2015-06-16 | 1 | -2/+30 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-16 | 3 | -3/+26 | |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: mod/photos.php mod/siteinfo.php | |||||
| | * | | Merge pull request #349 from git-marijus/master | redmatrix | 2015-06-17 | 2 | -3/+15 | |
| | |\ \ | | | | | | | | | make photo upload work for remote channels with perms | |||||
| | | * | | fix deleting of album for remote channel | Mario Vavti | 2015-06-16 | 1 | -2/+2 | |
| | | | | | ||||||
| | | * | | 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 | 2 | -2/+10 | |
| | | | | ||||||
| * | | | move profile photos to new methods | redmatrix | 2015-06-15 | 3 | -50/+46 | |
| | | | | ||||||
| * | | | fix attachment permissions when they also contain an image. | redmatrix | 2015-06-15 | 3 | -1/+18 | |
| | | | | ||||||
| * | | | photo upload: pass in the contact_allow and resource_id via include/attach.php | redmatrix | 2015-06-15 | 4 | -5/+9 | |
| | | | | ||||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-15 | 6 | -162/+191 | |
| |\| | | | | | | | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php | |||||
| | * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | Mario Vavti | 2015-06-15 | 2 | -6998/+7222 | |
| | |\ \ | ||||||
| | | * | | Update Dutch language strings | jeroenpraat | 2015-06-15 | 2 | -6998/+7222 | |
| | | | | | ||||||
| | * | | | update spin.js | Mario Vavti | 2015-06-15 | 2 | -157/+184 | |
| | |/ / | ||||||
| | * / | do not allow/show acl button on photo edit if not owner | Mario Vavti | 2015-06-15 | 3 | -4/+6 | |
| | |/ | ||||||
| | * | version update | redmatrix | 2015-06-14 | 1 | -1/+1 | |
| | | | ||||||
| * | | DB changes for some channel flags | redmatrix | 2015-06-15 | 19 | -131/+87 | |
| | | | ||||||
| * | | un-maintainable - let it go. | redmatrix | 2015-06-14 | 17 | -1760/+0 | |
| | | | ||||||
| * | | sql errors after last major edit adventure | redmatrix | 2015-06-14 | 2 | -2/+2 | |
| | | | ||||||
| * | | convert the abook fields | redmatrix | 2015-06-14 | 34 | -279/+241 | |
| | | | ||||||
| * | | 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 | 3 | -24/+35 | |
| | | | | | | | | | integrated | |||||
| * | | make new os_storage flag work | redmatrix | 2015-06-14 | 2 | -1/+5 | |
| | | | ||||||
| * | | 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 | 3 | -4/+12 | |
| |\| | | | | | | | | | Conflicts: util/messages.po | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-13 | 1 | -1/+1 | |
| | |\ | ||||||
| | | * | Merge pull request #348 from unary/nginxconfig | redmatrix | 2015-06-13 | 1 | -1/+1 | |
| | | |\ | | | | | | | | | nginx config change from Thomas | |||||
| | | | * | nginx config change from Thomas | Michael Johnston | 2015-06-13 | 1 | -1/+1 | |
| | | |/ | ||||||
| | * / | weekly string update | redmatrix | 2015-06-13 | 2 | -4401/+4582 | |
| | |/ | ||||||
| * | | 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 | 2 | -12/+32 | |
| | | | ||||||
| * | | more work on items | redmatrix | 2015-06-11 | 13 | -38/+164 | |
| |\| | | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-11 | 7 | -7225/+7179 | |
| | |\ | ||||||
| | | * | Merge pull request #347 from tuscanhobbit/dev | Paolo T | 2015-06-11 | 2 | -7219/+7160 | |
| | | |\ | | | | | | | | | updated italian strings | |||||
| | | | * | updated italian strings | Paolo Tacconi | 2015-06-11 | 2 | -7219/+7160 | |
| | | | | | ||||||
| | | * | | set width for region_3 only if center page content is set | Mario Vavti | 2015-06-11 | 3 | -4/+15 | |
| | | | | | ||||||
| | | * | | fix rendering of affinity slider | Mario Vavti | 2015-06-11 | 2 | -2/+4 | |
| | | | | | ||||||
| | * | | | hubzilla compatibility function | redmatrix | 2015-06-11 | 2 | -1/+15 | |
| | |/ / | ||||||
| * | | | the hubzilla version of this function | redmatrix | 2015-06-11 | 1 | -0/+12 | |
| | | | | ||||||
| * | | | diaspora disallowed by default | redmatrix | 2015-06-10 | 3 | -8/+0 | |
| | | | | ||||||
| * | | | start to partition the dav | redmatrix | 2015-06-10 | 2 | -30/+5 | |
| | | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |