Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' into 'dev' | Mario | 2019-05-14 | 1 | -6/+9 |
|\ | | | | | | | | | bbcode map bypass wasn't catching all map forms. See merge request hubzilla/core!1647 | ||||
| * | bbcode map bypass wasn't catching all map forms. | zotlabs | 2019-05-13 | 1 | -6/+9 |
| | | |||||
* | | add autocomplete js to calendar and fix issue with extended likes mid | Mario Vavti | 2019-05-14 | 2 | -3/+7 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-13 | 1 | -3/+3 |
|\ \ | | | | | | | | | | | | | Fix comments scroll button CSS See merge request hubzilla/core!1649 | ||||
| * | | Fix comments scroll button CSS | Max Kostikov | 2019-05-13 | 1 | -3/+3 |
|/ / | |||||
* | | css fixes | Mario Vavti | 2019-05-13 | 3 | -4/+4 |
| | | |||||
* | | deal with privacy mentions in event descriptions | Mario Vavti | 2019-05-13 | 1 | -11/+35 |
| | | |||||
* | | fix button size | Mario Vavti | 2019-05-13 | 1 | -1/+1 |
| | | |||||
* | | bump version | Mario Vavti | 2019-05-13 | 1 | -1/+1 |
| | | |||||
* | | bump version, update autoload cache and update strings | Mario Vavti | 2019-05-13 | 2 | -1258/+1402 |
| | | |||||
* | | calendar merge: cleanup | Mario Vavti | 2019-05-13 | 1 | -138/+9 |
| | | |||||
* | | upgrade jgrowl | Mario Vavti | 2019-05-13 | 20 | -6/+1222 |
| | | |||||
* | | port db_indexes() from zap | Mario Vavti | 2019-05-13 | 1 | -0/+25 |
| | | |||||
* | | don't do oembed processing on naked links and smarty lib cleanup. ported ↵ | Mario Vavti | 2019-05-13 | 3 | -42/+50 |
| | | | | | | | | from zap. | ||||
* | | optimise oembed pdf processing so we do not actually load the content, which ↵ | Mario Vavti | 2019-05-13 | 1 | -15/+16 |
| | | | | | | | | could cause performance issues. ported from zap. | ||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2019-05-13 | 2 | -300/+286 |
|\| | |||||
| * | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-12 | 2 | -300/+286 |
| |\ | | | | | | | | | | | | | Add new Russian translations See merge request hubzilla/core!1646 | ||||
| | * | Update hstrings.php | Max Kostikov | 2019-05-12 | 1 | -11/+8 |
| | | | |||||
| | * | Update hmessages.po | Max Kostikov | 2019-05-12 | 1 | -289/+278 |
| | | | |||||
* | | | form security token for mod register ported from zap | Mario Vavti | 2019-05-13 | 2 | -4/+9 |
|/ / | |||||
* | | add btlogger to unxmlify() | Mario Vavti | 2019-05-11 | 1 | -0/+9 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-11 | 1 | -1/+1 |
|\| | | | | | | | | | Replace photo URL for gallery on clonned channel post sync See merge request hubzilla/core!1645 | ||||
| * | Replace photo URL for gallery on clonned channel post sync | Max Kostikov | 2019-05-11 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Mario | 2019-05-11 | 2 | -15/+17 |
|\ \ | | | | | | | | | | | | | use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendered... See merge request hubzilla/core!1644 | ||||
| * | | use 'cache' flag to bbcode() on content destined for Zot6. We've seen ↵ | zotlabs | 2019-05-09 | 2 | -15/+17 |
| | | | | | | | | | | | | rendered map HTML in a couple of places and these should never be rendered for outgoing content as they will only be purified on the other end. | ||||
* | | | bump version | Mario Vavti | 2019-05-10 | 1 | -1/+1 |
| | | | |||||
* | | | update justified gallery lib | Mario Vavti | 2019-05-10 | 4 | -80/+123 |
| | | | |||||
* | | | css fix for bootstrap 4.3.1 | Mario Vavti | 2019-05-10 | 1 | -0/+4 |
| | | | |||||
* | | | update bootstrap to version 4.3.1 | Mario Vavti | 2019-05-10 | 448 | -23029/+27299 |
| | | | |||||
* | | | fix issue with color selector | Mario Vavti | 2019-05-10 | 1 | -3/+7 |
| | | | |||||
* | | | typo | Mario Vavti | 2019-05-10 | 1 | -1/+1 |
| | | | |||||
* | | | calendar merge: implement channel calendar import in cdav/calendar | Mario Vavti | 2019-05-10 | 6 | -21/+22 |
|/ / | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-09 | 7 | -31/+33 |
|\ \ | | | | | | | | | | | | | remove the caldav and event app and make calendar the default app See merge request hubzilla/core!1643 | ||||
| * | | remove the caldav and event app and make calendar the default app | Mario Vavti | 2019-05-09 | 7 | -31/+33 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-09 | 2 | -1/+2 |
|\ \ \ | |/ / |/| / | |/ | | | Add 'Create' button translation in CalDAV See merge request hubzilla/core!1642 | ||||
| * | Add 'Create' button translation | Max Kostikov | 2019-05-09 | 1 | -0/+1 |
| | | |||||
| * | Add 'Create' button translation | Max Kostikov | 2019-05-09 | 1 | -1/+1 |
| | | |||||
* | | calendar merge: cleanup and comment out some unused code | Mario Vavti | 2019-05-09 | 5 | -81/+69 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-08 | 4 | -4/+44 |
|\ \ | | | | | | | | | | | | | another DB update to fix uid_mid index in item table and add xchan_photo_m index to xchan table See merge request hubzilla/core!1641 | ||||
| * | | another DB update to fix uid_mid index in item table and add xchan_photo_m ↵ | Mario Vavti | 2019-05-08 | 4 | -4/+44 |
|/ / | | | | | | | index to xchan table | ||||
* | | Merge branch 'channel_update' into 'dev' | Max Kostikov | 2019-05-08 | 4 | -1933/+48 |
|\ \ | | | | | | | | | | | | | Channel update See merge request hubzilla/core!1639 | ||||
| * | | Channel update | Mario | 2019-05-08 | 4 | -1933/+48 |
|/ / | |||||
* | | remove option which should never have slipped into dev branch | Mario Vavti | 2019-05-08 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-08 | 1 | -6/+5 |
|\| | | | | | | | | | Replace own image URL in clonned channel posts See merge request hubzilla/core!1638 | ||||
| * | Replace own image URL in clonned channel posts | Max Kostikov | 2019-05-08 | 1 | -6/+5 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-08 | 2 | -14/+4 |
|\| | | | | | | | | | Change thumbnails processing logic on image edit See merge request hubzilla/core!1637 | ||||
| * | Update Photos.php | Max Kostikov | 2019-05-08 | 1 | -1/+1 |
| | | |||||
| * | Update PhotoDriver.php | Max Kostikov | 2019-05-08 | 1 | -13/+3 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-08 | 2 | -77/+47 |
|\| | | | | | | | | | Respect thumbnail storage location on image editing See merge request hubzilla/core!1636 | ||||
| * | Respect thumbnail storage location on image editing | Max Kostikov | 2019-05-08 | 1 | -77/+35 |
| | |