aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | | | | | | move smart birthday feature to calendar settings and override the adjust ↵Mario Vavti2019-05-203-9/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | flag at display time instead of import
| | * | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 823c0434ebcba7b7669203323f9cec4bbb9e0f4b)
| | * | | | | | | | | | | 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 ↵Mario Vavti2019-05-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will probably dismiss some old experimental entries
| | * | | | | | | | | 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. See merge request hubzilla/core!1647
| | | * | | | | | | | | 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 CSS See merge request hubzilla/core!1649
| | | * | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update es-es See merge request hubzilla/core!1652
| | * | | | | | | | | Merge branch 'cherry-pick-350e636e' into 'es-es'Manuel Jiménez Friaza2019-05-193-1307/+1485
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated Spanish translation See merge request mjfriaza/core!7
| | | * | | | | | | | | Updated Spanish translationManuel Jiménez Friaza2019-05-193-1307/+1485
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 350e636e3d0a44323c69185555e89cc01a213aa2)
| * | | | | | | | | | Fix a really disturbing comment Xanthor2019-05-171-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 823c0434ebcba7b7669203323f9cec4bbb9e0f4b) (cherry picked from commit af2b263bc74b16601ec7c123a58f0549613aed27)
| * | | | | | | | | | wiki: urlencode the entire share linkMario Vavti2019-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit aa120e0478b8a7e0eabcbd7b8d7eefd515ff5347)
| * | | | | | | | | | use escape_tags() wiki headersMario Vavti2019-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit e7f1f496c5977ae290ea1457ea5c117dd29676f6)
| * | | | | | | | | | calendar merge: only export events that will not break the importer. this ↵Mario Vavti2019-05-151-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will probably dismiss some old experimental entries (cherry picked from commit 8be00316025efc424a7b38ab5a2542dd5d1e9fd0)
| * | | | | | | | | | missing backslashMario Vavti2019-05-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 3c8867a1e861f75cb7a11e2ea6a15b2d2e457b7b)
| * | | | | | | | | | add autocomplete js to calendar and fix issue with extended likes midMario Vavti2019-05-142-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 15a000bb4554b0dee168eb595c9390a555c59f74)
| * | | | | | | | | | Fix comments scroll button CSSMax Kostikov2019-05-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d0322f5fbdf7a1ec3ac3ee894a8eabc4b252cf57)
| * | | | | | | | | | css fixesMario Vavti2019-05-143-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit c1f01b7e3515ed823019f133cd73c1752b372f4c)
| * | | | | | | | | | deal with privacy mentions in event descriptionsMario Vavti2019-05-141-11/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 71064f481b94da11ca8a819c1cec88f8df4b671c)
| * | | | | | | | | | bbcode map bypass wasn't catching all map forms.zotlabs2019-05-141-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit 436293713bab05f11981c963139e51cba25967f1)
| * | | | | | | | | | 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 ↵Mario Vavti2019-05-133-42/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from zap.
| * | | | | | | | | optimise oembed pdf processing so we do not actually load the content, which ↵Mario Vavti2019-05-131-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | could cause performance issues. ported from zap.
| * | | | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2019-05-132-300/+286
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-122-300/+286
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new Russian translations See merge request hubzilla/core!1646
| | | * | | | | | | | Update hstrings.phpMax Kostikov2019-05-121-11/+8
| | | | | | | | | | |
| | | * | | | | | | | Update hmessages.poMax Kostikov2019-05-121-289/+278
| | | | | | | | | | |
| * | | | | | | | | | form security token for mod register ported from zapMario Vavti2019-05-132-4/+9
| |/ / / / / / / / /
| * | | | | | | | | add btlogger to unxmlify()Mario Vavti2019-05-111-0/+9
| | | | | | | | | |
| * | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-111-1/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace photo URL for gallery on clonned channel post sync See merge request hubzilla/core!1645
| | * | | | | | | | Replace photo URL for gallery on clonned channel post syncMax Kostikov2019-05-111-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-05-112-15/+17
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendered... See merge request hubzilla/core!1644
| | * | | | | | | | | use 'cache' flag to bbcode() on content destined for Zot6. We've seen ↵zotlabs2019-05-092-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rendered map HTML in a couple of places and these should never be rendered for outgoing content as they will only be purified on the other end.
| * | | | | | | | | | bump versionMario Vavti2019-05-101-1/+1
| | | | | | | | | | |