aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * Remove hint for pin buttonMax Kostikov2019-12-041-1/+1
| |
| * Add unpin button for pinned itemMax Kostikov2019-12-041-1/+1
| |
| * Add unpin button for pinned itemMax Kostikov2019-12-041-0/+1
| |
| * Fix show share menu option for pinned post Max Kostikov2019-12-031-1/+1
| |
| * Fix hide pinned post button for unauthenticated viewerMax Kostikov2019-12-031-1/+1
| |
| * Add layout for hiding pinned content and its processingMax Kostikov2019-12-031-2/+17
| |
| * Add hiding pinned contentMax Kostikov2019-12-031-11/+17
| |
| * Add hiding pinned contentMax Kostikov2019-12-031-17/+35
| |
| * Minor pinned content processing fixesMax Kostikov2019-12-031-3/+2
| |
| * Normalize SQL queryMax Kostikov2019-12-031-1/+1
| |
| * Optimize pinned item verbs based activity processingMax Kostikov2019-12-031-16/+7
| |
| * Remove debug loggingMax Kostikov2019-12-031-1/+0
| |
| * Show poll results in pinned itemsMax Kostikov2019-12-031-54/+140
| |
| * Add poll results in pinned item layoutMax Kostikov2019-12-031-7/+42
| |
| * Unpin item on dropMax Kostikov2019-12-021-19/+20
| |
| * Fix unique HTML elements idMax Kostikov2019-12-021-19/+19
| |
| * Add scroll to pinned item before removalMax Kostikov2019-12-011-1/+6
| |
| * Add pinned content on channel pageMax Kostikov2019-12-011-0/+7
| |
| * Add Russian strings for pinned contentMax Kostikov2019-12-011-307/+329
| |