Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge branch 'dev' | Mario Vavti | 2019-06-17 | 31 | -18079/+448 | |
|\| | | | | | | | | | | ||||||
| * | | | | | | | | | | disable events module. it is now disfunctional | Mario Vavti | 2019-06-17 | 2 | -8/+6 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | remove old fullcalendar library | Mario Vavti | 2019-06-17 | 12 | -17676/+0 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | update feature set | Mario Vavti | 2019-06-17 | 2 | -15/+1 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | revisit mod cal | Mario Vavti | 2019-06-17 | 3 | -290/+247 | |
| | | | | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-06-15 | 5 | -6/+15 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add signatures processing for private messages See merge request hubzilla/core!1670 | |||||
| | * | | | | | | | | | base64 encode message signature | Max Kostikov | 2019-06-15 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Add base64 decode if signature encoded | Max Kostikov | 2019-06-15 | 1 | -0/+3 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Formatting | Max Kostikov | 2019-06-14 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Add signature when private message displaying | Max Kostikov | 2019-06-14 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Add signature when send private message | Max Kostikov | 2019-06-14 | 1 | -0/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Formatting | Max Kostikov | 2019-06-14 | 1 | -1/+1 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Add signatures processing for private messages | Max Kostikov | 2019-06-14 | 1 | -0/+4 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Add signatures processing for private messages | Max Kostikov | 2019-06-14 | 1 | -3/+2 | |
| | | | | | | | | | | | ||||||
| | * | | | | | | | | | Add signatures processing for private messages | Max Kostikov | 2019-06-14 | 1 | -2/+4 | |
| |/ / / / / / / / / | ||||||
| * | | | | | | | | | fix mod cal regression | Mario Vavti | 2019-06-14 | 1 | -2/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-06-14 | 1 | -1/+3 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | zot6 protocol edge case See merge request hubzilla/core!1669 | |||||
| | * | | | | | | | | zot6 protocol edge case | zotlabs | 2019-06-13 | 1 | -1/+3 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | fix typo | Mario Vavti | 2019-06-14 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | more work on linked item/resource deletion for photos and events, deprecate ↵ | Mario Vavti | 2019-06-13 | 4 | -75/+54 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the force flag in drop_item() and comment out goaway() in drop_item(). | |||||
| * | | | | | | | | | port delete fixes from zap | Mario Vavti | 2019-06-12 | 2 | -20/+25 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | more work on event item deletion | Mario Vavti | 2019-06-12 | 3 | -1/+49 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | initial support for deleting event items if an event is removed | Mario Vavti | 2019-06-12 | 1 | -3/+62 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'dev' into 'dev' | Mario | 2019-06-12 | 2 | -6/+8 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attach sync issues See merge request hubzilla/core!1668 | |||||
| | * | | | | | | | | zot6 deletion issue | zotlabs | 2019-06-11 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | attach sync issues | zotlabs | 2019-06-11 | 1 | -5/+7 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Add resize on image scale to 4 and 7 | Max Kostikov | 2019-06-11 | 1 | -0/+2 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | remove sizeRangeSuffixes. they can cause issues with profile photos. | Mario Vavti | 2019-06-10 | 1 | -10/+2 | |
| | | | | | | | | | ||||||
| * | | | | | | | | add the thumbrepair script | Mario | 2019-06-10 | 1 | -0/+72 | |
| | | | | | | | | | ||||||
| * | | | | | | | | resolve merge conflict | Mario | 2019-06-10 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-06-10 | 1 | -2/+2 | |
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PgSQL compatibility on conversion See merge request hubzilla/core!1665 | |||||
| | | * | | | | | | | | PgSQL compatibility on conversion | Max Kostikov | 2019-06-10 | 1 | -2/+2 | |
| | |/ / / / / / / / | ||||||
| * / / / / / / / / | fix storageconv issue with postgres | Mario | 2019-06-10 | 1 | -2/+5 | |
| |/ / / / / / / / | ||||||
| * | | | | | | | | fix css issue | Mario Vavti | 2019-06-07 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| * | | | | | | | | fix embedphotos image size | Mario Vavti | 2019-06-07 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
* | | | | | | | | | fix mod cal regression | Mario Vavti | 2019-06-14 | 1 | -2/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit a26774b99e1cf3e69df4f527e2c4c4443dce63ad) | |||||
* | | | | | | | | | Merge branch 'patch-1' into 'master' | Mario | 2019-06-11 | 1 | -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 7 | Max Kostikov | 2019-06-11 | 1 | -0/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | remove sizeRangeSuffixes. they can cause issues with profile photos. | Mario Vavti | 2019-06-10 | 1 | -10/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit e81e264988c8f01ca11474525162398a865e5282) | |||||
* | | | | | | | | | add the thumbrepair script | Mario | 2019-06-10 | 1 | -0/+72 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 15874ac45c15b8130d8748ba234a26d32bb2252d) | |||||
* | | | | | | | | | resolve merge conflict | Mario | 2019-06-10 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 761fc74a67e844db2421f5f7f039c8aa0731b5e6) | |||||
* | | | | | | | | | fix storageconv issue with postgres | Mario | 2019-06-10 | 1 | -2/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 0e2239e50b6a4da8261a03284211d989c87f50e2) | |||||
* | | | | | | | | | Revert "PgSQL compatibility on conversion" | Mario | 2019-06-10 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit dd1f631d9ddcc488554d44c0259265dd8c75e429 | |||||
* | | | | | | | | | PgSQL compatibility on conversion | Max Kostikov | 2019-06-10 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 94254e61c188fdc553acbfb99e78adb892569892) | |||||
* | | | | | | | | | fix css issue | Mario Vavti | 2019-06-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 55792d5528717845bdd129cef508602d6bd3808a) | |||||
* | | | | | | | | | fix embedphotos image size | Mario Vavti | 2019-06-07 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit ebc2b23c3a2c83ad62ba301d0b94671e4691689a) | |||||
* | | | | | | | | | Merge branch '4.2RC'4.2 | Mario Vavti | 2019-06-04 | 665 | -46610/+51466 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | version 4.2 | Mario Vavti | 2019-06-04 | 1 | -1/+1 | |
| | | | | | | | | | | ||||||
| * | | | | | | | | | Merge branch 'dev' into 4.2RC | Mario Vavti | 2019-06-04 | 1 | -1/+1 | |
| |\| | | | | | | | | ||||||
| | * | | | | | | | | update changelog | Mario Vavti | 2019-06-04 | 1 | -1/+1 | |
| | | | | | | | | | |