aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-2129-331/+539
|\ | | | | | | | | | | Conflicts: include/items.php util/messages.po
| * import: Improve the descriptive text for this featureredmatrix2015-06-211-2/+2
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-213-7/+6
| |\
| | * Merge pull request #355 from dawnbreak/masterredmatrix2015-06-223-9/+23
| | |\ | | | | | | | | Compatible update for .htaccess v2.
| | | * Compatible update for .htaccess.Klaus Weidenbach2015-06-223-9/+23
| | | | | | | | | | | | | | | | This should hopefully work in Apache 2.2 and 2.4.
| | * | Merge pull request #354 from redmatrix/revert-353-masterKlaus2015-06-223-23/+8
| | |\ \ | | | | | | | | | | Revert "Compatible update for .htaccess."
| | | * | Revert "Compatible update for .htaccess."Klaus2015-06-223-23/+8
| | |/ /
| * / / some diaspora import issues uncovered during dry-run testsredmatrix2015-06-214-13/+14
| |/ /
| * | Merge pull request #353 from dawnbreak/masterredmatrix2015-06-223-8/+23
| |\ \ | | |/ | |/| Compatible update for .htaccess.
| | * Compatible update for .htaccess.Klaus Weidenbach2015-06-213-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 Vavti2015-06-215-3/+8
| | | | | | | | default.css should be symlinks. adjust doco accordingly.
| * Merge pull request #352 from solstag/store_update_fixredmatrix2015-06-211-9/+10
| |\ | | | | | | Make item_store_update only affect the data we requested
| | * Make item_store_update only affect the data we requestedAlexandre Hannud Abdo2015-06-201-9/+10
| | |
| * | ensure the photo driver is includedredmatrix2015-06-201-0/+1
| | |
| * | import_diaspora - incorrect method for importing channel photo, and add ↵redmatrix2015-06-202-21/+43
| | | | | | | | | | | | duplicate reddress detection/correction
| * | wrong logicredmatrix2015-06-191-1/+1
| | |
| * | import_diaspora - a few more atypical settingsredmatrix2015-06-191-3/+19
| | |
| * | automatically gunzip Diaspora export files if we're on a *nix systemredmatrix2015-06-191-0/+9
| | |
| * | import_diaspora: add all the friendsredmatrix2015-06-191-4/+13
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-1916-308/+330
| |\ \
| | * | more generic-content-wrapper and some css fixesMario Vavti2015-06-193-35/+44
| | | |
| | * | cloud.tplMario Vavti2015-06-191-0/+4
| | | |
| | * | bring some more generic-content-wrappers and fix some of themMario Vavti2015-06-1912-273/+282
| | |/
| * / very early attempt diaspora import from diaspora export file. Currently the ↵redmatrix2015-06-194-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 ↵redmatrix2015-06-181-11/+68
| | | | | | | | natively
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-185-6/+16
|\|
| * set return url from apps pageredmatrix2015-06-182-1/+3
| |
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-189-7163/+7428
| |\
| * | issues with markdownify and escaped HTMLredmatrix2015-06-183-5/+13
| | |
* | | more photos workredmatrix2015-06-174-6/+15
| | |
* | | lots of work on merging photo and file albums/foldersredmatrix2015-06-175-25/+57
| | |
* | | attach_mkdirp - implement force option to return success if dir existsredmatrix2015-06-171-2/+9
| | |
* | | recursive mkdir (ala mkdir -p) for file and photo storageredmatrix2015-06-161-1/+90
| | |
* | | start work on photo directoriesredmatrix2015-06-161-2/+30
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-163-3/+26
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: mod/photos.php mod/siteinfo.php
| * | Merge pull request #349 from git-marijus/masterredmatrix2015-06-172-3/+15
| |\ \ | | | | | | | | make photo upload work for remote channels with perms
| | * | fix deleting of album for remote channelMario Vavti2015-06-161-2/+2
| | | |
| | * | make photo upload work for remote channels with permsMario Vavti2015-06-161-1/+13
| | | |
| * | | Small fix in siteinfojeroenpraat2015-06-161-1/+1
| |/ /
* | | remove file/attachments when their associated photos are removedredmatrix2015-06-162-2/+10
| | |
* | | move profile photos to new methodsredmatrix2015-06-153-50/+46
| | |
* | | fix attachment permissions when they also contain an image.redmatrix2015-06-153-1/+18
| | |
* | | photo upload: pass in the contact_allow and resource_id via include/attach.phpredmatrix2015-06-154-5/+9
| | |
* | | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-156-162/+191
|\| | | | | | | | | | | | | | | | | Conflicts: view/nl/messages.po view/nl/strings.php
| * | Merge branch 'master' of https://github.com/redmatrix/redmatrixMario Vavti2015-06-152-6998/+7222
| |\ \
| | * | Update Dutch language stringsjeroenpraat2015-06-152-6998/+7222
| | | |
| * | | update spin.jsMario Vavti2015-06-152-157/+184
| |/ /
| * / do not allow/show acl button on photo edit if not ownerMario Vavti2015-06-153-4/+6
| |/
| * version updateredmatrix2015-06-141-1/+1
| |
* | DB changes for some channel flagsredmatrix2015-06-1519-131/+87
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 19:34:49 +0000