aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-232-3/+30
|\ | | | | | | | | | | Conflicts: include/items.php mod/item.php
| * ensure we always sign a trimmed item body.redmatrix2015-06-221-3/+3
| |
| * discovered a couple of loose ends in the per-member enable diaspora settingredmatrix2015-06-221-0/+26
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-213-11/+156
|\| | | | | | | | | | | Conflicts: include/items.php util/messages.po
| * some diaspora import issues uncovered during dry-run testsredmatrix2015-06-211-6/+4
| |
| * 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-201-20/+42
| | | | | | | | | | | | duplicate reddress detection/correction
| * | wrong logicredmatrix2015-06-191-1/+1
| | |
| * | import_diaspora - a few more atypical settingsredmatrix2015-06-191-3/+19
| | |
| * | import_diaspora: add all the friendsredmatrix2015-06-191-4/+13
| | |
| * | Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-191-5/+2
| |\ \
| | * | bring some more generic-content-wrappers and fix some of themMario Vavti2015-06-191-5/+2
| | |/
| * / very early attempt diaspora import from diaspora export file. Currently the ↵redmatrix2015-06-191-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 ↵redmatrix2015-06-181-11/+68
| | | | | | | | natively
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-182-4/+12
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-181-2/+2
| |\
| * | issues with markdownify and escaped HTMLredmatrix2015-06-182-4/+12
| | |
* | | more photos workredmatrix2015-06-171-1/+1
| | |
* | | lots of work on merging photo and file albums/foldersredmatrix2015-06-172-20/+45
| | |
* | | 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-161-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: mod/photos.php mod/siteinfo.php
| * | fix deleting of album for remote channelMario Vavti2015-06-161-2/+2
| |/
* | remove file/attachments when their associated photos are removedredmatrix2015-06-161-2/+3
| |
* | move profile photos to new methodsredmatrix2015-06-151-1/+7
| |
* | fix attachment permissions when they also contain an image.redmatrix2015-06-151-0/+2
| |
* | photo upload: pass in the contact_allow and resource_id via include/attach.phpredmatrix2015-06-153-4/+8
| |
* | DB changes for some channel flagsredmatrix2015-06-1511-98/+66
| |
* | convert the abook fieldsredmatrix2015-06-1418-147/+143
| |
* | more file/photo merge workredmatrix2015-06-142-17/+51
| |
* | first cut at merging files and photos, not yet well integrated but they are ↵redmatrix2015-06-142-5/+10
| | | | | | | | integrated
* | isolate the os_storage flagredmatrix2015-06-133-23/+29
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-131-2/+10
|\| | | | | | | | | Conflicts: util/messages.po
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-111-0/+4
|\|
| * don't provide a connect button on the sys channel profile sidebarredmatrix2015-06-111-0/+4
| |
* | make cloud work againredmatrix2015-06-115-6/+6
| |
* | start on the DAV/photos mergerredmatrix2015-06-111-12/+30
| |
* | more work on itemsredmatrix2015-06-112-19/+90
|\| | | | | | | | | | | | | | | | | | | | | and Merge branch 'master' of https://github.com/redmatrix/redmatrix Conflicts: include/items.php view/it/messages.po view/it/strings.php
| * hubzilla compatibility functionredmatrix2015-06-111-0/+14
| |
* | the hubzilla version of this functionredmatrix2015-06-111-0/+12
| |
* | diaspora disallowed by defaultredmatrix2015-06-102-6/+0
| |
* | more work on item table optimisationredmatrix2015-06-104-37/+59
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-101-28/+0
|\|
| * retire old Friendica RINO encryption functionsredmatrix2015-06-091-28/+0
| |
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-092-0/+28
|\|
| * toggle diaspora protocol on a per-channel level in addition to the existing ↵redmatrix2015-06-092-0/+28
| | | | | | | | per site setting. Default is enabled if the site setting is enabled.
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-091-8/+17
|\| | | | | | | | | | | | | | | | | Conflicts: install/schema_mysql.sql mod/home.php mod/page.php view/nl/messages.po view/nl/strings.php
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 03:47:08 +0000