Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | | | | remove unused code | Mario Vavti | 2019-05-21 | 1 | -4/+1 |
| | | | | | |||||
* | | | | | fix all day events for caldav calendars | Mario Vavti | 2019-05-21 | 2 | -23/+60 |
| | | | | | |||||
* | | | | | move smart birthday feature to calendar settings and override the adjust ↵ | Mario Vavti | 2019-05-20 | 3 | -9/+12 |
| | | | | | | | | | | | | | | | | | | | | flag at display time instead of import | ||||
* | | | | | fix event notifications viewall url | Mario Vavti | 2019-05-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | be more precise with table selection | Mario Vavti | 2019-05-20 | 1 | -4/+4 |
| | | | | | |||||
* | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-05-20 | 1 | -2/+1 |
|\| | | | | |||||
| * | | | | Fix a really disturbing comment | Xanthor | 2019-05-17 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | (cherry picked from commit 823c0434ebcba7b7669203323f9cec4bbb9e0f4b) | ||||
* | | | | | calendar merge: initial commit for timezone support | Mario Vavti | 2019-05-20 | 5 | -82/+89 |
|/ / / / | |||||
* | | | | wiki: urlencode the entire share link | Mario Vavti | 2019-05-17 | 1 | -2/+2 |
| | | | | |||||
* | | | | use escape_tags() wiki headers | Mario Vavti | 2019-05-17 | 1 | -2/+2 |
| | | | | |||||
| | | * | another forum -> group wording change | zotlabs | 2019-05-21 | 1 | -3/+3 |
| | |/ | |||||
| | * | translate make-friend activities to zot6 | zotlabs | 2019-05-20 | 1 | -0/+8 |
| |/ |/| | |||||
* | | calendar merge: only export events that will not break the importer. this ↵ | Mario Vavti | 2019-05-15 | 1 | -2/+3 |
| | | | | | | | | will probably dismiss some old experimental entries | ||||
* | | missing backslash | Mario Vavti | 2019-05-15 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-05-14 | 1 | -6/+9 |
|\ \ | | | | | | | | | | | | | bbcode map bypass wasn't catching all map forms. See merge request hubzilla/core!1647 | ||||
| * | | bbcode map bypass wasn't catching all map forms. | zotlabs | 2019-05-13 | 1 | -6/+9 |
| | | | |||||
* | | | add autocomplete js to calendar and fix issue with extended likes mid | Mario Vavti | 2019-05-14 | 2 | -3/+7 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-13 | 1 | -3/+3 |
|\ \ \ | | | | | | | | | | | | | | | | | Fix comments scroll button CSS See merge request hubzilla/core!1649 | ||||
| * | | | Fix comments scroll button CSS | Max Kostikov | 2019-05-13 | 1 | -3/+3 |
|/ / / | |||||
* | | | css fixes | Mario Vavti | 2019-05-13 | 3 | -4/+4 |
| | | | |||||
* | | | deal with privacy mentions in event descriptions | Mario Vavti | 2019-05-13 | 1 | -11/+35 |
| | | | |||||
* | | | fix button size | Mario Vavti | 2019-05-13 | 1 | -1/+1 |
| | | | |||||
* | | | bump version | Mario Vavti | 2019-05-13 | 1 | -1/+1 |
| | | | |||||
* | | | bump version, update autoload cache and update strings | Mario Vavti | 2019-05-13 | 2 | -1258/+1402 |
| | | | |||||
* | | | calendar merge: cleanup | Mario Vavti | 2019-05-13 | 1 | -138/+9 |
| | | | |||||
* | | | upgrade jgrowl | Mario Vavti | 2019-05-13 | 20 | -6/+1222 |
| | | | |||||
* | | | port db_indexes() from zap | Mario Vavti | 2019-05-13 | 1 | -0/+25 |
| | | | |||||
* | | | don't do oembed processing on naked links and smarty lib cleanup. ported ↵ | Mario Vavti | 2019-05-13 | 3 | -42/+50 |
| | | | | | | | | | | | | from zap. | ||||
* | | | optimise oembed pdf processing so we do not actually load the content, which ↵ | Mario Vavti | 2019-05-13 | 1 | -15/+16 |
| | | | | | | | | | | | | could cause performance issues. ported from zap. | ||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-05-13 | 2 | -300/+286 |
|\| | | |||||
| * | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-12 | 2 | -300/+286 |
| |\ \ | | | | | | | | | | | | | | | | | Add new Russian translations See merge request hubzilla/core!1646 | ||||
| | * | | Update hstrings.php | Max Kostikov | 2019-05-12 | 1 | -11/+8 |
| | | | |