aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-291-0/+1
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-291-0/+2
| |\
| * \ Merge pull request #1202 from aninf-wo/devgit-marijus2018-05-291-0/+1
| |\ \ | | | | | | | | include photos.php
| | * | include photos.phpHerbert Thielen2018-05-271-0/+1
| | | | | | | | | | | | | | | | required for photo_calculate_scale()
* | | | provide possibility of using different orderings (post, commented) on ↵zotlabs2018-05-291-4/+11
| |_|/ |/| | | | | | | | channel page
* | | we probably don't need to delivery local items more than oncezotlabs2018-05-281-0/+2
|/ /
* / hubzilla issue #1200zotlabs2018-05-271-2/+2
|/
* DB update to fix wrong hubloc_url for activitypub hublocsMario Vavti2018-05-261-0/+26
|
* differentiate between direct messages and followers-only messagesMario Vavti2018-05-251-2/+6
|
* paint the locks on private activitypub items red. their privacy model is ↵Mario Vavti2018-05-231-0/+4
| | | | "slightly" different from ours
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-214-10/+11
|\
| * missing permission descriptionMario Vavti2018-05-213-6/+3
| |
| * bring jot reset to some more placesMario Vavti2018-05-214-4/+8
| |
* | new_channel - make text strings translatable and use the name as a base for ↵zotlabs2018-05-211-3/+17
| | | | | | | | the nick if you try to create without entering a nick
* | update response typeszotlabs2018-05-211-1/+1
| |
* | oauth2 discovery per draft-ietf-oauth-discovery-10zotlabs2018-05-212-1/+32
| |
* | add hook 'get_system_apps'zotlabs2018-05-211-0/+2
|/
* update oauth related tables to use bigint/int(10) for user_id column. this ↵Mario2018-05-202-1/+59
| | | | is to be more consistent with the rest of the tables and fixes issue #1180
* improve abconfig queriesMario Vavti2018-05-201-0/+28
|
* more local_channel() is not stringMario Vavti2018-05-201-10/+10
|
* local_channel() is not stringMario Vavti2018-05-201-3/+3
|
* Merge pull request #1174 from anaqreon/devgit-marijus2018-05-201-1/+1
|\ | | | | Rename Permission Groups to Permission Categories and clarify feature…
| * Rename Permission Groups to Permission Categories and clarify feature ↵Andrew Manning2018-05-151-1/+1
| | | | | | | | settings text.
* | implement jot reset buttonMario Vavti2018-05-201-1/+2
| |
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-191-2/+6
|\ \
| * | hubzilla issue #1086, pending count on admin summary pagezotlabs2018-05-191-2/+6
| | |
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-193-5/+6
|\| |
| * | wrong default param for pubstream_incl (this checkin also picked up a few ↵zotlabs2018-05-183-5/+6
| | | | | | | | | | | | minor and hopefully non-significant changes)
* | | an attempt to fix the new_channel validation situationMario Vavti2018-05-181-4/+7
|/ /
* | missing includeMario Vavti2018-05-161-0/+1
| |
* | provide function to fetch photo contents from urlzotlabs2018-05-152-10/+7
|/
* we must now provide the full path to the profile image for the cavatar ↵Mario Vavti2018-05-153-11/+11
| | | | plugin to work
* code whitespace and formattingzotlabs2018-05-141-6/+6
|
* If somebody used hooks to create a new permission role, there was no ↵zotlabs2018-05-141-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?' logiczotlabs2018-05-144-8/+7
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-142-5/+5
|\
| * streamline appearence of guest tokens individual perms with those in conneditMario Vavti2018-05-131-3/+3
| |
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-131-2/+10
| |\
| * | fix php warningMario Vavti2018-05-121-2/+2
| | |
* | | more refactor tags/mentionszotlabs2018-05-141-1/+1
| |/ |/|
* | hubzilla issue #1045 - display pubsites link in info area if invite onlyzotlabs2018-05-121-2/+10
|/
* add cancel button to editor, fix issue with autosave of categorieszotlabs2018-05-107-0/+7
|
* add top level posts containing the cid's url to the cid search in ↵zotlabs2018-05-101-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 #1169zotlabs2018-05-102-1/+88
|
* Change hovertip on paperclip button to read 'Attach/Upload file' because a ↵zotlabs2018-05-091-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 pagezotlabs2018-05-091-0/+3
|
* show/hide dot files only in mod_cloud. For DAV let the OS decidezotlabs2018-05-091-1/+1
|
* hide dotfiles by default in /cloud - the web interface (they are still ↵zotlabs2018-05-081-0/+2
| | | | accessible but hidden). Change this behaviour with pconfig system.show_dot_files
* initial backend support for channel page item searchzotlabs2018-05-081-2/+18
|
* changes made during testing imagick scaling for cover photo thumbnailzotlabs2018-05-081-4/+6
|