Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | 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 |
|/ | |||||
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-05 | 1 | -1/+1 |
|\ | | | | | | | | | Unpin pinned item on site admin deletion See merge request hubzilla/core!1801 | ||||
| * | Unpin pinned item on site admin deletion | Max Kostikov | 2019-12-05 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-04 | 1 | -0/+1 |
|\| | | | | | | | | | Add missed break See merge request hubzilla/core!1800 | ||||
| * | Add missed break | Max Kostikov | 2019-12-04 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-04 | 2 | -2/+4 |
|\| | | | | | | | | | Show unpin button in pinned post for owner only See merge request hubzilla/core!1799 | ||||
| * | Show unpin button for pinned post for owner only | Max Kostikov | 2019-12-04 | 1 | -1/+1 |
| | | |||||
| * | Show unpin button for pinned post for owner only | Max Kostikov | 2019-12-04 | 1 | -1/+3 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-04 | 1 | -1/+1 |
|\| | | | | | | | | | Remove pinned item on every change See merge request hubzilla/core!1798 | ||||
| * | Remove pinned item on every change | Max Kostikov | 2019-12-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-04 | 1 | -4/+6 |
|\| | | | | | | | | | More pinned items frontend processing fixes See merge request hubzilla/core!1797 | ||||
| * | More pinned items frontend processing fixes | Max Kostikov | 2019-12-04 | 1 | -4/+6 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-04 | 2 | -9/+9 |
|\| | | | | | | | | | Fix switching pinned items See merge request hubzilla/core!1796 | ||||
| * | Update pinned item markup | Max Kostikov | 2019-12-04 | 1 | -2/+2 |
| | | |||||
| * | Fix update pin / unpin button text on pinned item replace | Max Kostikov | 2019-12-04 | 1 | -6/+6 |
| | | |||||
| * | Fix variables for unpin button | Max Kostikov | 2019-12-04 | 1 | -1/+1 |
| | | |||||
| * | Remove square | Max Kostikov | 2019-12-04 | 1 | -1/+1 |
| | | |||||
* | | update changelog | Mario | 2019-12-04 | 1 | -2/+2 |
| | | |||||
* | | Remove square | Max Kostikov | 2019-12-04 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-04 | 4 | -3/+5 |
|\| | | | | | | | | | Ad unpin button for pinned content and fix unpin on unpinned item drop See merge request hubzilla/core!1795 | ||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-12-04 | 0 | -0/+0 |
| |\ | |/ |/| | | | | | | | | | # Conflicts: # Zotlabs/Widget/Pinned.php # view/js/main.js # view/tpl/conv_item.tpl # view/tpl/pinned_item.tpl | ||||
* | | Merge branch 'dev' into 'dev' | M. Dent | 2019-12-04 | 12 | -344/+968 |
|\ \ | | | | | | | | | | | | | Add content pinning support See merge request hubzilla/core!1794 | ||||
| * | | Add content pinning support | Max Kostikov | 2019-12-04 | 12 | -344/+968 |
|/ / | |||||
| * | Unpin only pinned items on item drop | Max Kostikov | 2019-12-04 | 1 | -1/+2 |
| | |