aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Update es-esManuel Jiménez Friaza2018-12-022-27/+27
| | | (cherry picked from commit ca98a566ee7821c901b6a1db3013f3e9097747bc)
* fix mastodon tag notifications (again)zotlabs2018-12-021-15/+17
| | | (cherry picked from commit 8e713245144d0bcedca0d3345017b5fa232c8ca3)
* no mention notifications from mastodon (and pleroma)zotlabs2018-12-021-4/+4
| | | (cherry picked from commit ea235c0c6751b682332b968b4c18f905e8ece451)
* fix call to undefined functionMario Vavti2018-11-211-1/+1
|
* fix typo which prevented propagation of commentsMario Vavti2018-11-201-1/+1
| | | (cherry picked from commit 0c94747ab1c740f47e5a796f5c60efcdfcd29ba1)
* version 3.8.53.8.5Mario Vavti2018-11-191-1/+1
|
* Merge branch 'master' of https://framagit.org/hubzilla/coreMario Vavti2018-11-191-2/+0
|\
| * Merge branch 'patch-20181118a' into 'dev'Mario2018-11-191-2/+0
| | | | | | | | | | | | | | | | | | Patch 20181118a - fix delayed publication of posts See merge request hubzilla/core!1398 (cherry picked from commit f34af496ec82555a0e070e91260dc6edb17f2d5a) 3787c490 Fix: delayed items propagate before publication on cloned channels
* | changelogMario Vavti2018-11-191-0/+9
|/
* update sql schemas to include update column in pconfig tableMario Vavti2018-11-192-5/+5
|
* recalculate photo filesize when rotating an imageMario Vavti2018-11-171-10/+19
|
* strlen($this->imageString()) does not return the correct size when dealing ↵Mario Vavti2018-11-161-2/+2
| | | | with os_storage images. use filesize() instead.
* Merge branch 'master' into 'master'Mario2018-11-161-3/+3
|\ | | | | | | | | delivery issue See merge request hubzilla/core!1397
| * delivery issuezotlabs2018-11-151-3/+3
|/
* more changelog3.8.4Mario Vavti2018-11-141-0/+2
|
* Merge branch 'dev'Mario Vavti2018-11-1433-424/+844
|\
| * changelog and versionMario Vavti2018-11-142-1/+19
| |
| * Merge branch 'patch-20181113b' into 'dev'Mario2018-11-142-3/+3
| |\ | | | | | | | | | | | | Patch 20181113b See merge request hubzilla/core!1395
| | * Fix double escaping after xss fixDM42.Net (Matt Dent)2018-11-131-2/+2
| | |
| | * Revert "Filter search box before display"DM42.Net (Matt Dent)2018-11-131-1/+1
| | | | | | | | | | | | This reverts commit 35e66770be6ca93c9090cdab221e6c33a410a569.
| * | Merge branch 'dev' into 'dev'Mario2018-11-142-28/+9
| |\ \ | | |/ | |/| | | | | | | Remove unneccessary fetch_image_from_url() function See merge request hubzilla/core!1393
| | * Update Photo.phpMax Kostikov2018-11-131-4/+4
| | |
| | * Remove uneccessary include/photos.php Max Kostikov2018-11-131-1/+0
| | |
| | * Text formatting in Photo.phpMax Kostikov2018-11-131-2/+2
| | |
| | * Replace fetch_image_from_url() with z_fetch_url()Max Kostikov2018-11-131-6/+8
| | |
| | * Remove fetch_image_from_url() because of functions duplicateMax Kostikov2018-11-131-20/+0
| | |
| * | Merge branch 'patch-20181113a' into 'dev'M. Dent2018-11-143-6/+16
| |\ \ | | | | | | | | | | | | | | | | Patch 20181113a See merge request hubzilla/core!1394
| | * \ Merge remote-tracking branch red/master into patch-20181113a. Add Mike's fix ↵DM42.Net (Matt Dent)2018-11-132-5/+15
| | |\ \ | | | | | | | | | | | | | | | to search xss and Superblock fix.
| | | * | xss in searchzotlabs2018-11-131-3/+3
| | | | |
| | | * | enotify::format hook for superblockzotlabs2018-11-121-2/+12
| | | | |
| | | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-11-0719-47/+208
| | | |\ \
| | * | | | Filter search box before displayDM42.Net (Matt Dent)2018-11-131-1/+1
| |/ / / /
| * | | | Merge branch 'revert-6375f2d7' into 'dev'Max Kostikov2018-11-131-9/+6
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Revert "Replace fetch_image_from_url() with z_fetch_url()" See merge request hubzilla/core!1392
| | * | | | Revert "Replace fetch_image_from_url() with z_fetch_url()"Max Kostikov2018-11-131-9/+6
| |/ / / / | | | | | | | | | | This reverts commit 6375f2d73a0c314e8de12071f1e604e59d8c76de
| * | | | Replace fetch_image_from_url() with z_fetch_url()Max Kostikov2018-11-131-6/+9
| | | | |
| * | | | Merge branch 'fix-activity-filter-widget' into 'dev'M. Dent2018-11-121-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | use the correct javascript function for this case See merge request hubzilla/core!1390
| | * | | | use the correct javascript function for this caseMario Vavti2018-11-111-1/+1
| | | | | |
| * | | | | Merge branch 'css-fixes' into 'dev'M. Dent2018-11-123-12/+8
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | css fixes See merge request hubzilla/core!1391
| | * | | | fix css issues in bbcode conversion and focus-light schemaMario Vavti2018-11-123-12/+8
| |/ / / /
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-11-113-14/+18
| |\ \ \ \
| | * \ \ \ Merge branch 'dev' into 'dev'Mario2018-11-112-5/+9
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | Preserve photo modification date on edit See merge request hubzilla/core!1389
| | | * | | Merge branch 'dev' into 'dev'Max Kostikov2018-11-101-9/+9
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | # Conflicts: # include/photo/photo_driver.php
| | | * | | | Update photo_driver.phpMax Kostikov2018-11-101-1/+1
| | | | | | |
| | | * | | | Preserve photo modification dateMax Kostikov2018-11-101-4/+8
| | | | | | |
| | | * | | | Fixed wrong value assign on compare with 0Max Kostikov2018-11-101-1/+1
| | | | | | |
| | * | | | | Merge branch 'dev' into 'dev'Mario2018-11-111-5/+2
| | |\ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | fix shared_header img expanding to 100% width when sharing a share See merge request hubzilla/core!1387
| | * | | | | Merge branch 'dev' into 'dev'Mario2018-11-101-9/+9
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove DNS check for database connection during installation... See merge request hubzilla/core!1384
| | | * | | | | Remove DNS check for database connection during installation. Causes ↵Andrew Manning2018-11-091-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | friction with Docker deployment.
| * | | | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-11-103-16/+20
| |\| | | | | | | | |_|/ / / / | |/| | | | |
| | * | | | | Fixed wrong value assign on compare with 0Max Kostikov2018-11-101-1/+1
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-26 18:32:54 +0000