Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | some work on zot6 DMs | Mario | 2020-01-15 | 10 | -4/+35 |
| | |||||
* | fix typo | Mario | 2020-01-15 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' into 'dev' | Mario | 2020-01-15 | 8 | -33/+344 |
|\ | | | | | | | | | event compatibility work See merge request hubzilla/core!1817 | ||||
| * | event compatibility work | zotlabs | 2020-01-14 | 6 | -17/+300 |
| | | |||||
| * | rework activitystreams events - send invite/event activities instead of ↵ | zotlabs | 2020-01-12 | 4 | -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' | Mario | 2020-01-14 | 1 | -6/+6 |
|\ \ | | | | | | | | | | | | | Fix wrong URL detection with Markdown support enabled See merge request hubzilla/core!1816 | ||||
| * | | Fix wrong URL detection with Markdown support enabled | Max Kostikov | 2020-01-12 | 1 | -6/+6 |
| | | | |||||
* | | | composer update symfony/polyfill-ctype | Mario | 2020-01-12 | 4 | -23/+23 |
| | | | |||||
* | | | composer update sabre/dav | Mario | 2020-01-12 | 47 | -230/+365 |
| | | | |||||
* | | | update cropperjs to the recent version | Mario | 2020-01-11 | 210 | -18185/+23891 |
| | | | |||||
* | | | fix markdown test | Mario | 2020-01-09 | 1 | -2/+2 |
| | | | |||||
* | | | composer updates | Mario | 2020-01-09 | 32 | -410/+217 |
| | | | |||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2020-01-09 | 1 | -3/+11 |
|\ \ \ | |||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2020-01-09 | 1 | -3/+11 |
| |\| | | | | | | | | | | | | | | | | | | Add age choice on cached item retrieve See merge request hubzilla/core!1813 | ||||
| | * | | Update Cache.php | Max Kostikov | 2020-01-06 | 1 | -2/+1 |
| | | | | |||||
| | * | | Add age choice on cached item retrieve | Max Kostikov | 2020-01-05 | 1 | -2/+11 |
| | | | | |||||
* | | | | deal with situations where we do not have an xchan_addr but only an xchan_url | Mario | 2020-01-09 | 1 | -3/+3 |
|/ / / | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-28 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | | | | | | | | | Fixed es-es/hmessages.po See merge request hubzilla/core!1812 | ||||
| * | | | Fixed es-es/hmessages.po | mjfriaza | 2019-12-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-28 | 2 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | Update Spanish See merge request hubzilla/core!1811 | ||||
| * | | | Update Spanish | mjfriaza | 2019-12-28 | 2 | -3/+3 |
|/ / / | |||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2019-12-28 | 2 | -193/+217 |
|\ \ \ | |||||
| * | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-27 | 2 | -193/+217 |
| |\| | | | | | | | | | | | | | | | | | | Update Russian translation See merge request hubzilla/core!1810 | ||||
| | * | | Update hstrings.php | Max Kostikov | 2019-12-27 | 1 | -10/+13 |
| | | | | |||||
| | * | | Update hmessages.po | Max Kostikov | 2019-12-27 | 1 | -183/+204 |
| | | | | |||||
* | | | | pubstream: use search mode for tag filter view and add a title | Mario | 2019-12-28 | 1 | -2/+7 |
|/ / / | |||||
* | | | re-add german translations for x minutes etc. which were removed in rkor's ↵ | Mario | 2019-12-21 | 1 | -0/+5 |
| | | | | | | | | | | | | merge request | ||||
* | | | german translation fixes | Mario | 2019-12-21 | 2 | -10/+4 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-12-21 | 9 | -662/+1504 |
|\ \ \ | | | | | | | | | | | | | | | | | Some translations to German (#1418) See merge request hubzilla/core!1809 | ||||
| * | | | German translations related to settings and apps, German context help | Robert Kormann | 2019-12-18 | 8 | -8/+137 |
| | | | | |||||
| * | | | Merge branch 'dev' into RKor.Info | Robert Kormann | 2019-12-15 | 2 | -1/+1 |
| |\ \ \ | |||||
| * | | | | German translations of settings and apps elements | Robert Kormann | 2019-12-14 | 2 | -694/+1407 |
| | | | | | |||||
* | | | | | sse: fix new posts only filter broken after aditional results loaded | Mario | 2019-12-20 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2019-12-17 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-16 | 1 | -2/+2 |
| |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | Fix possibly unknown author See merge request hubzilla/core!1808 | ||||
| | * | | | Fix possibly unknown author | Max Kostikov | 2019-12-16 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | sse: remove redundant code | Mario | 2019-12-16 | 1 | -17/+2 |
| | | | | | |||||
* | | | | | remove redundant css | Mario | 2019-12-15 | 1 | -4/+0 |
| | | | | | |||||
* | | | | | update composer libs and minor notifications display fixes | Mario | 2019-12-12 | 550 | -5844/+15113 |
|/ / / / | |||||
* | / / | when ajax loading new posts, always scroll to top first | Mario | 2019-12-12 | 2 | -1/+1 |
| |/ / |/| | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-10 | 1 | -1/+1 |
|\ \ \ | | |/ | |/| | | | | | | | missing translation "%d unseen" See merge request hubzilla/core!1806 | ||||
| * | | missing translation "%d unseen" | zotlabs | 2019-12-09 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-09 | 4 | -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 about | Mario | 2019-12-09 | 4 | -39/+113 |
|/ / / | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-08 | 1 | -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 displaying | Max Kostikov | 2019-12-08 | 1 | -1/+1 |
|/ / | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-12-07 | 9 | -23/+67 |
|\ \ | | | | | | | | | | | | | Add .webp image format support See merge request hubzilla/core!1802 | ||||
| * | | Add .webp image format support | Max Kostikov | 2019-12-07 | 9 | -23/+67 |
|/ / | |||||
* | | sse: encode string instead of replacing quotes in the template, use ↵ | Mario | 2019-12-07 | 1 | -8/+5 |
| | | | | | | | | decodeURIComponent() instead of unescape() which is marked deprecated. | ||||
* | | sse: initial commit to deal with forum notifications | Mario | 2019-12-07 | 3 | -11/+43 |
|/ |