Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-14 | 2 | -23/+16 | |
| | |\ \ \ | ||||||
| | * | | | | Override helpfiles | M. Dent | 2018-08-14 | 1 | -38/+61 | |
| | | | | | | ||||||
| | * | | | | Merge branch 'add-template-overrides' into 'dev' | Mario | 2018-08-13 | 1 | -13/+42 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add template overrides See merge request hubzilla/core!1256 | |||||
| | | * | | | | Add support for overriding the default template location and individual ↵ | M.Dent | 2018-08-12 | 1 | -13/+42 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | templates via .htconfig.php | |||||
| * | | | | | | hubzilla core issue #1262 | zotlabs | 2018-08-17 | 1 | -0/+1 | |
| | |_|_|_|/ | |/| | | | | ||||||
| * | | | | | possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar | zotlabs | 2018-08-15 | 1 | -13/+27 | |
| | |_|_|/ | |/| | | | ||||||
| * | | | | more backporting for zot6 | zotlabs | 2018-08-14 | 2 | -0/+41 | |
| | | | | | ||||||
| * | | | | issue with mdpost addon and archive.org links which contain a full url as a ↵ | zotlabs | 2018-08-13 | 3 | -4/+6 | |
| | |_|/ | |/| | | | | | | | | | | path/query component | |||||
| * | | | hubloc DB changes needed for z6 | zotlabs | 2018-08-13 | 1 | -0/+2 | |
| | | | | ||||||
| * | | | minor oauth2 updates - renamed zot webbie to 'webfinger' and zothash to ↵ | zotlabs | 2018-08-13 | 1 | -23/+14 | |
| |/ / | | | | | | | | | | 'portable_id', fixed/simplified cgi auth mode | |||||
| * | | add table support to markdown | zotlabs | 2018-08-12 | 1 | -2/+79 | |
| | | | ||||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-08-12 | 2 | -3/+41 | |
| |\| | ||||||
| | * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-12 | 1 | -0/+16 | |
| | |\ | ||||||
| | * | | revert debug comment from the last commit | Mario Vavti | 2018-08-09 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | fix zid leaking to nonzot sites if markdown is enabled | Mario Vavti | 2018-08-09 | 1 | -3/+41 | |
| | | | | ||||||
| | * | | search form action for channel search needs the channel address | Mario Vavti | 2018-08-09 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-07-31 | 1 | -1/+1 | |
| | |\ \ | ||||||
| * | | | | make channel_remove less memory hungry | zotlabs | 2018-08-12 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
| * | | | prevent json-ld bombing, turn off browser autocomplete on channel sources ↵ | zotlabs | 2018-08-11 | 1 | -0/+16 | |
| | | | | | | | | | | | | | | | | creation | |||||
| * | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-07-30 | 1 | -1/+1 | |
| |\ \ \ | | |/ / | |/| / | | |/ | ||||||
| | * | Update network.php | gia vec | 2018-07-30 | 1 | -1/+1 | |
| | | | | | | | | | (cherry picked from commit 8db006d9a1b3401f79ad0458e3a2ebae64c3575c) | |||||
| * | | When checking permissions ignore checking site "Block Public" settings in ↵ | zotlabs | 2018-07-30 | 2 | -9/+14 | |
| | | | | | | | | | | | | cases where site permissions aren't applicable | |||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-07-29 | 1 | -3/+3 | |
| |\| | ||||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-07-29 | 1 | -3/+3 | |
| | |\ | ||||||
| | | * | Update nav.php | Max Kostikov | 2018-07-27 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | this may conflict | zotlabs | 2018-07-29 | 1 | -14/+15 | |
| |/ / | ||||||
| * / | SECURITY: sanitise vcard fields | zotlabs | 2018-07-28 | 1 | -8/+8 | |
| |/ | ||||||
| * | fix sql error | Mario Vavti | 2018-07-26 | 1 | -1/+1 | |
| | | ||||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-07-18 | 1 | -1/+3 | |
| |\ | ||||||
| | * | set the correct album name when moving photos | Mario Vavti | 2018-07-18 | 1 | -1/+3 | |
| | | | ||||||
| * | | query filter was a bit greedy | zotlabs | 2018-07-18 | 1 | -1/+1 | |
| | | | ||||||
| * | | mangled urls on redirects | zotlabs | 2018-07-18 | 3 | -4/+4 | |
| |/ | ||||||
* | | search form action for channel search needs the channel address | Mario Vavti | 2018-08-09 | 1 | -1/+1 | |
| | | | | | | (cherry picked from commit 054c5da294b5254cde2b0ff3dabff713c5eedb46) | |||||
* | | Merge branch 'patch-9' into 'dev' | Mario | 2018-07-30 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | Respect navbar translations See merge request hubzilla/core!1243 (cherry picked from commit cbd8c07265590d68bedcaa105b860cfed637e49e) 05b3237b Update nav.php | |||||
* | | Update network.php | gia vec | 2018-07-29 | 1 | -1/+1 | |
| | | ||||||
* | | SECURITY: sanitise vcard fields | zotlabs | 2018-07-29 | 1 | -8/+8 | |
| | | | | | | (cherry picked from commit 2367d94a4264b228995e54ab6e1383652f82a2c2) | |||||
* | | fix sql error | Mario Vavti | 2018-07-26 | 1 | -1/+1 | |
| | | | | | | (cherry picked from commit ec3a066e4e94ad7c72d1d07371081318a4d5e9ab) | |||||
* | | Merge branch '3.6RC' | Mario Vavti | 2018-07-25 | 25 | -481/+639 | |
|\ \ | ||||||
| * | | query filter was a bit greedy | zotlabs | 2018-07-19 | 1 | -1/+1 | |
| | | | | | | | | | (cherry picked from commit a05c8ff66bd8d09f69f6c59bc49b7627792f4109) | |||||
| * | | mangled urls on redirects | zotlabs | 2018-07-19 | 3 | -4/+4 | |
| | | | | | | | | | (cherry picked from commit 5ce50d0a2e15ae66765a68ba2785a87ecda57f6a) | |||||
| * | | set the correct album name when moving photos | Mario Vavti | 2018-07-18 | 1 | -1/+3 | |
| |/ | | | | | (cherry picked from commit eb322e831297ee8fd773049c1a00c915c49dc93e) | |||||
| * | fix to cart behaviour | zotlabs | 2018-07-11 | 1 | -1/+1 | |
| | | ||||||
| * | change to import system apps at most once a day per person | zotlabs | 2018-07-05 | 1 | -2/+2 | |
| | | ||||||
| * | issue syncing pageflags | zotlabs | 2018-07-04 | 1 | -8/+5 | |
| | | ||||||
| * | bad merge | zotlabs | 2018-07-01 | 1 | -0/+4 | |
| | | ||||||
| * | imagick converter: -thumbnail doesn't preserve exif, -resize does | zotlabs | 2018-06-26 | 1 | -3/+3 | |
| | | ||||||
| * | crc32 is potentially reversible | zotlabs | 2018-06-25 | 1 | -1/+1 | |
| | | ||||||
| * | SECURITY: logging: hash the session_id in case somebody posts log snippets ↵ | zotlabs | 2018-06-25 | 1 | -3/+10 | |
| | | | | | | | | from active sessions; also provide a hashed process_id if using a daemon process (with no session) for easier tracking of related log events | |||||
| * | remove the white-space pre-wrap property on code blocks. This should ↵ | zotlabs | 2018-06-24 | 1 | -8/+2 | |
| | | | | | | | | probably be done with the word-break property instead | |||||
| * | remote_self wasn't working correctly | zotlabs | 2018-06-24 | 1 | -5/+6 | |
| | |