aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'better-conn-status' into 'dev'Mario2019-11-228-10/+72
|\ | | | | | | | | More descriptive connection status icons See merge request hubzilla/core!1789
| * More descriptive connection status iconsM. Dent2019-11-228-10/+72
|/
* Merge branch 'cherry-pick-cc1cca5e' into 'dev'Mario2019-11-212-14821/+14871
|\ | | | | | | | | Cherry pick cc1cca5e See merge request hubzilla/core!1788
| * no mention notifications from mastodon (and pleroma)Manuel Jiménez Friaza2019-11-212-14821/+14871
|/ | | | (cherry picked from commit ea235c0c6751b682332b968b4c18f905e8ece451)
* sse: introduce sse_updateNotifications() to be able to update the ↵Mario2019-11-201-40/+34
| | | | notifications from different places
* sse: defins sse_mids as array and comment out logging of dismissed notificationsMario2019-11-191-2/+2
|
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2019-11-193-68/+74
|\
| * Merge branch 'dev' into 'dev'Max Kostikov2019-11-181-3/+0
| |\ | | | | | | | | | | | | Remove duplicate Opengraph creation See merge request hubzilla/core!1786
| | * Remove duplicate Opengraph creationMax Kostikov2019-11-181-3/+0
| | |
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-11-183-66/+75
| |\| | | | | | | | | | | | | Better Opengraph markup for posts See merge request hubzilla/core!1785
| | * Update Articles.phpMax Kostikov2019-11-181-1/+1
| | |
| | * Use channelx array on Opengraph markup procedureMax Kostikov2019-11-181-1/+1
| | |
| | * Update opengraph.phpMax Kostikov2019-11-181-63/+60
| | |
| | * Move back Opengraph markup creation to init stageMax Kostikov2019-11-181-1/+13
| | |
| | * Merge branch 'dev' into 'dev'Max Kostikov2019-11-181679-457016/+132245
| | |\ | | |/ | |/| | | | | | | Dev sync See merge request kostikov/core!5
| | * 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
* | | | sse: fix notifications visible for loaded items when the items were loaded ↵Mario2019-11-191-1/+10
|/ / / | | | | | | | | | before the notifications
* | | 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)
* | 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