Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '3.6RC' | Mario Vavti | 2018-07-25 | 53 | -370/+842 |
|\ | |||||
| * | query filter was a bit greedy | zotlabs | 2018-07-19 | 1 | -1/+0 |
| | | | | | | (cherry picked from commit a05c8ff66bd8d09f69f6c59bc49b7627792f4109) | ||||
| * | mangled urls on redirects | zotlabs | 2018-07-19 | 4 | -11/+12 |
| | | | | | | (cherry picked from commit 5ce50d0a2e15ae66765a68ba2785a87ecda57f6a) | ||||
| * | this is messing with names containing a comma and is superfluous now | Mario Vavti | 2018-07-06 | 1 | -2/+0 |
| | | |||||
| * | don't provide manage apps button when viewing all available | zotlabs | 2018-07-05 | 1 | -1/+1 |
| | | |||||
| * | appstore changes | zotlabs | 2018-07-04 | 1 | -2/+4 |
| | | |||||
| * | order nouveau by created instead of received since ordering by received ↵ | Mario Vavti | 2018-07-04 | 1 | -2/+2 |
| | | | | | | | | returns unexpected results once old expired items get re-imported | ||||
| * | plugins -> addons | zotlabs | 2018-06-28 | 2 | -20/+20 |
| | | |||||
| * | imagick converter: -thumbnail doesn't preserve exif, -resize does | zotlabs | 2018-06-26 | 1 | -1/+1 |
| | | |||||
| * | do not include system channels in directory results | zotlabs | 2018-06-25 | 1 | -1/+1 |
| | | |||||
| * | disable log noise until it is needed | zotlabs | 2018-06-25 | 1 | -1/+1 |
| | | |||||
| * | channel sources: add 'resend' option to discard original author - similar to ↵ | zotlabs | 2018-06-18 | 1 | -6/+11 |
| | | | | | | | | the Friendica remote_self setting | ||||
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-06-17 | 1 | -37/+70 |
| |\ | |||||
| | * | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario | 2018-06-17 | 9 | -17/+36 |
| | |\ | |||||
| | * | | some work on mod group | Mario | 2018-06-17 | 1 | -37/+70 |
| | | | | |||||
| * | | | owa: htmlentity encoding encountered in authentication workflow (possibly ↵ | zotlabs | 2018-06-17 | 1 | -1/+8 |
| | |/ | |/| | | | | | | | introduced during Apache mod_rewrite with QSA flag) | ||||
| * | | apply changes to slider defaults across all modules that use buildQuery for ↵ | zotlabs | 2018-06-15 | 5 | -10/+10 |
| | | | | | | | | | | | | updates | ||||
| * | | hubzilla core issue #1227 - affinity slider unable to reach 0,99 when slider ↵ | zotlabs | 2018-06-15 | 1 | -4/+6 |
| | | | | | | | | | | | | saved default changes | ||||
| * | | re-implement/refactor getQuotaInfo() on DAV storage | zotlabs | 2018-06-14 | 1 | -1/+1 |
| | | | |||||
| * | | optionally report total available space when uploading | zotlabs | 2018-06-13 | 1 | -1/+4 |
| | | | |||||
| * | | SECURITY: provide option to disable the cloud 'root' directory and make the ↵ | zotlabs | 2018-06-13 | 2 | -0/+14 |
| | | | | | | | | | | | | cloud module require a target channel nickname. This is a low impact change as there is currently no disclosure of private information. The presence of a file browser for all the channels on the site could be (and is reported to be) a concern to some people and there is no reason why it shouldn't be optional. | ||||
| * | | uid is integer | zotlabs | 2018-06-13 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' of ../hz into dev | zotlabs | 2018-06-13 | 1 | -1/+1 |
| |\ \ | | |/ | |/| | |||||
| | * | null db fields in mod_invite | zotlabs | 2018-06-13 | 1 | -1/+1 |
| | | | |||||
| * | | fix issue #1219 | Mario Vavti | 2018-06-09 | 1 | -3/+6 |
| | | | |||||
| * | | restrict cid filter to unthreaded order (makes much more sense that way imho ↵ | Mario Vavti | 2018-06-09 | 1 | -1/+1 |
| | | | | | | | | | | | | and the query is a lot faster) and slighty change order of the filters | ||||
| * | | if unthreaded and cid and not pf, query author only | Mario Vavti | 2018-06-08 | 1 | -5/+10 |
| |/ | |||||
| * | escape query string | Mario Vavti | 2018-06-07 | 4 | -5/+5 |
| | | |||||
| * | do not query for parents if $conv and $nouveau are set | Mario Vavti | 2018-06-07 | 1 | -5/+11 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-06-06 | 2 | -67/+149 |
| |\ | |||||
| | * | some work to make menus editable by visitors with webpage write permissions; ↵ | zotlabs | 2018-06-05 | 2 | -67/+149 |
| | | | | | | | | | | | | this needed to revise the link structure so that the page specified an owner channel in the url. Otherwise we could only operate on menus owned by local_channel(). Have done some basic regression testing but have not yet fully tested guest editing functionality. | ||||
| * | | add the pf argument to the forum notification links | Mario Vavti | 2018-06-06 | 1 | -1/+1 |
| | | | |||||
| * | | rely on the pf argument to determine if we deal with a forum or not. ↵ | Mario Vavti | 2018-06-05 | 1 | -3/+5 |
| | | | | | | | | | | | | xchan_pubforum is not set for all public forums in the forum filters for some reason. | ||||
| * | | be specific about the term type and do not sort the results | Mario Vavti | 2018-06-04 | 1 | -2/+5 |
| |/ | |||||
| * | improve network cid query | Mario Vavti | 2018-06-03 | 1 | -24/+22 |
| | | |||||
| * | distinct is needed or it can heavily impact pagination in certain situations ↵ | Mario Vavti | 2018-06-03 | 1 | -3/+3 |
| | | | | | | | | (5 per page instead of 20). Add ordering to the select clause to mitigate errors in postgres and add item_thread_top = 1 for slightly better performance. | ||||
| * | missing $perm_sql | Mario Vavti | 2018-06-03 | 1 | -1/+4 |
| | | |||||
| * | finalize filters and forum notifications | Mario Vavti | 2018-06-02 | 2 | -66/+46 |
| | | |||||
| * | some more work on forum notifications | Mario Vavti | 2018-06-02 | 1 | -0/+13 |
| | | |||||
| * | unread forum notifications - wip/unfinished | Mario Vavti | 2018-06-01 | 1 | -0/+61 |
| | | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-31 | 1 | -2/+1 |
| |\ | |||||
| | * | autocomplete private mail addresses based on substring in either the name or ↵ | zotlabs | 2018-05-30 | 1 | -2/+1 |
| | | | | | | | | | | | | webbie (prevously required an '@' to trigger a webbie search) | ||||
| * | | merge groups and filed posts into activity filters | Mario Vavti | 2018-05-31 | 2 | -3/+3 |
| | | | |||||
| * | | strpos does not work with arrays :( | Mario Vavti | 2018-05-30 | 2 | -2/+2 |
| | | | |||||
| * | | restrict the network/channel navbar search to content and hashtags | Mario Vavti | 2018-05-30 | 2 | -0/+6 |
| | | | |||||
| * | | make navbar search use the module search function in /network and /channel | Mario Vavti | 2018-05-30 | 2 | -13/+20 |
| | | | |||||
| * | | remove redundant reference for order | Mario Vavti | 2018-05-30 | 1 | -5/+0 |
| | | | |||||
| * | | first cut on restructuring the previously called network tabs | Mario Vavti | 2018-05-30 | 1 | -4/+17 |
| |/ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-29 | 1 | -0/+1 |
| |\ | |||||
| | * | Merge pull request #1202 from aninf-wo/dev | git-marijus | 2018-05-29 | 1 | -0/+1 |
| | |\ | | | | | | | | | include photos.php |