| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'fix_pconfig' into 'dev' | Max Kostikov | 2019-01-03 | 1 | -1/+1 |
| |\ | | | | | | | | | fix preg_match(): Delimiter must not be alphanumeric or backslash warning See merge request hubzilla/core!1452 | ||||
| | * | fix preg_match(): Delimiter must not be alphanumeric or backslash warning | Mario Vavti | 2019-01-02 | 1 | -1/+1 |
| | | | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-03 | 1 | -1/+6 |
| |\ \ | |||||
| | * | | better handling of notification updates while commenting | zotlabs | 2019-01-02 | 1 | -1/+6 |
| | | | | |||||
| * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2019-01-02 | 2 | -4/+4 |
| |\| | | |||||
| | * | | allow notification updates when composing comments. This was disabled when ↵ | zotlabs | 2019-01-02 | 2 | -4/+4 |
| | | | | | | | | | | | | | it was possible to have liveUpdate run automatically while composing comments, but it seems that live update is no longer possible (however the setting still remains - this should probably be removed). | ||||
| * | | | Revert "Use subselect" | Mario | 2019-01-02 | 1 | -4/+4 |
| | | | | | | | | | | This reverts commit a50433dd958ec52eec88867517b3ae6467758618 | ||||
| * | | | Merge branch 'patch-20181230a' into 'dev' | Mario | 2019-01-02 | 1 | -4/+4 |
| |\ \ \ | |_|/ |/| | | | | | | | | Use subselect See merge request hubzilla/core!1451 | ||||
| | * | | Use subselect | DM42.Net (Matt Dent) | 2018-12-30 | 1 | -4/+4 |
| | | | | |||||
| * | | | Faster image processing with photo cache addon | Max Kostikov | 2018-12-24 | 1 | -5/+6 |
| | | | | |||||
| * | | | update changelog | Mario Vavti | 2018-12-22 | 1 | -0/+18 |
| | | | | |||||
| * | | | Merge branch 'fix_linkinfo_warning' into 'dev' | Mario | 2018-12-22 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | | | | | | | | | check if we deal with an array before sizeof() See merge request hubzilla/core!1444 | ||||
| | * | | | use count() instead of sizeof() | Mario Vavti | 2018-12-19 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | check if we deal with an array before sizeof() | Mario Vavti | 2018-12-19 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | revert padding for text highlight. It is messing with indent punctuation and ↵ | Mario Vavti | 2018-12-22 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | decreases legibility of the highlighted text. | ||||
| * | | | | Merge branch 'dev' into 'dev' | Mario | 2018-12-21 | 1 | -13/+4 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Fix for cURL with default HTTP/2 See merge request hubzilla/core!1447 | ||||
| | * | | | | Fix for cURL with default HTTP/2 | Max Kostikov | 2018-12-20 | 1 | -13/+4 |
| | | | | | | |||||
| | * | | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-12-20 | 1 | -4/+13 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Dev See merge request kostikov/core!2 | ||||
| | * \ \ \ \ | Merge branch 'dev' into 'dev' | Max Kostikov | 2018-12-20 | 16 | -41/+196 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync dev See merge request kostikov/core!1 | ||||
| * | \ \ \ \ \ | Merge branch 'remove-legacy-photo-cache-prevention' into 'dev' | Max Kostikov | 2018-12-21 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | do not add timestamp to the photo src. caching is handled in mod photo now. See merge request hubzilla/core!1448 | ||||
| | * | | | | | | | do not add timestamp to the photo src. caching is handled in mod photo now. | Mario Vavti | 2018-12-21 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | 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 |
| | | | | | | | |||||
| * | | | | | | Merge branch 'revert-090fe394' into 'dev' | Max Kostikov | 2018-12-20 | 1 | -4/+13 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | Revert "Fix cURL with HTTP/2" See merge request hubzilla/core!1446 | ||||
| | * | | | | | Revert "Fix cURL with HTTP/2" | Max Kostikov | 2018-12-20 | 1 | -4/+13 |
| |/ / / / / | | | | | | | | | | | This reverts commit 090fe394e4733aea9e9ca2e9a93c2c27b266d065 | ||||
| * | | | | | Fix cURL with HTTP/2 | Max Kostikov | 2018-12-20 | 1 | -13/+4 |
| | | | | | | |||||
| * | | | | | 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 | 19 | -21/+171 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge branch 'dark-fix-dev' into 'dev' | Mario | 2018-12-19 | 3 | -21/+28 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for dark theme; includes one changes to bbcode.php and redbasic/css/style.css See merge request hubzilla/core!1442 | ||||
| | * | | | | | | remove color from style.css (default) but add a little padding; add color & ↵ | phani00 | 2018-12-18 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | border radius to dark.css. | ||||
| | * | | | | | | change hl text color to the default text color in non-dark schema. looks ↵ | phani00 | 2018-12-18 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | good, except in dark, where i can change it in dark.css. | ||||
| | * | | | | | | remove some fancy formatting. | phani00 | 2018-12-18 | 2 | -5/+0 |
| | | | | | | | | |||||
| | * | | | | | | new fix for dark theme | phani00 | 2018-12-17 | 3 | -25/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change implementation of hl-tags in include/bbcode.php insert class='default-highlight' instead of background-color: 'yellow' into span add span.default-highlight definition to view/theme/redbasic/css/style.css this works for all schemas incl. dark. | ||||
| | * | | | | | | Merge branch 'dev' into dark-fix-dev | phani00 | 2018-12-17 | 4 | -8/+35 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | * | | | | | | remove my dark theme fixes. | phani00 | 2018-12-17 | 1 | -5/+8 |
| | | | | | | | | |||||
| * | | | | | | | Merge branch 'util-reload_addons' into 'dev' | Mario | 2018-12-19 | 1 | -0/+15 |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add reload to util/addons See merge request hubzilla/core!1434 | ||||
| | * | | | | | | | Add reload to util/addons | M. Dent | 2018-12-19 | 1 | -0/+15 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge branch 'channel_b64_enc_mid' into 'dev' | Max Kostikov | 2018-12-18 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | make mod channel deal with b64 encoded mid's See merge request hubzilla/core!1443 | ||||
| | * | | | | | | make mod channel deal with b64 encoded mid\s | Mario Vavti | 2018-12-18 | 1 | -0/+8 |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | ; | ||||
| * | | | | | | Merge branch 'dev' into 'dev' | Mario | 2018-12-18 | 3 | -97/+0 |
| |\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | Remove scale_external_images() See merge request hubzilla/core!1441 | ||||
| | * | | | | | Remove scale_external_images() | Max Kostikov | 2018-12-17 | 1 | -2/+0 |
| | | | | | | | |||||
| | * | | | | | Remove scale_external_images() | Max Kostikov | 2018-12-17 | 1 | -93/+0 |
| | | | | | | | |||||
| | * | | | | | Remove scale_external_images() | Max Kostikov | 2018-12-17 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-12-18 | 7 | -16/+42 |
| |\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | | | |||||
| | * | | | | regression: mail from dev to core not delivering | zotlabs | 2018-12-17 | 2 | -1/+8 |
| | | | | | | |||||
| | * | | | | fix default values for affinity tool and other information which could be ↵ | zotlabs | 2018-12-17 | 5 | -15/+34 |
| | | | | | | | | | | | | | | | | | | | | | lost when approving a connection without the entire form provided by connedit. | ||||
| * | | | | | 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 |
| | | | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |