aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| | * 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
| | |
| * | do not change default timezone in parse_ical_file()Mario Vavti2019-06-031-9/+0
| | | | | | | | | (cherry picked from commit f1b54cf0a49afcaa7b5a8d5f8fb35a4da72b6b85)
| * | fix timezone issue when importing adjusted eventsMario Vavti2019-06-031-7/+13
| | | | | | | | | (cherry picked from commit 2b452ea3e8dca9324ebea6031b3060e6c27d5526)
| * | regard timezones in calendar import/exportMario2019-06-032-5/+26
| | |
| * | update changelogMario Vavti2019-06-031-1/+3
| | | | | | | | | (cherry picked from commit 6d2ab6a7d68ac8bb474344eeb1a3baa4cb7c3b99)
| * | Merge branch 'dev' into 4.2RCMario Vavti2019-06-033-5/+4
| |\|
| | * 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 4.2RCMario Vavti2019-05-294-21/+38
| |\| |
| | * | 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
| | | | |
| | | * | another forum -> group wording changezotlabs2019-05-211-3/+3
| | | | |
| * | | | update changelogMario Vavti2019-05-281-0/+56
| | | | | | | | | | | | | | | (cherry picked from commit ca8d252ad75306e6d3cd066d5c593e94de1dfbdd)
| * | | | 4.2RC2Mario Vavti2019-05-271-1/+1
| | | | |
| * | | | Merge branch '4.2RC' of https://framagit.org/hubzilla/core into 4.2RCMario Vavti2019-05-270-0/+0
| |\ \ \ \
| | * | | | fix #1374Mario Vavti2019-05-241-0/+4
| | | | | | | | | | | | | | | | | | (cherry picked from commit 528b9b6a60d847b0ecb639cb7fb8e01ee79b11d4)
| | * | | | get channel from photo uidMario Vavti2019-05-241-1/+1
| | | | | | | | | | | | | | | | | | (cherry picked from commit 9ea483d1dc01fa9439e6f261d04f1b97fb1302a3)
| * | | | | Merge branch 'dev' into 4.2RCMario Vavti2019-05-2711-50/+61
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | 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 4.2RCMario Vavti2019-05-231-0/+8
| |\| | |
| | * | | Merge branch 'dev' into 'dev'Mario2019-05-221-0/+8
| | |\| | | | | | | | | | | | | | | | | | | | | | translate make-friend activities to zot6 See merge request hubzilla/core!1654
| | | * | translate make-friend activities to zot6zotlabs2019-05-201-0/+8
| | | | |
| * | | | add new directory fallback serverMario Vavti2019-05-231-2/+3
| | | | |
| * | | | Merge branch 'dev' into 4.2RCMario Vavti2019-05-238-119/+172
| |\| | |
| | * | | 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
| | * | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 00:10:51 +0000