Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-11-18 | 1679 | -457016/+132245 | |
| | |\ | | |/ | |/| | | | | | | | Dev sync See merge request kostikov/core!5 | |||||
| | * | Remove base64 decode check on Opengraph tags create | Max Kostikov | 2019-11-18 | 1 | -1/+1 | |
| | | | ||||||
| | * | Remove unnecessary brackets | Max Kostikov | 2019-11-18 | 1 | -1/+1 | |
| | | | ||||||
| | * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-11-08 | 47 | -121/+15324 | |
| | |\ | | | | | | | | | | | | | | | | | Dev sync See merge request kostikov/core!4 | |||||
* | | | | sse: fix notifications visible for loaded items when the items were loaded ↵ | Mario | 2019-11-19 | 1 | -1/+10 | |
|/ / / | | | | | | | | | | before the notifications | |||||
* | | | cleanup local and session storage on channel change or logout | Mario | 2019-11-15 | 1 | -2/+2 | |
| | | | ||||||
* | | | sse: implement notifications for anonymous visitors (info, notice and pubs) ↵ | Mario | 2019-11-15 | 4 | -20/+78 | |
| | | | | | | | | | | | | and fix a potential memory leak | |||||
* | | | onepoll: do not update dead feeds | Mario | 2019-11-15 | 2 | -5/+11 | |
| | | | ||||||
* | | | make inline pdf a security option, move thumbnail security to security ↵ | Mario | 2019-11-15 | 5 | -8/+15 | |
| | | | | | | | | | | | | options from admin/site | |||||
* | | | AP fixes | Mario | 2019-11-15 | 1 | -1/+7 | |
| | | | ||||||
* | | | sse: make sure we have an observer | Mario | 2019-11-13 | 1 | -0/+3 | |
| | | | ||||||
* | | | sse: revert to reset to array | Mario | 2019-11-13 | 2 | -5/+3 | |
| | | | ||||||
* | | | check if file exists | Mario | 2019-11-13 | 1 | -1/+1 | |
| | | | ||||||
* | | | sse: reset to empty string instead of empty array | Mario | 2019-11-13 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-11-13 | 1 | -0/+3 | |
|\ \ \ | | | | | | | | | | | | | | | | | wildcard tag issue See merge request hubzilla/core!1784 | |||||
| * | | | wildcard tag issue | zotlabs | 2019-11-12 | 1 | -0/+3 | |
|/ / / | ||||||
* | | | sse: do not delete xconfig - reset it | Mario | 2019-11-12 | 2 | -3/+6 | |
| | | | ||||||
* | | | better detection for who to send sys notifications (needs addons update) | Mario | 2019-11-12 | 2 | -0/+5 | |
| | | | ||||||
* | | | Merge branch 'sse_merge_core' into 'dev' | Max Kostikov | 2019-11-11 | 19 | -63/+1378 | |
|\ \ \ | | | | | | | | | | | | | | | | | sse notifications See merge request hubzilla/core!1783 | |||||
| * | | | sse notifications | Mario | 2019-11-11 | 19 | -63/+1378 | |
|/ / / | ||||||
* | | | use minified version of jquery | Mario | 2019-11-11 | 1 | -10598/+2 | |
| | | | ||||||
* | | | bump version | Mario | 2019-11-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | update strings | Mario | 2019-11-11 | 1 | -8598/+8640 | |
| | | | ||||||
* | | | bump version | Mario | 2019-11-11 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'cherry-pick-1affcb80' into 'dev' | Mario | 2019-11-10 | 1 | -3/+3 | |
|\ \ \ | | | | | | | | | | | | | | | | | fix language tests See merge request hubzilla/core!1782 | |||||
| * | | | fix language tests | Mario | 2019-11-10 | 1 | -3/+3 | |
| | | | | | | | | | | | | (cherry picked from commit 1affcb80172576dc46e4434cd10e1a534a9bb6c2) | |||||
* | | | | Merge branch 'cherry-pick-6685381f' into 'dev' | Mario | 2019-11-10 | 1618 | -435061/+122109 | |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | another bulk of composer updates See merge request hubzilla/core!1781 | |||||
| * | | | | another bulk of composer updates | Mario | 2019-11-10 | 1618 | -435061/+122109 | |
| |/ / / | | | | | | | | | (cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce) | |||||
* | | | | Merge branch 'cherry-pick-9ad4c652' into 'dev' | Mario | 2019-11-10 | 1 | -5/+8 | |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | hopefully fix query for postgres See merge request hubzilla/core!1780 | |||||
| * | | | hopefully fix query for postgres | Mario | 2019-11-10 | 1 | -5/+8 | |
|/ / / | | | | | | | (cherry picked from commit 9ad4c6528cc3ee4e34d2b5d77027a1c33cbadf5c) | |||||
* | | | Merge branch 'cherry-pick-971e7eef' into 'dev' | Max Kostikov | 2019-11-10 | 27 | -13265/+0 | |
|\ \ \ | | | | | | | | | | | | | | | | | remove some old unused javascript libraries See merge request hubzilla/core!1779 | |||||
| * | | | Ãremove some old unused javascript libraries | Mario | 2019-11-10 | 27 | -13265/+0 | |
| | |/ | |/| | | | | (cherry picked from commit 971e7eef9c415a2ce82eb0cd22eaabee12ae719c) | |||||
* | | | Merge branch 'cherry-pick-b444bf59' into 'dev' | Max Kostikov | 2019-11-10 | 1 | -4/+10597 | |
|\ \ \ | |/ / |/| | | | | | | | | update jquery to version 3.4.1 See merge request hubzilla/core!1778 | |||||
| * | | update jquery to version 3.4.1 | Mario | 2019-11-10 | 1 | -4/+10597 | |
|/ / | | | | | (cherry picked from commit b444bf59560b3d918aa13b52035c602b03e8d013) | |||||
* | | Better BBcode to Markdown conversion | Max Kostikov | 2019-11-08 | 1 | -2/+5 | |
| | | ||||||
* | | Merge branch 'dev' into 'dev' | M. Dent | 2019-11-08 | 2 | -7/+9 | |
|\ \ | | | | | | | | | | | | | exempt svg from tag completion See merge request hubzilla/core!1777 | |||||
| * \ | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-11-08 | 31 | -74/+162 | |
| |\ \ | |/ / |/| | | ||||||
* | | | Merge branch 'cherry-pick-fa437b79' into 'dev' | Max Kostikov | 2019-11-08 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | | | | | | | | | more fix date header format See merge request hubzilla/core!1776 | |||||
| * | | | more fix date header format | Mario | 2019-11-08 | 1 | -1/+1 | |
|/ / / | | | | | | | (cherry picked from commit fa437b7977ba7fffd7368fa5c75e3d57fbf75424) | |||||
* | | | Merge branch 'cherry-pick-bb11cd15' into 'dev' | Max Kostikov | 2019-11-08 | 1 | -1/+1 | |
|\ \ \ | | | | | | | | | | | | | | | | | fix date header format See merge request hubzilla/core!1775 | |||||
| * | | | fix date header format | Mario | 2019-11-08 | 1 | -1/+1 | |
|/ / / | | | | | | | (cherry picked from commit bb11cd15d147ebbcc90b544788c9c2ef4925daa5) | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-11-08 | 1 | -1/+1 | |
|\ \ \ | | |/ | |/| | | | | | | | Do not trim a sufficiently shortened Opengraph description See merge request hubzilla/core!1774 | |||||
| * | | Do not trim a sufficiently shortened Opengraph description | Max Kostikov | 2019-11-08 | 1 | -1/+1 | |
| | | | ||||||
* | | | Merge branch 'cherry-pick-2df15f35' into 'dev' | Max Kostikov | 2019-11-08 | 28 | -71/+159 | |
|\ \ \ | | | | | | | | | | | | | | | | | update composer libs See merge request hubzilla/core!1773 | |||||
| * | | | update composr libs | Mario | 2019-11-08 | 28 | -71/+159 | |
|/ / / | | | | | | | (cherry picked from commit 2df15f35d706d4608ff723ce6288391ca774f7ba) | |||||
* | | | Merge branch 'dev' into 'dev' | Mario | 2019-11-08 | 4 | -1/+209 | |
|\ \ \ | | | | | | | | | | | | | | | | | svg stuff See merge request hubzilla/core!1772 | |||||
| * | | | svg stuff | Zot | 2019-11-08 | 4 | -1/+209 | |
|/ / / | ||||||
| | * | exempt svg from tag completion | zotlabs | 2019-11-08 | 2 | -7/+9 | |
| | | | ||||||
| | * | svg stuff | zotlabs | 2019-11-07 | 4 | -1/+209 | |
| | | | ||||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-11-07 | 5 | -181/+279 | |
| | |\ | |_|/ |/| | |