Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | 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 | |
| | ||||||
* | differentiate between direct messages and followers-only messages | Mario Vavti | 2018-05-25 | 1 | -2/+6 | |
| | ||||||
* | paint the locks on private activitypub items red. their privacy model is ↵ | Mario Vavti | 2018-05-23 | 1 | -0/+4 | |
| | | | | "slightly" different from ours | |||||
* | 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 | |
| | | ||||||
* | | add hook 'get_system_apps' | zotlabs | 2018-05-21 | 1 | -0/+2 | |
|/ | ||||||
* | update oauth related tables to use bigint/int(10) for user_id column. this ↵ | Mario | 2018-05-20 | 2 | -1/+59 | |
| | | | | is to be more consistent with the rest of the tables and fixes issue #1180 | |||||
* | improve abconfig queries | Mario Vavti | 2018-05-20 | 1 | -0/+28 | |
| | ||||||
* | 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 | |
| | ||||||
* | Merge pull request #1174 from anaqreon/dev | git-marijus | 2018-05-20 | 1 | -1/+1 | |
|\ | | | | | Rename Permission Groups to Permission Categories and clarify feature… | |||||
| * | Rename Permission Groups to Permission Categories and clarify feature ↵ | Andrew Manning | 2018-05-15 | 1 | -1/+1 | |
| | | | | | | | | settings text. | |||||
* | | 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 | |
| | ||||||
* | If somebody used hooks to create a new permission role, there was no ↵ | zotlabs | 2018-05-14 | 1 | -0/+2 | |
| | | | | mechanism to insert the new role into the dropdown list of roles at selection time. | |||||
* | 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 | 2 | -5/+5 | |
|\ | ||||||
| * | streamline appearence of guest tokens individual perms with those in connedit | Mario Vavti | 2018-05-13 | 1 | -3/+3 | |
| | | ||||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-13 | 1 | -2/+10 | |
| |\ | ||||||
| * | | fix php warning | Mario Vavti | 2018-05-12 | 1 | -2/+2 | |
| | | | ||||||
* | | | 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 | |
| | ||||||
* | add top level posts containing the cid's url to the cid search in ↵ | zotlabs | 2018-05-10 | 1 | -1/+1 | |
| | | | | mod_network. We could alternatively search for mention tags here for a bit more precision but the sql could get pretty hairy with all the joins going on. | |||||
* | hubzilla issue #1169 | zotlabs | 2018-05-10 | 2 | -1/+88 | |
| | ||||||
* | Change hovertip on paperclip button to read 'Attach/Upload file' because a ↵ | zotlabs | 2018-05-09 | 1 | -1/+1 | |
| | | | | lot of people gravitate to 'insert photo from album' instead, looking for a way to upload into the post. | |||||
* | minor regression on date queries from channel page | zotlabs | 2018-05-09 | 1 | -0/+3 | |
| | ||||||
* | show/hide dot files only in mod_cloud. For DAV let the OS decide | zotlabs | 2018-05-09 | 1 | -1/+1 | |
| | ||||||
* | hide dotfiles by default in /cloud - the web interface (they are still ↵ | zotlabs | 2018-05-08 | 1 | -0/+2 | |
| | | | | accessible but hidden). Change this behaviour with pconfig system.show_dot_files | |||||
* | initial backend support for channel page item search | zotlabs | 2018-05-08 | 1 | -2/+18 | |
| | ||||||
* | changes made during testing imagick scaling for cover photo thumbnail | zotlabs | 2018-05-08 | 1 | -4/+6 | |
| | ||||||
* | use imagemagick first stage thumbnail for cover photos, if configured | zotlabs | 2018-05-07 | 1 | -4/+33 | |
| |