Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | |||||
* | update changelog | Mario Vavti | 2019-06-04 | 1 | -1/+1 |
| | |||||
* | do not change default timezone in parse_ical_file() | Mario Vavti | 2019-06-03 | 1 | -9/+0 |
| | |||||
* | fix timezone issue when importing adjusted events | Mario Vavti | 2019-06-03 | 1 | -7/+13 |
| | |||||
* | regard timezones in calendar import/export | Mario | 2019-06-03 | 2 | -5/+26 |
| | | | (cherry picked from commit 5b4aa1afc2d3811aae93706299dfb5d5c703198f) | ||||
* | update changelog | Mario Vavti | 2019-06-03 | 1 | -1/+3 |
| | |||||
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-31 | 1 | -2/+1 |
|\ | | | | | | | | | fix category widget when using articles See merge request hubzilla/core!1664 | ||||
| * | fix category widget when using articles | zotlabs | 2019-05-31 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-30 | 1 | -2/+2 |
|\| | | | | | | | | | live-update not triggering on mod_search See merge request hubzilla/core!1662 | ||||
| * | live-update not triggering on mod_search | zotlabs | 2019-05-29 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-30 | 1 | -1/+1 |
|\ \ | |/ |/| | | | | | Add single photo URL rewrite for clonned channel See merge request hubzilla/core!1663 | ||||
| * | Add single photo URL rewrite for clonned channel | Max Kostikov | 2019-05-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-05-29 | 4 | -21/+38 |
|\ \ | | | | | | | | | | | | | support 'expires' over Zot6 See merge request hubzilla/core!1661 | ||||
| * | | anomolies in calls to datetime_convert in include/import | zotlabs | 2019-05-28 | 1 | -6/+6 |
| | | | |||||
| * | | convert AS "instrument" objects to the more appropriate "generator" - this ↵ | zotlabs | 2019-05-28 | 1 | -14/+14 |
| | | | | | | | | | | | | probably should happen in pubcrawl addon also | ||||
| * | | Revert "another forum -> group wording change" (wrong tree) | zotlabs | 2019-05-28 | 1 | -3/+3 |
| | | | | | | | | | | | | This reverts commit 7c2aafd4ee123f9db1ea2733119e0711f53414cc. | ||||
| * | | support 'expires' over Zot6 | zotlabs | 2019-05-28 | 3 | -1/+18 |
| | | | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-05-28 | 21 | -1462/+1760 |
| |\ \ | |/ / |/| | | |||||
* | | | update changelog | Mario Vavti | 2019-05-28 | 1 | -0/+56 |
| | | | |||||
* | | | mod cal band-aid fixes | Mario Vavti | 2019-05-26 | 3 | -16/+26 |
| | | | |||||
* | | | adjust birthday handling according to community decision and slightly change ↵ | Mario Vavti | 2019-05-26 | 7 | -33/+30 |
| | | | | | | | | | | | | display of allday event items | ||||
* | | | fix #1374 | Mario Vavti | 2019-05-24 | 1 | -0/+4 |
| | | | |||||
* | | | get channel from photo uid | Mario Vavti | 2019-05-24 | 1 | -1/+1 |
| | | | |||||
* | | | add new directory fallback server | Mario Vavti | 2019-05-23 | 1 | -1/+2 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-05-22 | 1 | -0/+8 |
|\ \ \ | | | | | | | | | | | | | | | | | translate make-friend activities to zot6 See merge request hubzilla/core!1654 | ||||
* \ \ \ | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-05-22 | 3 | -1307/+1485 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch 'es-es' into 'dev' | Mario | 2019-05-20 | 3 | -1307/+1485 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Update es-es See merge request hubzilla/core!1651 | ||||
| | * \ \ \ | Merge branch 'cherry-pick-350e636e' into 'es-es' | Manuel Jiménez Friaza | 2019-05-19 | 3 | -1307/+1485 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Spanish translation See merge request mjfriaza/core!7 | ||||
| | | * | | | | Updated Spanish translation | Manuel Jiménez Friaza | 2019-05-19 | 3 | -1307/+1485 |
| | |/ / / / | | | | | | | | | | | | | (cherry picked from commit 350e636e3d0a44323c69185555e89cc01a213aa2) | ||||
* | | | | | | improve timezone detection for caldav and remove smart birthday feature. ↵ | Mario Vavti | 2019-05-22 | 5 | -18/+27 |
| | | | | | | | | | | | | | | | | | | | | | | | | Force adjust birthdays until we agree on how to deal with this. |