aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-06-024-0/+86
|\
| * unread forum notifications - wip/unfinishedMario Vavti2018-06-013-2/+76
| |
| * add manage privacy groups entry to the panel channel menu dropdown for nowMario Vavti2018-06-011-0/+2
| |
| * fixes for css fixMario Vavti2018-06-011-0/+7
| |
| * add hover effect to dropdown caretMario Vavti2018-06-011-0/+3
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-06-012-27/+54
|\|
| * move file and groups filter to submenuMario Vavti2018-06-012-27/+54
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-311-0/+20
|\|
| * implement reset button for filtersMario Vavti2018-05-311-0/+20
| |
* | proper pronounzotlabs2018-05-311-1/+1
| |
* | don't show forums in forum widget if archived flag is setzotlabs2018-05-311-1/+1
|/
* change some stringsMario Vavti2018-05-311-4/+4
|
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-311-2/+1
|\
| * autocomplete private mail addresses based on substring in either the name or ↵zotlabs2018-05-301-2/+1
| | | | | | | | webbie (prevously required an '@' to trigger a webbie search)
* | merge groups and filed posts into activity filtersMario Vavti2018-05-314-24/+67
| |
* | strpos does not work with arrays :(Mario Vavti2018-05-302-2/+2
| |
* | restrict the network/channel navbar search to content and hashtagsMario Vavti2018-05-302-0/+6
| |
* | make navbar search use the module search function in /network and /channelMario Vavti2018-05-303-13/+27
| |
* | remove redundant reference for orderMario Vavti2018-05-301-5/+0
| |
* | just query for data we actually needMario Vavti2018-05-301-2/+6
| |
* | add widget files and templatesMario Vavti2018-05-302-0/+177
| |
* | first cut on restructuring the previously called network tabsMario Vavti2018-05-301-4/+17
|/
* 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)