aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-06-2653-32045/+16193
| | |/| | |/|/ | |/| |/| |
* | | port some functions from osadaMario Vavti2019-06-261-15/+272
* | | Merge branch 'dev' into 'dev'Mario2019-06-262-1/+24
|\ \ \
* \ \ \ Merge branch 'fix-item_export-api-path' into 'dev'Mario2019-06-261-2/+2
|\ \ \ \
| * | | | Make export_page API endpoint match ZAPDM42.Net (Matt Dent)2019-06-231-2/+2
* | | | | Merge branch 'export_items-export_all' into 'dev'Mario2019-06-261-2/+2
|\ \ \ \ \
| * | | | | export all items except photosDM42.Net (Matt Dent)2019-06-211-2/+2
| |/ / / /
* | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-211-1/+1
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Fix thumbnails processing logic on files syncMax Kostikov2019-06-211-1/+1
| * | | Revert "Respect photo thumbnails storage in import"Max Kostikov2019-06-211-3/+5
| * | | Respect photo thumbnails storage in importMax Kostikov2019-06-211-5/+3
* | | | fix mid not dbesc'd. the comment was no longer true. this fixes an issue with...Mario Vavti2019-06-211-2/+2
* | | | apply calendar encoding fixes to mod calMario Vavti2019-06-201-3/+3
* | | | fix encoding also for description and locationMario Vavti2019-06-201-3/+3
* | | | various calendar UI improvements: make day- and weeknumbers clickable for nav...Mario Vavti2019-06-201-8/+31
* | | | Merge branch 'dev' into 'dev'Mario2019-06-209-21/+32
|\ \ \ \
* \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-06-191-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Remove cached photo location directory on delete if emptyMax Kostikov2019-06-191-0/+1
* | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-191-1/+1
|\| | | |
| * | | | Use html_entity_decode() for cached photo URLMax Kostikov2019-06-191-1/+1
* | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-191-1/+1
|\| | | |
| * | | | Update zid.phpMax Kostikov2019-06-191-1/+1
| * | | | Include Zot6 hubs in the Grid scopeMax Kostikov2019-06-181-1/+1
* | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-184-13843/+15287
|\| | | |
| * | | | Update hstrings.phpMax Kostikov2019-06-181-13/+14
| * | | | Update hmessages.poMax Kostikov2019-06-181-551/+553
| * | | | Update hstrings.phpMax Kostikov2019-06-181-2566/+2805
| * | | | Update hmessages.poMax Kostikov2019-06-181-10713/+11915
* | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-181-1/+1
|\| | | |
| * | | | Fix os_path replace for thumbnailsMax Kostikov2019-06-181-1/+1
| * | | | Merge branch 'dev' into 'dev'Max Kostikov2019-06-1833-18085/+407
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Avoid to process original images using storeThumbnailMax Kostikov2019-06-181-3/+7
* | | | | Merge branch 'dev' into 'dev'Mario2019-06-183-3/+3
|\ \ \ \ \
* | | | | | fix typoMario Vavti2019-06-181-2/+2
* | | | | | update composer libsMario Vavti2019-06-179-87/+125
* | | | | | changelog and versionMario Vavti2019-06-172-1/+16
* | | | | | disable events module. it is now disfunctionalMario Vavti2019-06-172-8/+6
* | | | | | remove old fullcalendar libraryMario Vavti2019-06-1712-17676/+0
* | | | | | update feature setMario Vavti2019-06-172-15/+1
* | | | | | revisit mod calMario Vavti2019-06-173-290/+247
* | | | | | Merge branch 'dev' into 'dev'Mario2019-06-155-6/+15
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | base64 encode message signatureMax Kostikov2019-06-151-1/+1
| * | | | | Add base64 decode if signature encodedMax Kostikov2019-06-151-0/+3
| * | | | | FormattingMax Kostikov2019-06-141-1/+1
| * | | | | Add signature when private message displayingMax Kostikov2019-06-141-1/+1
| * | | | | Add signature when send private messageMax Kostikov2019-06-141-0/+1
| * | | | | FormattingMax Kostikov2019-06-141-1/+1
| * | | | | Add signatures processing for private messagesMax Kostikov2019-06-141-0/+4
| * | | | | Add signatures processing for private messagesMax Kostikov2019-06-141-3/+2
| * | | | | Add signatures processing for private messagesMax Kostikov2019-06-141-2/+4
|/ / / / /