Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-21 | 1 | -1/+1 |
|\ | |||||
| * | like permission issue | zotlabs | 2018-12-20 | 1 | -1/+1 |
| | | |||||
* | | missing observer check | Mario Vavti | 2018-12-20 | 1 | -0/+3 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-20 | 1 | -2/+87 |
|\| | |||||
| * | reverse activity mapping improvements | zotlabs | 2018-12-19 | 1 | -2/+87 |
| | | |||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-17 | 9 | -16/+56 |
| |\ | |||||
* | | | make mod channel deal with b64 encoded mid\s | Mario Vavti | 2018-12-18 | 1 | -0/+8 |
| | | | | | | | | | | | | ; | ||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-18 | 4 | -12/+38 |
|\| | | |/ |/| | |||||
| * | regression: mail from dev to core not delivering | zotlabs | 2018-12-17 | 1 | -1/+6 |
| | | |||||
| * | fix default values for affinity tool and other information which could be ↵ | zotlabs | 2018-12-17 | 3 | -11/+32 |
| | | | | | | | | lost when approving a connection without the entire form provided by connedit. | ||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-13 | 2 | -17/+23 |
| |\ | |||||
* | \ | Merge branch 'dev' into 'dev' | Mario | 2018-12-17 | 1 | -4/+10 |
|\ \ \ | | | | | | | | | | | | | | | | | Keep remote site headers to respect caching policy See merge request hubzilla/core!1440 | ||||
| * | | | Keep remote site headers for caching | Max Kostikov | 2018-12-17 | 1 | -4/+10 |
| | | | | |||||
* | | | | Merge branch 'memory-warn2' into 'dev' | Mario | 2018-12-17 | 1 | -0/+5 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | add warning if upload_filesize < 4MB. See merge request hubzilla/core!1438 | ||||
| * | | | Update Zotlabs/Module/Setup.php | phani00 | 2018-12-16 | 1 | -1/+0 |
| | | | | |||||
| * | | | add warning if upload_filesize < 4MB. | phani00 | 2018-12-16 | 1 | -0/+6 |
| | | | | |||||
* | | | | Move SSLify code from Photo cache addon | Max Kostikov | 2018-12-17 | 1 | -6/+5 |
| | | | | |||||
* | | | | Revert Photos.php code | Max Kostikov | 2018-12-17 | 1 | -245/+1357 |
| | | | | |||||
* | | | | SSLify cached URL on redirect if needed | Max Kostikov | 2018-12-17 | 1 | -1/+3 |
| | | | | |||||
* | | | | SSLify cached URL on redirect if needed | Max Kostikov | 2018-12-17 | 1 | -1357/+245 |
| | | | | |||||
* | | | | Remove photo_cache_enable variable | Max Kostikov | 2018-12-16 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'patch-20181214a' into 'dev' | Mario | 2018-12-16 | 1 | -2/+10 |
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed. See merge request hubzilla/core!1427 | ||||
| * | | | Add return if no local_channel() | DM42.Net (Matt Dent) | 2018-12-15 | 1 | -1/+3 |
| | | | | |||||
| * | | | ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed. | DM42.Net (Matt Dent) | 2018-12-14 | 1 | -2/+8 |
| | | | | |||||
* | | | | Update OAuth2Storage.php - fix email retrieval in getUser | Pascal Deklerck | 2018-12-15 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'patch-20181214d' into 'dev' | Mario | 2018-12-15 | 3 | -2/+22 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Make Affinity Slider (optionally) 'sticky' across page loads. See merge request hubzilla/core!1429 | ||||
| * | | | | Fix syntax error | DM42.Net (Matt Dent) | 2018-12-14 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | Make Affinity Slider (optionally) 'sticky' across page loads. (default is ↵ | DM42.Net (Matt Dent) | 2018-12-14 | 3 | -2/+22 |
| |/ / / | | | | | | | | | | | | | current behavior: reset slider with each page load) | ||||
* / / / | fix wiki preview issue with hyperlinks | Mario Vavti | 2018-12-15 | 1 | -2/+2 |
|/ / / | |||||
* | / | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-14 | 3 | -30/+47 |
|\| | | |/ |/| | |||||
| * | regression: the ability to order apps messed up since adding pinned apps to ↵ | zotlabs | 2018-12-12 | 3 | -30/+47 |
| | | | | | | | | the ordering | ||||
* | | Merge branch 'photo-hook' into 'dev' | M. Dent | 2018-12-10 | 1 | -2/+11 |
|\ \ | | | | | | | | | | | | | add photo_view_filter hook and fix minor issue with unset auto_save_draft… See merge request hubzilla/core!1425 | ||||
| * | | add photo_view_filter hook and fix minor issue with unset auto_save_draft ↵ | Mario Vavti | 2018-12-10 | 1 | -2/+11 |
| | | | | | | | | | | | | variable which resultet in a javascript error | ||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-10 | 3 | -3/+23 |
|\ \ \ | | |/ | |/| | |||||
| * | | home notifications won't expand if there are more than 300 unseen network ↵ | zotlabs | 2018-12-09 | 1 | -2/+4 |
| | | | | | | | | | | | | notifications ahead of them. | ||||
| * | | rmagic discovery for z6 networks | zotlabs | 2018-12-09 | 1 | -0/+18 |
| | | | |||||
| * | | total_identities restriction off by one | zotlabs | 2018-12-09 | 1 | -1/+1 |
| | | | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-06 | 1 | -2/+1 |
|\| | | |/ |/| | |||||
| * | reset page title if article has no title. | zotlabs | 2018-12-05 | 1 | -2/+1 |
| | | |||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-12-04 | 1 | -15/+12 |
|\ \ | |/ |/| | |||||
| * | Merge branch 'photocache' into 'dev' | Mario | 2018-12-04 | 1 | -15/+12 |
| |\ | | | | | | | | | | | | | Less dependence on cache logic See merge request hubzilla/core!1417 | ||||
| | * | Update Photo.php | Max Kostikov | 2018-12-03 | 1 | -1/+1 |
| | | | |||||
| | * | Update Photo.php | Max Kostikov | 2018-12-03 | 1 | -1/+1 |
| | | | |||||
| | * | Update Photo.php | Max Kostikov | 2018-12-03 | 1 | -1/+1 |
| | | | |||||
| | * | New logic for less dependence on cache logic | Max Kostikov | 2018-12-03 | 1 | -15/+12 |
| | | | |||||
* | | | partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 ↵ | zotlabs | 2018-12-03 | 3 | -0/+12 |
| | | | | | | | | | | | | version will be stored under $item['obj']['asld'] | ||||
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-12-03 | 8 | -50/+142 |
|\| | | |||||
| * | | more notifications fixes | Mario Vavti | 2018-12-03 | 1 | -4/+4 |
| | | | | | | | | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e) | ||||
| * | | Merge branch 'photocache' into 'dev' | M. Dent | 2018-12-02 | 3 | -32/+111 |
| |\| | | | | | | | | | | | | | Add Photo Cache addon support See merge request hubzilla/core!1412 | ||||
| | * | Better cache settings logic | Max Kostikov | 2018-11-29 | 1 | -4/+4 |
| | | |