| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-16 | 1 | -13/+27 |
|\ |
|
| * | possible fixes for can_comment_on_post(), provide wiki_list on wiki sidebar | zotlabs | 2018-08-15 | 1 | -13/+27 |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-15 | 4 | -4/+47 |
|\| |
|
| * | 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 p... | zotlabs | 2018-08-13 | 3 | -4/+6 |
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-14 | 2 | -23/+16 |
|\| |
|
| * | hubloc DB changes needed for z6 | zotlabs | 2018-08-13 | 1 | -0/+2 |
| * | minor oauth2 updates - renamed zot webbie to 'webfinger' and zothash to 'port... | zotlabs | 2018-08-13 | 1 | -23/+14 |
* | | 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 support for overriding the default template location and individual templ... | M.Dent | 2018-08-12 | 1 | -13/+42 |
* | | 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 cre... | zotlabs | 2018-08-11 | 1 | -0/+16 |
* | | | 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 |
* | | When checking permissions ignore checking site "Block Public" settings in cas... | zotlabs | 2018-07-30 | 2 | -9/+14 |
* | | 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 |
|/ |
|
* | 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 fr... | zotlabs | 2018-06-25 | 1 | -3/+10 |
* | remove the white-space pre-wrap property on code blocks. This should probably... | zotlabs | 2018-06-24 | 1 | -8/+2 |
* | remote_self wasn't working correctly | zotlabs | 2018-06-24 | 1 | -5/+6 |
* | whitespace | zotlabs | 2018-06-18 | 1 | -2/+0 |
* | provide flag to collect_recipients to exclude privacy groups (for federation ... | zotlabs | 2018-06-18 | 1 | -2/+8 |
* | remove several unused/unreferenced templates | zotlabs | 2018-06-17 | 1 | -0/+12 |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-06-17 | 2 | -10/+11 |
|\ |
|
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2018-06-17 | 4 | -5/+8 |
| |\ |
|
| * | | some work on mod group | Mario | 2018-06-17 | 2 | -10/+11 |
* | | | slightly more memory efficient way to drop posts of removed connections | zotlabs | 2018-06-15 | 1 | -7/+8 |
| |/
|/| |
|
* | | re-implement/refactor getQuotaInfo() on DAV storage | zotlabs | 2018-06-14 | 1 | -1/+1 |