Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolve merge conflict | Mario | 2019-06-10 | 1 | -2/+2 |
* | fix storageconv issue with postgres | Mario | 2019-06-10 | 1 | -2/+5 |
* | Revert "PgSQL compatibility on conversion" | Mario | 2019-06-10 | 1 | -2/+2 |
* | PgSQL compatibility on conversion | Max Kostikov | 2019-06-10 | 1 | -2/+2 |
* | fix css issue | Mario Vavti | 2019-06-07 | 1 | -1/+1 |
* | fix embedphotos image size | Mario Vavti | 2019-06-07 | 1 | -1/+1 |
* | 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 |
| | * | 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 |
| | * | update changelog | Mario Vavti | 2019-06-03 | 1 | -1/+3 |
| * | | 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 |
| * | | update changelog | Mario Vavti | 2019-06-03 | 1 | -1/+3 |
| * | | Merge branch 'dev' into 4.2RC | Mario Vavti | 2019-06-03 | 3 | -5/+4 |
| |\| | |||||
| | * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-31 | 1 | -2/+1 |
| | |\ | |||||
| | | * | 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 | 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 | Max Kostikov | 2019-05-30 | 1 | -1/+1 |
| * | | | Merge branch 'dev' into 4.2RC | Mario Vavti | 2019-05-29 | 4 | -21/+38 |
| |\| | | |||||
| | * | | Merge branch 'dev' into 'dev' | Mario | 2019-05-29 | 4 | -21/+38 |
| | |\ \ | |||||
| | | * | | 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 pr... | zotlabs | 2019-05-28 | 1 | -14/+14 |
| | | * | | Revert "another forum -> group wording change" (wrong tree) | zotlabs | 2019-05-28 | 1 | -3/+3 |
| | | * | | 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 |
| | | * | | another forum -> group wording change | zotlabs | 2019-05-21 | 1 | -3/+3 |
| * | | | | update changelog | Mario Vavti | 2019-05-28 | 1 | -0/+56 |
| * | | | | 4.2RC2 | Mario Vavti | 2019-05-27 | 1 | -1/+1 |
| * | | | | Merge branch '4.2RC' of https://framagit.org/hubzilla/core into 4.2RC | Mario Vavti | 2019-05-27 | 0 | -0/+0 |
| |\ \ \ \ | |||||
| | * | | | | fix #1374 | Mario Vavti | 2019-05-24 | 1 | -0/+4 |
| | * | | | | get channel from photo uid | Mario Vavti | 2019-05-24 | 1 | -1/+1 |
| * | | | | | Merge branch 'dev' into 4.2RC | Mario Vavti | 2019-05-27 | 11 | -50/+61 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | 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 |
| | * | | | 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 4.2RC | Mario Vavti | 2019-05-23 | 1 | -0/+8 |
| |\| | | | |||||
| | * | | | Merge branch 'dev' into 'dev' | Mario | 2019-05-22 | 1 | -0/+8 |
| | |\| | | |||||
| | | * | | translate make-friend activities to zot6 | zotlabs | 2019-05-20 | 1 | -0/+8 |
| * | | | | add new directory fallback server | Mario Vavti | 2019-05-23 | 1 | -2/+3 |
| * | | | | Merge branch 'dev' into 4.2RC | Mario Vavti | 2019-05-23 | 8 | -119/+172 |
| |\| | | |