aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* update changelogMario Vavti2019-06-041-1/+1
|
* do not change default timezone in parse_ical_file()Mario Vavti2019-06-031-9/+0
|
* fix timezone issue when importing adjusted eventsMario Vavti2019-06-031-7/+13
|
* regard timezones in calendar import/exportMario2019-06-032-5/+26
| | | (cherry picked from commit 5b4aa1afc2d3811aae93706299dfb5d5c703198f)
* update changelogMario Vavti2019-06-031-1/+3
|
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-311-2/+1
|\ | | | | | | | | fix category widget when using articles See merge request hubzilla/core!1664
| * fix category widget when using articleszotlabs2019-05-311-2/+1
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-301-2/+2
|\| | | | | | | | | live-update not triggering on mod_search See merge request hubzilla/core!1662
| * live-update not triggering on mod_searchzotlabs2019-05-291-2/+2
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-301-1/+1
|\ \ | |/ |/| | | | | Add single photo URL rewrite for clonned channel See merge request hubzilla/core!1663
| * Add single photo URL rewrite for clonned channelMax Kostikov2019-05-301-1/+1
| |
* | Merge branch 'dev' into 'dev'Mario2019-05-294-21/+38
|\ \ | | | | | | | | | | | | support 'expires' over Zot6 See merge request hubzilla/core!1661
| * | anomolies in calls to datetime_convert in include/importzotlabs2019-05-281-6/+6
| | |
| * | convert AS "instrument" objects to the more appropriate "generator" - this ↵zotlabs2019-05-281-14/+14
| | | | | | | | | | | | probably should happen in pubcrawl addon also
| * | Revert "another forum -> group wording change" (wrong tree)zotlabs2019-05-281-3/+3
| | | | | | | | | | | | This reverts commit 7c2aafd4ee123f9db1ea2733119e0711f53414cc.
| * | support 'expires' over Zot6zotlabs2019-05-283-1/+18
| | |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-05-2821-1462/+1760
| |\ \ | |/ / |/| |
* | | update changelogMario Vavti2019-05-281-0/+56
| | |
* | | mod cal band-aid fixesMario Vavti2019-05-263-16/+26
| | |
* | | adjust birthday handling according to community decision and slightly change ↵Mario Vavti2019-05-267-33/+30
| | | | | | | | | | | | display of allday event items
* | | fix #1374Mario Vavti2019-05-241-0/+4
| | |
* | | get channel from photo uidMario Vavti2019-05-241-1/+1
| | |
* | | add new directory fallback serverMario Vavti2019-05-231-1/+2
| | |
* | | Merge branch 'dev' into 'dev'Mario2019-05-221-0/+8
|\ \ \ | | | | | | | | | | | | | | | | translate make-friend activities to zot6 See merge request hubzilla/core!1654
* \ \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-05-223-1307/+1485
|\ \ \ \
| * \ \ \ Merge branch 'es-es' into 'dev'Mario2019-05-203-1307/+1485
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Update es-es See merge request hubzilla/core!1651
| | * \ \ \ Merge branch 'cherry-pick-350e636e' into 'es-es'Manuel Jiménez Friaza2019-05-193-1307/+1485
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Spanish translation See merge request mjfriaza/core!7
| | | * | | | Updated Spanish translationManuel Jiménez Friaza2019-05-193-1307/+1485
| | |/ / / / | | | | | | | | | | | | (cherry picked from commit 350e636e3d0a44323c69185555e89cc01a213aa2)
* | | | | | improve timezone detection for caldav and remove smart birthday feature. ↵Mario Vavti2019-05-225-18/+27
| | | | | | | | | | | | | | | | | | | | | | | | Force adjust birthdays until we agree on how to deal with this.
* | | | | | remove unused codeMario Vavti2019-05-211-4/+1
| | | | | |
* | | | | | fix all day events for caldav calendarsMario Vavti2019-05-212-23/+60
| | | | | |
* | | | | | move smart birthday feature to calendar settings and override the adjust ↵Mario Vavti2019-05-203-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | flag at display time instead of import
* | | | | | fix event notifications viewall urlMario Vavti2019-05-201-1/+1
| | | | | |
* | | | | | be more precise with table selectionMario Vavti2019-05-201-4/+4
| | | | | |