Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "Fix: Authors unable to comment on posts they authored when under ↵ | Mario Vavti | 2018-09-03 | 1 | -15/+2 |
| | | | | | | | | owned by others in certain circumstances." This reverts commit e2824f925964fbfe160255de6e733b4c2de3cecb. Reverting because it breaks forum mentions. | ||||
* | Merge branch 'add-delivery-status-info' into 'dev' | Mario | 2018-09-02 | 1 | -2/+15 |
|\ | | | | | | | | | Fix: Authors unable to comment on posts they authored when under owned by others… See merge request hubzilla/core!1268 | ||||
| * | Fix: Authors unable to comment on posts they authored when under owned by ↵ | M.Dent | 2018-09-01 | 1 | -2/+15 |
| | | | | | | | | others in certain circumstances. | ||||
* | | Merge branch 'call-hooks-optimization' into 'dev' | Mario | 2018-08-30 | 1 | -1/+1 |
|\ \ | | | | | | | | | | | | | Micro-optimization to call_hooks() See merge request hubzilla/core!1267 | ||||
| * | | Micro-optimization to call_hooks() | M.Dent | 2018-08-29 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'add-delivery-status-info' into 'dev' | Mario | 2018-08-30 | 1 | -0/+1 |
|\ \ \ | | |/ | |/| | | | | | | | Add dreport_process hook See merge request hubzilla/core!1266 | ||||
| * | | Add dreport_process hook | M.Dent | 2018-08-29 | 1 | -0/+1 |
| |/ | |||||
* / | html-to-markdown adds a backslash infront of a hash after each new line - ↵ | Mario Vavti | 2018-08-29 | 1 | -1/+4 |
|/ | | | | manualy remove those | ||||
* | code cleanup | zotlabs | 2018-08-23 | 2 | -37/+52 |
| | |||||
* | first_post_date() (used by archive widget) - trigger the query options off ↵ | zotlabs | 2018-08-23 | 1 | -14/+15 |
| | | | | of the active module rather than rely on passed parameters | ||||
* | tweak archive widget for articles | zotlabs | 2018-08-22 | 1 | -2/+14 |
| | |||||
* | add api_not_found hook | zotlabs | 2018-08-21 | 1 | -1/+4 |
| | |||||
* | Zot/Finger: ignore deleted hublocs | zotlabs | 2018-08-21 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-08-20 | 2 | -51/+103 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-16 | 1 | -13/+27 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-08-15 | 4 | -4/+47 |
| |\ \ | |||||
| * \ \ | 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 |
|/ | |||||
* | 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 |
| |