Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| | * | 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 | ||||
* / | hubzilla issue #1200 | zotlabs | 2018-05-27 | 1 | -2/+2 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-21 | 4 | -10/+11 |
|\ | |||||
| * | missing permission description | Mario Vavti | 2018-05-21 | 3 | -6/+3 |
| | | |||||
| * | bring jot reset to some more places | Mario Vavti | 2018-05-21 | 4 | -4/+8 |
| | | |||||
* | | new_channel - make text strings translatable and use the name as a base for ↵ | zotlabs | 2018-05-21 | 1 | -3/+17 |
| | | | | | | | | the nick if you try to create without entering a nick | ||||
* | | update response types | zotlabs | 2018-05-21 | 1 | -1/+1 |
| | | |||||
* | | oauth2 discovery per draft-ietf-oauth-discovery-10 | zotlabs | 2018-05-21 | 2 | -1/+32 |
|/ | |||||
* | update oauth related tables to use bigint/int(10) for user_id column. this ↵ | Mario | 2018-05-20 | 1 | -1/+2 |
| | | | | is to be more consistent with the rest of the tables and fixes issue #1180 | ||||
* | more local_channel() is not string | Mario Vavti | 2018-05-20 | 1 | -10/+10 |
| | |||||
* | local_channel() is not string | Mario Vavti | 2018-05-20 | 1 | -3/+3 |
| | |||||
* | implement jot reset button | Mario Vavti | 2018-05-20 | 1 | -1/+2 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-19 | 1 | -2/+6 |
|\ | |||||
| * | hubzilla issue #1086, pending count on admin summary page | zotlabs | 2018-05-19 | 1 | -2/+6 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-19 | 3 | -5/+6 |
|\| | |||||
| * | wrong default param for pubstream_incl (this checkin also picked up a few ↵ | zotlabs | 2018-05-18 | 3 | -5/+6 |
| | | | | | | | | minor and hopefully non-significant changes) | ||||
* | | an attempt to fix the new_channel validation situation | Mario Vavti | 2018-05-18 | 1 | -4/+7 |
|/ | |||||
* | missing include | Mario Vavti | 2018-05-16 | 1 | -0/+1 |
| | |||||
* | provide function to fetch photo contents from url | zotlabs | 2018-05-15 | 2 | -10/+7 |
| | |||||
* | we must now provide the full path to the profile image for the cavatar ↵ | Mario Vavti | 2018-05-15 | 3 | -11/+11 |
| | | | | plugin to work | ||||
* | code whitespace and formatting | zotlabs | 2018-05-14 | 1 | -6/+6 |
| | |||||
* | refactor the 'where does the register link point?' logic | zotlabs | 2018-05-14 | 4 | -8/+7 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-05-14 | 1 | -3/+3 |
|\ | |||||
| * | streamline appearence of guest tokens individual perms with those in connedit | Mario Vavti | 2018-05-13 | 1 | -3/+3 |
| | | |||||
* | | more refactor tags/mentions | zotlabs | 2018-05-14 | 1 | -1/+1 |
|/ | |||||
* | hubzilla issue #1045 - display pubsites link in info area if invite only | zotlabs | 2018-05-12 | 1 | -2/+10 |
| | |||||
* | add cancel button to editor, fix issue with autosave of categories | zotlabs | 2018-05-10 | 7 | -0/+7 |
| |