| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrix | redmatrix | 2015-06-21 | 29 | -331/+539 |
| |\ | | | | | | | | | | | Conflicts: include/items.php util/messages.po | ||||
| | * | import: Improve the descriptive text for this feature | redmatrix | 2015-06-21 | 1 | -2/+2 |
| | | | |||||
| | * | Merge https://github.com/redmatrix/redmatrix into pending_merge | redmatrix | 2015-06-21 | 3 | -7/+6 |
| | |\ | |||||
| | | * | Merge pull request #355 from dawnbreak/master | redmatrix | 2015-06-22 | 3 | -9/+23 |
| | | |\ | | | | | | | | | Compatible update for .htaccess v2. | ||||
| | | | * | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-22 | 3 | -9/+23 |
| | | | | | | | | | | | | | | | | | This should hopefully work in Apache 2.2 and 2.4. | ||||
| | | * | | Merge pull request #354 from redmatrix/revert-353-master | Klaus | 2015-06-22 | 3 | -23/+8 |
| | | |\ \ | | | | | | | | | | | Revert "Compatible update for .htaccess." | ||||
| | | | * | | Revert "Compatible update for .htaccess." | Klaus | 2015-06-22 | 3 | -23/+8 |
| | | |/ / | |||||
| | * / / | some diaspora import issues uncovered during dry-run tests | redmatrix | 2015-06-21 | 4 | -13/+14 |
| | |/ / | |||||
| | * | | Merge pull request #353 from dawnbreak/master | redmatrix | 2015-06-22 | 3 | -8/+23 |
| | |\ \ | | |/ | |/| | Compatible update for .htaccess. | ||||
| | | * | Compatible update for .htaccess. | Klaus Weidenbach | 2015-06-21 | 3 | -8/+23 |
| | |/ | | | | | | | This should hopefully work in Apache 2.2 and 2.4. | ||||
| | * | do not show default in scheme selection dropdown. default.php and ↵ | Mario Vavti | 2015-06-21 | 5 | -3/+8 |
| | | | | | | | | | default.css should be symlinks. adjust doco accordingly. | ||||
| | * | 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 | 2 | -21/+43 |
| | | | | | | | | | | | | | 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 |
| | | | | |||||
| | * | | automatically gunzip Diaspora export files if we're on a *nix system | redmatrix | 2015-06-19 | 1 | -0/+9 |
| | | | | |||||
| | * | | 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 | 16 | -308/+330 |
| | |\ \ | |||||
| | | * | | more generic-content-wrapper and some css fixes | Mario Vavti | 2015-06-19 | 3 | -35/+44 |
| | | | | | |||||
| | | * | | cloud.tpl | Mario Vavti | 2015-06-19 | 1 | -0/+4 |
| | | | | | |||||
| | | * | | bring some more generic-content-wrappers and fix some of them | Mario Vavti | 2015-06-19 | 12 | -273/+282 |
| | | |/ | |||||
| | * / | very early attempt diaspora import from diaspora export file. Currently the ↵ | redmatrix | 2015-06-19 | 4 | -110/+221 |
| | |/ | | | | | | | 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 | 5 | -6/+16 |
| |\| | |||||
| | * | 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 |
| | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |