aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* resolve merge conflictMario2019-06-101-2/+2
* fix storageconv issue with postgresMario2019-06-101-2/+5
* Revert "PgSQL compatibility on conversion"Mario2019-06-101-2/+2
* PgSQL compatibility on conversionMax Kostikov2019-06-101-2/+2
* fix css issueMario Vavti2019-06-071-1/+1
* fix embedphotos image sizeMario Vavti2019-06-071-1/+1
* 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
| | * update changelogMario Vavti2019-06-031-1/+3
| * | 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
| * | update changelogMario Vavti2019-06-031-1/+3
| * | 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 articleszotlabs2019-05-311-2/+1
| | * | Merge branch 'dev' into 'dev'Max Kostikov2019-05-301-2/+2
| | |\|
| | | * 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 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
| | |\ \
| | | * | anomolies in calls to datetime_convert in include/importzotlabs2019-05-281-6/+6
| | | * | convert AS "instrument" objects to the more appropriate "generator" - this pr...zotlabs2019-05-281-14/+14
| | | * | Revert "another forum -> group wording change" (wrong tree)zotlabs2019-05-281-3/+3
| | | * | 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
| * | | | 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
| | * | | | get channel from photo uidMario Vavti2019-05-241-1/+1
| * | | | | 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
| | * | | 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 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
| |\| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-08 19:51:48 +0000