aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-184-12/+38
| |\ \ \ \
* | | | | | more work on z6 eventszotlabs2019-01-161-0/+37
| | | | | |
* | | | | | more z6 compatibility fixeszotlabs2019-01-163-2/+8
| |_|_|_|/ |/| | | |
* | | | | make Apps::get_base_apps() pluggablezotlabs2019-01-081-1/+3
| |_|_|/ |/| | |
* | | | like permission issuezotlabs2018-12-201-1/+1
| |_|/ |/| |
* | | reverse activity mapping improvementszotlabs2018-12-191-2/+87
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-179-16/+56
|\| | | |/ |/|
| * Merge branch 'dev' into 'dev'Mario2018-12-171-4/+10
| |\ | | | | | | | | | | | | Keep remote site headers to respect caching policy See merge request hubzilla/core!1440
| | * Keep remote site headers for cachingMax Kostikov2018-12-171-4/+10
| | |
| * | Merge branch 'memory-warn2' into 'dev'Mario2018-12-171-0/+5
| |\ \ | | |/ | |/| | | | | | | add warning if upload_filesize < 4MB. See merge request hubzilla/core!1438
| | * Update Zotlabs/Module/Setup.phpphani002018-12-161-1/+0
| | |
| | * add warning if upload_filesize < 4MB.phani002018-12-161-0/+6
| | |
| * | Move SSLify code from Photo cache addonMax Kostikov2018-12-171-6/+5
| | |
| * | Revert Photos.php codeMax Kostikov2018-12-171-245/+1357
| | |
| * | SSLify cached URL on redirect if neededMax Kostikov2018-12-171-1/+3
| | |
| * | SSLify cached URL on redirect if neededMax Kostikov2018-12-171-1357/+245
| | |
| * | Remove photo_cache_enable variableMax Kostikov2018-12-161-1/+1
| | |
| * | Merge branch 'patch-20181214a' into 'dev'Mario2018-12-161-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-151-1/+3
| | |
| | * ARTICLES MODULE: Default to local_channel() user when no argv(1) is passed.DM42.Net (Matt Dent)2018-12-141-2/+8
| | |
| * | Update OAuth2Storage.php - fix email retrieval in getUserPascal Deklerck2018-12-151-1/+1
| | |
| * | Merge branch 'patch-20181214d' into 'dev'Mario2018-12-153-2/+22
| |\ \ | | | | | | | | | | | | | | | | Make Affinity Slider (optionally) 'sticky' across page loads. See merge request hubzilla/core!1429
| | * | Fix syntax errorDM42.Net (Matt Dent)2018-12-142-2/+2
| | | |
| | * | Make Affinity Slider (optionally) 'sticky' across page loads. (default is ↵DM42.Net (Matt Dent)2018-12-143-2/+22
| | |/ | | | | | | | | | current behavior: reset slider with each page load)
| * / fix wiki preview issue with hyperlinksMario Vavti2018-12-151-2/+2
| |/
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-143-30/+47
| |\
* | | regression: mail from dev to core not deliveringzotlabs2018-12-171-1/+6
| | |
* | | fix default values for affinity tool and other information which could be ↵zotlabs2018-12-173-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_mergezotlabs2018-12-132-17/+23
|\| | | |/ |/|
| * Merge branch 'photo-hook' into 'dev'M. Dent2018-12-101-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 Vavti2018-12-101-2/+11
| | | | | | | | | | | | variable which resultet in a javascript error
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-103-3/+23
| |\ \
| * \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-12-061-2/+1
| |\ \ \ | | |_|/ | |/| |
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-12-041-15/+12
| |\ \ \
| | * \ \ Merge branch 'photocache' into 'dev'Mario2018-12-041-15/+12
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Less dependence on cache logic See merge request hubzilla/core!1417
| | | * | | Update Photo.phpMax Kostikov2018-12-031-1/+1
| | | | | |
| | | * | | Update Photo.phpMax Kostikov2018-12-031-1/+1
| | | | | |
| | | * | | Update Photo.phpMax Kostikov2018-12-031-1/+1
| | | | | |
| | | * | | New logic for less dependence on cache logicMax Kostikov2018-12-031-15/+12
| | | | | |
* | | | | | regression: the ability to order apps messed up since adding pinned apps to ↵zotlabs2018-12-123-30/+47
| |_|_|_|/ |/| | | | | | | | | | | | | | the ordering
* | | | | home notifications won't expand if there are more than 300 unseen network ↵zotlabs2018-12-091-2/+4
| | | | | | | | | | | | | | | | | | | | notifications ahead of them.
* | | | | rmagic discovery for z6 networkszotlabs2018-12-091-0/+18
| | | | |
* | | | | total_identities restriction off by onezotlabs2018-12-091-1/+1
| |_|_|/ |/| | |
* | | | reset page title if article has no title.zotlabs2018-12-051-2/+1
|/ / /
* | | partial solution for obj|tgt multiple (zot and zot6) encodings; the zot6 ↵zotlabs2018-12-033-0/+12
| | | | | | | | | | | | version will be stored under $item['obj']['asld']
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-12-038-50/+142
|\| |
| * | more notifications fixesMario Vavti2018-12-031-4/+4
| | | | | | | | | (cherry picked from commit 9ef6c57ca59aa318a3564f6b48c6442870650d3e)
| * | Merge branch 'photocache' into 'dev'M. Dent2018-12-023-32/+111
| |\| | | | | | | | | | | | | Add Photo Cache addon support See merge request hubzilla/core!1412
| | * Better cache settings logicMax Kostikov2018-11-291-4/+4
| | |
| | * Code cleanupMax Kostikov2018-11-291-3/+3
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 18:25:45 +0000