aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|\| |
| * | 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
| | |\ \
| * | | | improve timezone detection for caldav and remove smart birthday feature. Forc...Mario Vavti2019-05-225-18/+27
| * | | | 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 flag...Mario Vavti2019-05-203-9/+12
| * | | | fix event notifications viewall urlMario Vavti2019-05-201-1/+1
| * | | | be more precise with table selectionMario Vavti2019-05-201-4/+4
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-05-201-2/+1
| |\| | |
| | * | | Fix a really disturbing comment Xanthor2019-05-171-2/+1
| * | | | calendar merge: initial commit for timezone supportMario Vavti2019-05-205-82/+89
| |/ / /
| * | | wiki: urlencode the entire share linkMario Vavti2019-05-171-2/+2
| * | | use escape_tags() wiki headersMario Vavti2019-05-171-2/+2
| | |/ | |/|
| * | calendar merge: only export events that will not break the importer. this wil...Mario Vavti2019-05-151-2/+3
| * | missing backslashMario Vavti2019-05-151-1/+1
| * | Merge branch 'dev' into 'dev'Mario2019-05-141-6/+9
| |\ \
| | * | bbcode map bypass wasn't catching all map forms.zotlabs2019-05-131-6/+9
| * | | add autocomplete js to calendar and fix issue with extended likes midMario Vavti2019-05-142-3/+7
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-131-3/+3
| |\ \ \
| | * | | Fix comments scroll button CSSMax Kostikov2019-05-131-3/+3
| |/ / /
| * | | css fixesMario Vavti2019-05-133-4/+4
| * | | deal with privacy mentions in event descriptionsMario Vavti2019-05-131-11/+35
| * | | fix button sizeMario Vavti2019-05-131-1/+1
| * | | bump versionMario Vavti2019-05-131-1/+1
* | | | Merge branch 'es-es' into '4.2RC'Mario2019-05-203-1307/+1485
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'cherry-pick-350e636e' into 'es-es'Manuel Jiménez Friaza2019-05-193-1307/+1485
| |\ \ \
| | * | | Updated Spanish translationManuel Jiménez Friaza2019-05-193-1307/+1485
| |/ / /
* | | | Fix a really disturbing comment Xanthor2019-05-171-2/+1
* | | | wiki: urlencode the entire share linkMario Vavti2019-05-171-2/+2
* | | | use escape_tags() wiki headersMario Vavti2019-05-171-2/+2
* | | | calendar merge: only export events that will not break the importer. this wil...Mario Vavti2019-05-151-2/+3
* | | | missing backslashMario Vavti2019-05-151-1/+1
* | | | add autocomplete js to calendar and fix issue with extended likes midMario Vavti2019-05-142-3/+7
* | | | Fix comments scroll button CSSMax Kostikov2019-05-141-3/+3
* | | | css fixesMario Vavti2019-05-143-4/+4
* | | | deal with privacy mentions in event descriptionsMario Vavti2019-05-141-11/+35
* | | | bbcode map bypass wasn't catching all map forms.zotlabs2019-05-141-6/+9
* | | | fix button sizeMario Vavti2019-05-131-1/+1
| |/ / |/| |
* | | bump version, update autoload cache and update stringsMario Vavti2019-05-132-1258/+1402
* | | calendar merge: cleanupMario Vavti2019-05-131-138/+9
* | | upgrade jgrowlMario Vavti2019-05-1320-6/+1222
* | | port db_indexes() from zapMario Vavti2019-05-131-0/+25
* | | don't do oembed processing on naked links and smarty lib cleanup. ported from...Mario Vavti2019-05-133-42/+50
* | | optimise oembed pdf processing so we do not actually load the content, which ...Mario Vavti2019-05-131-15/+16
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-05-132-300/+286
|\ \ \ | | |/ | |/|