| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'core_fixes' into 'dev' | Mario | 2019-01-15 | 3 | -8/+12 |
| |\ | | | | | | | | | Core fixes See merge request hubzilla/core!1470 | ||||
| | * | whitespace | Mario Vavti | 2019-01-14 | 1 | -2/+0 |
| | | | |||||
| | * | fix a new instance of autocomplete created on each conversation update | Mario Vavti | 2019-01-14 | 1 | -5/+11 |
| | | | |||||
| | * | Merge branch 'dev' into core_fixes | Mario Vavti | 2019-01-14 | 5 | -10/+36 |
| | |\ | |||||
| | * | | only load new content onpopstate if the mid has actually changed | Mario Vavti | 2019-01-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge branch 'patch-20190113c' into 'dev' | Mario | 2019-01-14 | 6 | -1/+57 |
| |\ \ \ | | | | | | | | | | | | | | | | | Hooks to allow addons to add "extras" to privacy group settings edit page. See merge request hubzilla/core!1469 | ||||
| | * | | | Remove stray $ | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Add privacygroup_extras_post/drop hooks | DM42.Net (Matt Dent) | 2019-01-13 | 5 | -1/+51 |
| | | | | | |||||
| | * | | | Add pgrp_extras hook & display | DM42.Net (Matt Dent) | 2019-01-13 | 2 | -0/+6 |
| | | | | | |||||
| * | | | | Merge branch 'patch-20190113a' into 'dev' | Mario | 2019-01-14 | 3 | -2/+62 |
| |\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | Add collect_public_recipients hook See merge request hubzilla/core!1467 | ||||
| | * | | | Add collect_public_recipients hook | DM42.Net (Matt Dent) | 2019-01-12 | 3 | -2/+62 |
| | | | | | |||||
| * | | | | Merge branch 'patch-20190113b' into 'dev' | Max Kostikov | 2019-01-13 | 2 | -3/+3 |
| |\ \ \ \ | |_|/ / |/| | | | | | | | | | | | FIX: aggregated query error in MYSQL See merge request hubzilla/core!1468 | ||||
| | * | | | move order by and rewrite similar in update_queue_item() | DM42.Net (Matt Dent) | 2019-01-13 | 2 | -3/+3 |
| | | | | | |||||
| | * | | | outq_created not outq_scheduled | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | FIX: aggregated query error in MYSQL | DM42.Net (Matt Dent) | 2019-01-13 | 1 | -1/+1 |
| |/ / / | |||||
| * | | | Merge branch 'patch-20190111a' into 'dev' | Mario | 2019-01-12 | 1 | -2/+18 |
| |\ \ \ | |/ / |/| | | | | | | | | FIX: memory exhaustion on zot message pickup with large message queue See merge request hubzilla/core!1466 | ||||
| | * | | FIX: memory exhaustion on zot message pickup with large message queue | M. Dent | 2019-01-12 | 1 | -2/+18 |
| |/ / | |||||
| * | | Merge branch 'patch-20190110a' into 'dev' | Mario | 2019-01-11 | 1 | -3/+12 |
| |\ \ | | | | | | | | | | | | | FIX: memory exhaustion on exceptionally large message queues & multiple... See merge request hubzilla/core!1465 | ||||
| | * | | Use dba_driver.php::db_getfunc() | DM42.Net (Matt Dent) | 2019-01-11 | 1 | -10/+2 |
| | | | | |||||
| | * | | Fix for PGSQL/MYSQL difference | DM42.Net (Matt Dent) | 2019-01-10 | 1 | -2/+11 |
| | | | | |||||
| | * | | FIX: memory exhaustion on exceptionally large message queues & multiple ↵ | ZotSocial Admin | 2019-01-10 | 1 | -2/+10 |
| | | | | | | | | | | | | | Queue.php invocations duplicate work | ||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-11 | 1 | -2/+3 |
| |\ \ \ | |/ / |/| | | |||||
| | * | | failure to import mail | zotlabs | 2019-01-10 | 1 | -2/+3 |
| | | | | |||||
| * | | | Merge branch 'core_fixes' into 'dev' | Max Kostikov | 2019-01-10 | 1 | -1/+8 |
| |\ \ \ | | |/ | |/| | | | | | | | we must sslify all possible content variables See merge request hubzilla/core!1464 | ||||
| | * | | we must sslify all possible content variables | Mario Vavti | 2019-01-10 | 1 | -1/+8 |
| | | | | |||||
| * | | | do not count removed channels | Mario Vavti | 2019-01-10 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge branch 'composer_updates' into 'dev' | M. Dent | 2019-01-09 | 18 | -146/+362 |
| |\ \ | | | | | | | | | | | | | update composer libs See merge request hubzilla/core!1455 | ||||
| | * | | update composer libs | Mario Vavti | 2019-01-02 | 18 | -146/+362 |
| | | | | |||||
| * | | | Merge branch 'core_gallery_05' into 'dev' | M. Dent | 2019-01-09 | 2 | -6/+6 |
| |\ \ \ | | | | | | | | | | | | | | | | | core changes for gallery 05 See merge request hubzilla/core!1463 | ||||
| | * \ \ | Merge branch 'dev' into core_gallery_05 | Mario Vavti | 2019-01-09 | 5 | -125/+33 |
| | |\ \ \ | |/ / / |/| | | | |||||
| * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-09 | 1 | -1/+3 |
| |\ \ \ \ | | |_|/ | |/| | | |||||
| | * | | | make Apps::get_base_apps() pluggable | zotlabs | 2019-01-08 | 1 | -1/+3 |
| | | | | | |||||
| * | | | | Merge branch 'patch-20190106a' into 'dev' | Mario | 2019-01-09 | 3 | -118/+19 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release' See merge request hubzilla/core!1461 | ||||
| | * | | | | Remove Experimental Worker Queue from CORE - add hook 'daemon_master_release' | M. Dent | 2019-01-09 | 3 | -118/+19 |
| |/ / / / | |||||
| * | | | | Merge branch 'patch-20190107a' into 'dev' | Mario | 2019-01-09 | 1 | -6/+11 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Tweak to deal with changes that may happen within the same second. See merge request hubzilla/core!1462 | ||||
| | * | | | | Tweak to deal with changes that may happen within the same second. | DM42.Net (Matt Dent) | 2019-01-07 | 1 | -6/+11 |
| | | | | | | |||||
| | | | * | | slightly improve item.is_new rendering | Mario Vavti | 2019-01-08 | 2 | -6/+6 |
| | |_|/ / |/| | | | |||||
| * | | | | Merge branch 'browser_compatibility' into 'dev' | M. Dent | 2019-01-07 | 1 | -1/+5 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | fix issue with IE See merge request hubzilla/core!1460 | ||||
| | * | | | | fix issue with IE | Mario Vavti | 2019-01-07 | 1 | -1/+5 |
| | |/ / / | |||||
| * | | | | Merge branch 'update_bbcode' into 'dev' | M. Dent | 2019-01-07 | 1 | -14/+3 |
| |\ \ \ \ | |/ / / |/| | | | | | | | | | | | Update bbcode See merge request hubzilla/core!1459 | ||||
| | * | | | Update bbcode | Mario | 2019-01-07 | 1 | -14/+3 |
| |/ / / | |||||
| * | | | Merge branch 'check_content_type-1' into 'dev' | Max Kostikov | 2019-01-03 | 1 | -5/+8 |
| |\ \ \ | | | | | | | | | | | | | | | | | fix content type check See merge request hubzilla/core!1458 | ||||
| | * | | | missing closing parenthesis | Mario Vavti | 2019-01-03 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | fix content type check | Mario Vavti | 2019-01-03 | 1 | -5/+8 |
| |/ / / | |||||
| * | | | Merge branch 'revert-3f61d24d' into 'dev' | Max Kostikov | 2019-01-03 | 1 | -7/+4 |
| |\ \ \ | | | | | | | | | | | | | | | | | Revert "Merge branch 'check_content_type' into 'dev'" See merge request hubzilla/core!1456 | ||||
| | * | | | Revert "Merge branch 'check_content_type' into 'dev'" | Max Kostikov | 2019-01-03 | 1 | -7/+4 |
| |/ / / | | | | | | | This reverts merge request !1453 | ||||
| * | | | Merge branch 'update_boot' into 'dev' | Max Kostikov | 2019-01-03 | 1 | -1/+2 |
| |\ \ \ | | | | | | | | | | | | | | | | | add zotsite.net to directory fallback servers See merge request hubzilla/core!1454 | ||||
| | * | | | add zotsite.net to directory fallback servers | Mario Vavti | 2019-01-02 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge branch 'check_content_type' into 'dev' | Max Kostikov | 2019-01-03 | 1 | -4/+7 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | check suppported type if we get content type from header See merge request hubzilla/core!1453 | ||||
| | * | | | | check suppported type if we get content type from header | Mario Vavti | 2019-01-02 | 1 | -4/+7 |
| | |/ / / | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |