aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Mario2020-01-158-33/+344
|\ | | | | | | | | event compatibility work See merge request hubzilla/core!1817
| * event compatibility workzotlabs2020-01-146-17/+300
| |
| * rework activitystreams events - send invite/event activities instead of ↵zotlabs2020-01-124-16/+44
| | | | | | | | create/event. Also a first pass at creating a Zap export file from Hubzilla. Much more work is needed before this is functional.
* | Merge branch 'dev' into 'dev'Mario2020-01-141-6/+6
|\ \ | | | | | | | | | | | | Fix wrong URL detection with Markdown support enabled See merge request hubzilla/core!1816
| * | Fix wrong URL detection with Markdown support enabledMax Kostikov2020-01-121-6/+6
| | |
* | | composer update symfony/polyfill-ctypeMario2020-01-124-23/+23
| | |
* | | composer update sabre/davMario2020-01-1247-230/+365
| | |
* | | update cropperjs to the recent versionMario2020-01-11210-18185/+23891
| | |
* | | fix markdown testMario2020-01-091-2/+2
| | |
* | | composer updatesMario2020-01-0932-410/+217
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2020-01-091-3/+11
|\ \ \
| * | | Merge branch 'dev' into 'dev'Mario2020-01-091-3/+11
| |\| | | | | | | | | | | | | | | | | | Add age choice on cached item retrieve See merge request hubzilla/core!1813
| | * | Update Cache.phpMax Kostikov2020-01-061-2/+1
| | | |
| | * | Add age choice on cached item retrieveMax Kostikov2020-01-051-2/+11
| | | |
* | | | deal with situations where we do not have an xchan_addr but only an xchan_urlMario2020-01-091-3/+3
|/ / /
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-12-281-1/+1
|\ \ \ | | | | | | | | | | | | | | | | Fixed es-es/hmessages.po See merge request hubzilla/core!1812
| * | | Fixed es-es/hmessages.pomjfriaza2019-12-281-1/+1
| | | |
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-12-282-3/+3
|\| | | | | | | | | | | | | | | | | | | Update Spanish See merge request hubzilla/core!1811
| * | | Update Spanishmjfriaza2019-12-282-3/+3
|/ / /
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2019-12-282-193/+217
|\ \ \
| * | | Merge branch 'dev' into 'dev'Max Kostikov2019-12-272-193/+217
| |\| | | | | | | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1810
| | * | Update hstrings.phpMax Kostikov2019-12-271-10/+13
| | | |
| | * | Update hmessages.poMax Kostikov2019-12-271-183/+204
| | | |
* | | | pubstream: use search mode for tag filter view and add a titleMario2019-12-281-2/+7
|/ / /
* | | re-add german translations for x minutes etc. which were removed in rkor's ↵Mario2019-12-211-0/+5
| | | | | | | | | | | | merge request
* | | german translation fixesMario2019-12-212-10/+4
| | |
* | | Merge branch 'dev' into 'dev'Mario2019-12-219-662/+1504
|\ \ \ | | | | | | | | | | | | | | | | Some translations to German (#1418) See merge request hubzilla/core!1809
| * | | German translations related to settings and apps, German context helpRobert Kormann2019-12-188-8/+137
| | | |
| * | | Merge branch 'dev' into RKor.InfoRobert Kormann2019-12-152-1/+1
| |\ \ \
| * | | | German translations of settings and apps elementsRobert Kormann2019-12-142-694/+1407
| | | | |
* | | | | sse: fix new posts only filter broken after aditional results loadedMario2019-12-201-1/+1
| | | | |
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2019-12-171-2/+2
|\ \ \ \ \
| * \ \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-12-161-2/+2
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | Fix possibly unknown author See merge request hubzilla/core!1808
| | * | | Fix possibly unknown authorMax Kostikov2019-12-161-2/+2
| | | | |
* | | | | sse: remove redundant codeMario2019-12-161-17/+2
| | | | |
* | | | | remove redundant cssMario2019-12-151-4/+0
| | | | |
* | | | | update composer libs and minor notifications display fixesMario2019-12-12550-5844/+15113
|/ / / /
* | / / when ajax loading new posts, always scroll to top firstMario2019-12-122-1/+1
| |/ / |/| |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-12-101-1/+1
|\ \ \ | | |/ | |/| | | | | | | missing translation "%d unseen" See merge request hubzilla/core!1806
| * | missing translation "%d unseen"zotlabs2019-12-091-1/+1
| | |
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-12-094-39/+113
|\ \ \ | | | | | | | | | | | | | | | | directory: port censoring from zap and disable oembed in profile about See merge request hubzilla/core!1805
| * | | directory: port censoring from zap and disable oembed in profile aboutMario2019-12-094-39/+113
|/ / /
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-12-081-1/+1
|\ \ \ | | |/ | |/| | | | | | | Don't show pinned post on single post displaying See merge request hubzilla/core!1804
| * | Don't show pinned post on single post displayingMax Kostikov2019-12-081-1/+1
|/ /
* | Merge branch 'dev' into 'dev'Mario2019-12-079-23/+67
|\ \ | | | | | | | | | | | | Add .webp image format support See merge request hubzilla/core!1802
| * | Add .webp image format supportMax Kostikov2019-12-079-23/+67
|/ /
* | sse: encode string instead of replacing quotes in the template, use ↵Mario2019-12-071-8/+5
| | | | | | | | decodeURIComponent() instead of unescape() which is marked deprecated.
* | sse: initial commit to deal with forum notificationsMario2019-12-073-11/+43
|/
* Merge branch 'dev' into 'dev'Max Kostikov2019-12-051-1/+1
|\ | | | | | | | | Unpin pinned item on site admin deletion See merge request hubzilla/core!1801
| * Unpin pinned item on site admin deletionMax Kostikov2019-12-051-1/+1
| |