aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Max Kostikov2019-11-181679-457016/+132245
|\ | | | | | | | | Dev sync See merge request kostikov/core!5
| * cleanup local and session storage on channel change or logoutMario2019-11-151-2/+2
| |
| * sse: implement notifications for anonymous visitors (info, notice and pubs) ↵Mario2019-11-154-20/+78
| | | | | | | | and fix a potential memory leak
| * onepoll: do not update dead feedsMario2019-11-152-5/+11
| |
| * make inline pdf a security option, move thumbnail security to security ↵Mario2019-11-155-8/+15
| | | | | | | | options from admin/site
| * AP fixesMario2019-11-151-1/+7
| |
| * sse: make sure we have an observerMario2019-11-131-0/+3
| |
| * sse: revert to reset to arrayMario2019-11-132-5/+3
| |
| * check if file existsMario2019-11-131-1/+1
| |
| * sse: reset to empty string instead of empty arrayMario2019-11-131-1/+1
| |
| * Merge branch 'dev' into 'dev'Mario2019-11-131-0/+3
| |\ | | | | | | | | | | | | wildcard tag issue See merge request hubzilla/core!1784
| | * wildcard tag issuezotlabs2019-11-121-0/+3
| |/
| * sse: do not delete xconfig - reset itMario2019-11-122-3/+6
| |
| * better detection for who to send sys notifications (needs addons update)Mario2019-11-122-0/+5
| |
| * Merge branch 'sse_merge_core' into 'dev'Max Kostikov2019-11-1119-63/+1378
| |\ | | | | | | | | | | | | sse notifications See merge request hubzilla/core!1783
| | * sse notificationsMario2019-11-1119-63/+1378
| |/
| * use minified version of jqueryMario2019-11-111-10598/+2
| |
| * bump versionMario2019-11-111-1/+1
| |
| * update stringsMario2019-11-111-8598/+8640
| |
| * bump versionMario2019-11-111-1/+1
| |
| * Merge branch 'cherry-pick-1affcb80' into 'dev'Mario2019-11-101-3/+3
| |\ | | | | | | | | | | | | fix language tests See merge request hubzilla/core!1782
| | * fix language testsMario2019-11-101-3/+3
| | | | | | | | | (cherry picked from commit 1affcb80172576dc46e4434cd10e1a534a9bb6c2)
| * | Merge branch 'cherry-pick-6685381f' into 'dev'Mario2019-11-101618-435061/+122109
| |\ \ | | | | | | | | | | | | | | | | another bulk of composer updates See merge request hubzilla/core!1781
| | * | another bulk of composer updatesMario2019-11-101618-435061/+122109
| | |/ | | | | | | (cherry picked from commit 6685381fd8db507493c3d7c1793f8c05c681bbce)
| * | Merge branch 'cherry-pick-9ad4c652' into 'dev'Mario2019-11-101-5/+8
| |\ \ | | |/ | |/| | | | | | | hopefully fix query for postgres See merge request hubzilla/core!1780
| | * hopefully fix query for postgresMario2019-11-101-5/+8
| |/ | | | | (cherry picked from commit 9ad4c6528cc3ee4e34d2b5d77027a1c33cbadf5c)
| * Merge branch 'cherry-pick-971e7eef' into 'dev'Max Kostikov2019-11-1027-13265/+0
| |\ | | | | | | | | | | | | remove some old unused javascript libraries See merge request hubzilla/core!1779
| | * Ãremove some old unused javascript librariesMario2019-11-1027-13265/+0
| | | | | | | | | (cherry picked from commit 971e7eef9c415a2ce82eb0cd22eaabee12ae719c)
| * | Merge branch 'cherry-pick-b444bf59' into 'dev'Max Kostikov2019-11-101-4/+10597
| |\ \ | | |/ | |/| | | | | | | update jquery to version 3.4.1 See merge request hubzilla/core!1778
| | * update jquery to version 3.4.1Mario2019-11-101-4/+10597
| |/ | | | | (cherry picked from commit b444bf59560b3d918aa13b52035c602b03e8d013)
* | Remove base64 decode check on Opengraph tags createMax Kostikov2019-11-181-1/+1
| |
* | Remove unnecessary bracketsMax Kostikov2019-11-181-1/+1
| |
* | Merge branch 'dev' into 'dev'Max Kostikov2019-11-0847-121/+15324
|\| | | | | | | | | Dev sync See merge request kostikov/core!4
| * Better BBcode to Markdown conversionMax Kostikov2019-11-081-2/+5
| |
| * Merge branch 'dev' into 'dev'M. Dent2019-11-082-7/+9
| |\ | | | | | | | | | | | | exempt svg from tag completion See merge request hubzilla/core!1777
| | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-11-0831-74/+162
| | |\ | | |/ | |/|
| * | Merge branch 'cherry-pick-fa437b79' into 'dev'Max Kostikov2019-11-081-1/+1
| |\ \ | | | | | | | | | | | | | | | | more fix date header format See merge request hubzilla/core!1776
| | * | more fix date header formatMario2019-11-081-1/+1
| |/ / | | | | | | (cherry picked from commit fa437b7977ba7fffd7368fa5c75e3d57fbf75424)
| * | Merge branch 'cherry-pick-bb11cd15' into 'dev'Max Kostikov2019-11-081-1/+1
| |\ \ | | | | | | | | | | | | | | | | fix date header format See merge request hubzilla/core!1775
| | * | fix date header formatMario2019-11-081-1/+1
| |/ / | | | | | | (cherry picked from commit bb11cd15d147ebbcc90b544788c9c2ef4925daa5)
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-11-081-1/+1
| |\ \ | |/ / |/| | | | | | | | Do not trim a sufficiently shortened Opengraph description See merge request hubzilla/core!1774
* | | Do not trim a sufficiently shortened Opengraph descriptionMax Kostikov2019-11-081-1/+1
| | |
| * | Merge branch 'cherry-pick-2df15f35' into 'dev'Max Kostikov2019-11-0828-71/+159
| |\ \ | | | | | | | | | | | | | | | | update composer libs See merge request hubzilla/core!1773
| | * | update composr libsMario2019-11-0828-71/+159
| |/ / | | | | | | (cherry picked from commit 2df15f35d706d4608ff723ce6288391ca774f7ba)
| * | Merge branch 'dev' into 'dev'Mario2019-11-084-1/+209
| |\ \ | | | | | | | | | | | | | | | | svg stuff See merge request hubzilla/core!1772
| | * | svg stuffZot2019-11-084-1/+209
| |/ /
| | * exempt svg from tag completionzotlabs2019-11-082-7/+9
| | |
| | * svg stuffzotlabs2019-11-074-1/+209
| | |
| | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-11-075-181/+279
| | |\ | | |/ | |/|
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-11-072-172/+253
| |\ \ | |/ / |/| | | | | | | | Update Russian translation See merge request hubzilla/core!1771