| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-28 | 2 | -17/+94 |
| |\ | | | | | | | | | | | | | Conflicts: include/zot.php mod/connedit.php util/messages.po | ||||
| | * | no this isn't it. well ok, it's part of it, but not the important part. it's ↵ | redmatrix | 2015-06-28 | 2 | -17/+93 |
| | | | | | | | | | still pretty cool. | ||||
| * | | bring single instance file storage to dav and cloud uploaded photos | redmatrix | 2015-06-27 | 2 | -8/+28 |
| | | | |||||
| * | | undo the disabling of browser_prefetch and for the time being revert the ↵ | redmatrix | 2015-06-25 | 2 | -53/+39 |
| | | | | | | | | | 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 | -14/+0 |
| | | | |||||
| * | | localise event calendar | redmatrix | 2015-06-25 | 2 | -55/+114 |
| | | | |||||
| * | | more work on photos, including os_storage for the size '0' photo and ↵ | redmatrix | 2015-06-23 | 3 | -15/+67 |
| | | | | | | | | | numbering duplicate filenames | ||||
| * | | more work on mail flags | redmatrix | 2015-06-23 | 5 | -23/+18 |
| | | | |||||
| * | | item flag fixes discovered after a few merges | redmatrix | 2015-06-23 | 5 | -28/+9 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-23 | 2 | -3/+30 |
| |\| | | | | | | | | | | | Conflicts: include/items.php mod/item.php | ||||
| | * | ensure we always sign a trimmed item body. | redmatrix | 2015-06-22 | 1 | -3/+3 |
| | | | |||||
| | * | discovered a couple of loose ends in the per-member enable diaspora setting | redmatrix | 2015-06-22 | 1 | -0/+26 |
| | | | |||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-21 | 3 | -11/+156 |
| |\| | | | | | | | | | | | Conflicts: include/items.php util/messages.po | ||||
| | * | some diaspora import issues uncovered during dry-run tests | redmatrix | 2015-06-21 | 1 | -6/+4 |
| | | | |||||
| | * | Merge pull request #352 from solstag/store_update_fix | redmatrix | 2015-06-21 | 1 | -9/+10 |
| | |\ | | | | | | | Make item_store_update only affect the data we requested | ||||
| | | * | Make item_store_update only affect the data we requested | Alexandre Hannud Abdo | 2015-06-20 | 1 | -9/+10 |
| | | | | |||||
| | * | | ensure the photo driver is included | redmatrix | 2015-06-20 | 1 | -0/+1 |
| | | | | |||||
| | * | | import_diaspora - incorrect method for importing channel photo, and add ↵ | redmatrix | 2015-06-20 | 1 | -20/+42 |
| | | | | | | | | | | | | | duplicate reddress detection/correction | ||||
| | * | | wrong logic | redmatrix | 2015-06-19 | 1 | -1/+1 |
| | | | | |||||
| | * | | import_diaspora - a few more atypical settings | redmatrix | 2015-06-19 | 1 | -3/+19 |
| | | | | |||||
| | * | | import_diaspora: add all the friends | redmatrix | 2015-06-19 | 1 | -4/+13 |
| | | | | |||||
| | * | | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-19 | 1 | -5/+2 |
| | |\ \ | |||||
| | | * | | bring some more generic-content-wrappers and fix some of them | Mario Vavti | 2015-06-19 | 1 | -5/+2 |
| | | |/ | |||||
| | * / | very early attempt diaspora import from diaspora export file. Currently the ↵ | redmatrix | 2015-06-19 | 1 | -0/+100 |
| | |/ | | | | | | | 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. | ||||
| * | | all file attachments are now stored natively, still have photos-0 to store ↵ | redmatrix | 2015-06-18 | 1 | -11/+68 |
| | | | | | | | | | natively | ||||
| * | | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-18 | 2 | -4/+12 |
| |\| | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-18 | 1 | -2/+2 |
| | |\ | |||||
| | * | | issues with markdownify and escaped HTML | redmatrix | 2015-06-18 | 2 | -4/+12 |
| | | | | |||||
| * | | | more photos work | redmatrix | 2015-06-17 | 1 | -1/+1 |
| | | | | |||||
| * | | | lots of work on merging photo and file albums/folders | redmatrix | 2015-06-17 | 2 | -20/+45 |
| | | | | |||||
| * | | | 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 | 1 | -2/+2 |
| |\ \ \ | | |/ | |/| | | | | | | | | | | Conflicts: mod/photos.php mod/siteinfo.php | ||||
| | * | | 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 | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |