Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|\| | | |||||
| * | | 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 |
| | |\ \ | |||||
| * | | | | improve timezone detection for caldav and remove smart birthday feature. Forc... | Mario Vavti | 2019-05-22 | 5 | -18/+27 |
| * | | | | 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 flag... | Mario Vavti | 2019-05-20 | 3 | -9/+12 |
| * | | | | 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 |
| * | | | | 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 |
| | |/ | |/| | |||||
| * | | calendar merge: only export events that will not break the importer. this wil... | Mario Vavti | 2019-05-15 | 1 | -2/+3 |
| * | | 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. | 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 | 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 |
* | | | | Merge branch 'es-es' into '4.2RC' | Mario | 2019-05-20 | 3 | -1307/+1485 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'cherry-pick-350e636e' into 'es-es' | Manuel Jiménez Friaza | 2019-05-19 | 3 | -1307/+1485 |
| |\ \ \ | |||||
| | * | | | Updated Spanish translation | Manuel Jiménez Friaza | 2019-05-19 | 3 | -1307/+1485 |
| |/ / / | |||||
* | | | | Fix a really disturbing comment | Xanthor | 2019-05-17 | 1 | -2/+1 |
* | | | | 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 |
* | | | | calendar merge: only export events that will not break the importer. this wil... | Mario Vavti | 2019-05-15 | 1 | -2/+3 |
* | | | | missing backslash | Mario Vavti | 2019-05-15 | 1 | -1/+1 |
* | | | | add autocomplete js to calendar and fix issue with extended likes mid | Mario Vavti | 2019-05-14 | 2 | -3/+7 |
* | | | | Fix comments scroll button CSS | Max Kostikov | 2019-05-14 | 1 | -3/+3 |
* | | | | css fixes | Mario Vavti | 2019-05-14 | 3 | -4/+4 |
* | | | | deal with privacy mentions in event descriptions | Mario Vavti | 2019-05-14 | 1 | -11/+35 |
* | | | | bbcode map bypass wasn't catching all map forms. | zotlabs | 2019-05-14 | 1 | -6/+9 |
* | | | | fix button size | 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 from... | Mario Vavti | 2019-05-13 | 3 | -42/+50 |
* | | | optimise oembed pdf processing so we do not actually load the content, which ... | Mario Vavti | 2019-05-13 | 1 | -15/+16 |
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-05-13 | 2 | -300/+286 |
|\ \ \ | | |/ | |/| |