Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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-07 | 1 | -1/+1 |
|\ | |||||
| * | update a number of links in the code | zotlabs | 2018-06-06 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-06-06 | 1 | -4/+9 |
| |\ | |||||
* | | | 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 |
|/ | |||||
* | sort out some mismatched hovertips on the activity filter | zotlabs | 2018-06-03 | 1 | -5/+5 |
| | |||||
* | wrong level | zotlabs | 2018-06-03 | 1 | -2/+2 |
| | |||||
* | fix submenunavigation on activity filters | zotlabs | 2018-06-03 | 1 | -0/+2 |
| | |||||
* | improve network cid query | Mario Vavti | 2018-06-03 | 2 | -26/+24 |
| | |||||
* | 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 |
| | |||||
* | the pf argument is required here for some functionality in /network | Mario Vavti | 2018-06-03 | 1 | -3/+3 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-06-02 | 2 | -2/+2 |
|\ | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-06-02 | 4 | -0/+86 |
| |\ | |||||
| * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-06-01 | 2 | -27/+54 |
| |\ \ | |||||
| * \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-31 | 1 | -0/+20 |
| |\ \ \ | |||||
| * | | | | proper pronoun | zotlabs | 2018-05-31 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | don't show forums in forum widget if archived flag is set | zotlabs | 2018-05-31 | 1 | -1/+1 |
| | | | | | |||||
* | | | | | finalize filters and forum notifications | Mario Vavti | 2018-06-02 | 3 | -74/+86 |
| | | | | | |||||
* | | | | | some more work on forum notifications | Mario Vavti | 2018-06-02 | 2 | -6/+15 |
| |_|_|/ |/| | | | |||||
* | | | | unread forum notifications - wip/unfinished | Mario Vavti | 2018-06-01 | 3 | -2/+76 |
| | | | | |||||
* | | | | add manage privacy groups entry to the panel channel menu dropdown for now | Mario Vavti | 2018-06-01 | 1 | -0/+2 |
| | | | | |||||
* | | | | fixes for css fix | Mario Vavti | 2018-06-01 | 1 | -0/+7 |
| | | | | |||||
* | | | | add hover effect to dropdown caret | Mario Vavti | 2018-06-01 | 1 | -0/+3 |
| |_|/ |/| | | |||||
* | | | move file and groups filter to submenu | Mario Vavti | 2018-06-01 | 2 | -27/+54 |
| |/ |/| | |||||
* | | implement reset button for filters | Mario Vavti | 2018-05-31 | 1 | -0/+20 |
|/ | |||||
* | change some strings | Mario Vavti | 2018-05-31 | 1 | -4/+4 |
| | |||||
* | 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 | 4 | -24/+67 |
| | | |||||
* | | 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 | 3 | -13/+27 |
| | | |||||
* | | remove redundant reference for order | Mario Vavti | 2018-05-30 | 1 | -5/+0 |
| | | |||||
* | | just query for data we actually need | Mario Vavti | 2018-05-30 | 1 | -2/+6 |
| | | |||||
* | | add widget files and templates | Mario Vavti | 2018-05-30 | 2 | -0/+177 |
| | | |||||
* | | 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 remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-29 | 1 | -0/+2 |
| |\ | |||||
| * \ | Merge pull request #1202 from aninf-wo/dev | git-marijus | 2018-05-29 | 1 | -0/+1 |
| |\ \ | | | | | | | | | include photos.php | ||||
| | * | | include photos.php | Herbert Thielen | 2018-05-27 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | | required for photo_calculate_scale() | ||||
* | | | | provide possibility of using different orderings (post, commented) on ↵ | zotlabs | 2018-05-29 | 1 | -4/+11 |
| |_|/ |/| | | | | | | | | channel page | ||||
* | | | we probably don't need to delivery local items more than once | zotlabs | 2018-05-28 | 1 | -0/+2 |
|/ / | |||||
* / | hubzilla issue #1200 | zotlabs | 2018-05-27 | 1 | -2/+2 |
|/ | |||||
* | DB update to fix wrong hubloc_url for activitypub hublocs | Mario Vavti | 2018-05-26 | 1 | -0/+26 |
| |