aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | | |/ | |/|
| * | Merge pull request #349 from git-marijus/masterredmatrix2015-06-172-3/+15
| |\ \
| | * | 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
|\| |
| * | 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
* | un-maintainable - let it go.redmatrix2015-06-1417-1760/+0
* | sql errors after last major edit adventureredmatrix2015-06-142-2/+2
* | convert the abook fieldsredmatrix2015-06-1434-279/+241
* | more file/photo merge workredmatrix2015-06-142-17/+51
* | first cut at merging files and photos, not yet well integrated but they are i...redmatrix2015-06-143-24/+35
* | make new os_storage flag workredmatrix2015-06-142-1/+5
* | isolate the os_storage flagredmatrix2015-06-133-23/+29
* | Merge branch 'master' of https://github.com/redmatrix/redmatrixredmatrix2015-06-133-4/+12
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-131-1/+1
| |\
| | * Merge pull request #348 from unary/nginxconfigredmatrix2015-06-131-1/+1
| | |\
| | | * nginx config change from ThomasMichael Johnston2015-06-131-1/+1
| | |/
| * / weekly string updateredmatrix2015-06-132-4401/+4582
| |/
* | 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-112-12/+32
* | more work on itemsredmatrix2015-06-1113-38/+164
|\|
| * Merge https://github.com/redmatrix/redmatrix into pending_mergeredmatrix2015-06-117-7225/+7179
| |\
| | * Merge pull request #347 from tuscanhobbit/devPaolo T2015-06-112-7219/+7160
| | |\
| | | * updated italian stringsPaolo Tacconi2015-06-112-7219/+7160
| | * | set width for region_3 only if center page content is setMario Vavti2015-06-113-4/+15
| | * | fix rendering of affinity sliderMario Vavti2015-06-112-2/+4
| * | | hubzilla compatibility functionredmatrix2015-06-112-1/+15
| |/ /
* | | the hubzilla version of this functionredmatrix2015-06-111-0/+12
* | | diaspora disallowed by defaultredmatrix2015-06-103-8/+0
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 17:50:21 +0000