Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | Remove hint for pin button | Max Kostikov | 2019-12-04 | 1 | -1/+1 |
| | | |||||
| * | Add unpin button for pinned item | Max Kostikov | 2019-12-04 | 1 | -1/+1 |
| | | |||||
| * | Add unpin button for pinned item | Max Kostikov | 2019-12-04 | 1 | -0/+1 |
| | | |||||
| * | Fix show share menu option for pinned post | Max Kostikov | 2019-12-03 | 1 | -1/+1 |
| | | |||||
| * | Fix hide pinned post button for unauthenticated viewer | Max Kostikov | 2019-12-03 | 1 | -1/+1 |
| | | |||||
| * | Add layout for hiding pinned content and its processing | Max Kostikov | 2019-12-03 | 1 | -2/+17 |
| | | |||||
| * | Add hiding pinned content | Max Kostikov | 2019-12-03 | 1 | -11/+17 |
| | | |||||
| * | Add hiding pinned content | Max Kostikov | 2019-12-03 | 1 | -17/+35 |
| | | |||||
| * | Minor pinned content processing fixes | Max Kostikov | 2019-12-03 | 1 | -3/+2 |
| | | |||||
| * | Normalize SQL query | Max Kostikov | 2019-12-03 | 1 | -1/+1 |
| | | |||||
| * | Optimize pinned item verbs based activity processing | Max Kostikov | 2019-12-03 | 1 | -16/+7 |
| | | |||||
| * | Remove debug logging | Max Kostikov | 2019-12-03 | 1 | -1/+0 |
| | | |||||
| * | Show poll results in pinned items | Max Kostikov | 2019-12-03 | 1 | -54/+140 |
| | | |||||
| * | Add poll results in pinned item layout | Max Kostikov | 2019-12-03 | 1 | -7/+42 |
| | | |||||
| * | Unpin item on drop | Max Kostikov | 2019-12-02 | 1 | -19/+20 |
| | | |||||
| * | Fix unique HTML elements id | Max Kostikov | 2019-12-02 | 1 | -19/+19 |
| | | |||||
| * | Add scroll to pinned item before removal | Max Kostikov | 2019-12-01 | 1 | -1/+6 |
| | | |||||
| * | Add pinned content on channel page | Max Kostikov | 2019-12-01 | 1 | -0/+7 |
| | | |||||
| * | Add Russian strings for pinned content | Max Kostikov | 2019-12-01 | 1 | -307/+329 |
| | |