aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
* | 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
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-12-041-0/+1
|\| | | | | | | | | Add missed break See merge request hubzilla/core!1800
| * Add missed breakMax Kostikov2019-12-041-0/+1
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-12-042-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 Kostikov2019-12-041-1/+1
| |
| * Show unpin button for pinned post for owner onlyMax Kostikov2019-12-041-1/+3
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-12-041-1/+1
|\| | | | | | | | | Remove pinned item on every change See merge request hubzilla/core!1798
| * Remove pinned item on every changeMax Kostikov2019-12-041-1/+1
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-12-041-4/+6
|\| | | | | | | | | More pinned items frontend processing fixes See merge request hubzilla/core!1797
| * More pinned items frontend processing fixesMax Kostikov2019-12-041-4/+6
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-12-042-9/+9
|\| | | | | | | | | Fix switching pinned items See merge request hubzilla/core!1796
| * Update pinned item markupMax Kostikov2019-12-041-2/+2
| |
| * Fix update pin / unpin button text on pinned item replaceMax Kostikov2019-12-041-6/+6
| |
| * Fix variables for unpin buttonMax Kostikov2019-12-041-1/+1
| |
| * Remove squareMax Kostikov2019-12-041-1/+1
| |
* | update changelogMario2019-12-041-2/+2
| |
* | Remove squareMax Kostikov2019-12-041-1/+1
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-12-044-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 Kostikov2019-12-040-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. Dent2019-12-0412-344/+968
|\ \ | | | | | | | | | | | | Add content pinning support See merge request hubzilla/core!1794
| * | Add content pinning supportMax Kostikov2019-12-0412-344/+968
|/ /
| * Unpin only pinned items on item dropMax Kostikov2019-12-041-1/+2
| |