aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge branch 'dev'Mario Vavti2019-06-1731-18079/+448
|\| | | | | | | | | |
| * | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add signatures processing for private messages See merge request hubzilla/core!1670
| | * | | | | | | | | 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
| |/ / / / / / / / /
| * | | | | | | | | fix mod cal regressionMario Vavti2019-06-141-2/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-06-141-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zot6 protocol edge case See merge request hubzilla/core!1669
| | * | | | | | | | zot6 protocol edge casezotlabs2019-06-131-1/+3
| | | | | | | | | |
| * | | | | | | | | fix typoMario Vavti2019-06-141-1/+1
| | | | | | | | | |
| * | | | | | | | | more work on linked item/resource deletion for photos and events, deprecate ↵Mario Vavti2019-06-134-75/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the force flag in drop_item() and comment out goaway() in drop_item().
| * | | | | | | | | port delete fixes from zapMario Vavti2019-06-122-20/+25
| | | | | | | | | |
| * | | | | | | | | more work on event item deletionMario Vavti2019-06-123-1/+49
| | | | | | | | | |
| * | | | | | | | | initial support for deleting event items if an event is removedMario Vavti2019-06-121-3/+62
| | | | | | | | | |
| * | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-06-122-6/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attach sync issues See merge request hubzilla/core!1668
| | * | | | | | | | zot6 deletion issuezotlabs2019-06-111-1/+1
| | | | | | | | | |
| | * | | | | | | | attach sync issueszotlabs2019-06-111-5/+7
| | | | | | | | | |
| * | | | | | | | | Add resize on image scale to 4 and 7Max Kostikov2019-06-111-0/+2
| |/ / / / / / / /
| * | | | | | | | remove sizeRangeSuffixes. they can cause issues with profile photos.Mario Vavti2019-06-101-10/+2
| | | | | | | | |
| * | | | | | | | add the thumbrepair scriptMario2019-06-101-0/+72
| | | | | | | | |
| * | | | | | | | resolve merge conflictMario2019-06-101-2/+2
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-06-101-2/+2
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PgSQL compatibility on conversion See merge request hubzilla/core!1665
| | | * | | | | | | | PgSQL compatibility on conversionMax Kostikov2019-06-101-2/+2
| | |/ / / / / / / /
| * / / / / / / / / fix storageconv issue with postgresMario2019-06-101-2/+5
| |/ / / / / / / /
| * | | | | | | | fix css issueMario Vavti2019-06-071-1/+1
| | | | | | | | |
| * | | | | | | | fix embedphotos image sizeMario Vavti2019-06-071-1/+1
| | | | | | | | |
* | | | | | | | | fix mod cal regressionMario Vavti2019-06-141-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit a26774b99e1cf3e69df4f527e2c4c4443dce63ad)
* | | | | | | | | Merge branch 'patch-1' into 'master'Mario2019-06-111-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add resize on image scale to 4 and 7 See merge request hubzilla/core!1667
| * | | | | | | | | Add resize on image scale to 4 and 7Max Kostikov2019-06-111-0/+2
|/ / / / / / / / /
* | | | | | | | | remove sizeRangeSuffixes. they can cause issues with profile photos.Mario Vavti2019-06-101-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit e81e264988c8f01ca11474525162398a865e5282)
* | | | | | | | | add the thumbrepair scriptMario2019-06-101-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 15874ac45c15b8130d8748ba234a26d32bb2252d)
* | | | | | | | | resolve merge conflictMario2019-06-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 761fc74a67e844db2421f5f7f039c8aa0731b5e6)
* | | | | | | | | fix storageconv issue with postgresMario2019-06-101-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 0e2239e50b6a4da8261a03284211d989c87f50e2)
* | | | | | | | | Revert "PgSQL compatibility on conversion"Mario2019-06-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit dd1f631d9ddcc488554d44c0259265dd8c75e429
* | | | | | | | | PgSQL compatibility on conversionMax Kostikov2019-06-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 94254e61c188fdc553acbfb99e78adb892569892)
* | | | | | | | | fix css issueMario Vavti2019-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 55792d5528717845bdd129cef508602d6bd3808a)
* | | | | | | | | fix embedphotos image sizeMario Vavti2019-06-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ebc2b23c3a2c83ad62ba301d0b94671e4691689a)
* | | | | | | | | Merge branch '4.2RC'4.2Mario Vavti2019-06-04665-46610/+51466
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | version 4.2Mario Vavti2019-06-041-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'dev' into 4.2RCMario Vavti2019-06-041-1/+1
| |\| | | | | | | |
| | * | | | | | | | update changelogMario Vavti2019-06-041-1/+1
| | | | | | | | | |