aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* fix sql errorMario Vavti2018-07-261-1/+1
| | | (cherry picked from commit ec3a066e4e94ad7c72d1d07371081318a4d5e9ab)
* Merge branch '3.6RC'Mario Vavti2018-07-2525-481/+639
|\
| * query filter was a bit greedyzotlabs2018-07-191-1/+1
| | | | | | (cherry picked from commit a05c8ff66bd8d09f69f6c59bc49b7627792f4109)
| * mangled urls on redirectszotlabs2018-07-193-4/+4
| | | | | | (cherry picked from commit 5ce50d0a2e15ae66765a68ba2785a87ecda57f6a)
| * set the correct album name when moving photosMario Vavti2018-07-181-1/+3
| | | | | | (cherry picked from commit eb322e831297ee8fd773049c1a00c915c49dc93e)
| * fix to cart behaviourzotlabs2018-07-111-1/+1
| |
| * change to import system apps at most once a day per personzotlabs2018-07-051-2/+2
| |
| * issue syncing pageflagszotlabs2018-07-041-8/+5
| |
| * bad mergezotlabs2018-07-011-0/+4
| |
| * imagick converter: -thumbnail doesn't preserve exif, -resize doeszotlabs2018-06-261-3/+3
| |
| * crc32 is potentially reversiblezotlabs2018-06-251-1/+1
| |
| * SECURITY: logging: hash the session_id in case somebody posts log snippets ↵zotlabs2018-06-251-3/+10
| | | | | | | | from active sessions; also provide a hashed process_id if using a daemon process (with no session) for easier tracking of related log events
| * remove the white-space pre-wrap property on code blocks. This should ↵zotlabs2018-06-241-8/+2
| | | | | | | | probably be done with the word-break property instead
| * remote_self wasn't working correctlyzotlabs2018-06-241-5/+6
| |
| * whitespacezotlabs2018-06-181-2/+0
| |
| * provide flag to collect_recipients to exclude privacy groups (for federation ↵zotlabs2018-06-181-2/+8
| | | | | | | | plugin use)
| * remove several unused/unreferenced templateszotlabs2018-06-171-0/+12
| |
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-06-172-10/+11
| |\
| | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario2018-06-174-5/+8
| | |\
| | * | some work on mod groupMario2018-06-172-10/+11
| | | |
| * | | slightly more memory efficient way to drop posts of removed connectionszotlabs2018-06-151-7/+8
| | |/ | |/|
| * | re-implement/refactor getQuotaInfo() on DAV storagezotlabs2018-06-141-1/+1
| | |
| * | Merge branch 'master' of ../hz into devzotlabs2018-06-103-4/+7
| |\ \ | | |/ | |/|
| | * hubzilla core issue #1218zotlabs2018-06-101-0/+5
| | |
| | * fixes for immediate expire, channel_active not initialised in DBzotlabs2018-06-102-4/+2
| | |
| * | new feature filter network by nameMario Vavti2018-06-081-1/+10
| |/
| * fixes for search_item.tplMario Vavti2018-06-071-4/+6
| |
| * update a number of links in the codezotlabs2018-06-061-1/+1
| |
| * photos not syncing properly if destination is a postgres sitezotlabs2018-06-042-13/+28
| |
| * missing $perm_sqlMario Vavti2018-06-031-2/+0
| |
| * add the archived flagMario Vavti2018-06-021-1/+1
| |
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-06-021-2/+7
| |\
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-06-022-16/+4
| | |\
| | * | when removing a connection, use the same rules as expire: don't remove items ↵zotlabs2018-05-311-2/+7
| | | | | | | | | | | | | | | | that are starred, filed, or that you replied to.
| * | | respect the privacy group feature setting in navMario Vavti2018-06-021-2/+2
| | | |
| * | | finalize filters and forum notificationsMario Vavti2018-06-023-15/+56
| | |/ | |/|
| * | add manage privacy groups entry to the panel channel menu dropdown for nowMario Vavti2018-06-011-15/+3
| | |
| * | fixes for css fixMario Vavti2018-06-011-1/+1
| |/
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-311-1/+1
| |\
| | * typo in unused functionzotlabs2018-05-301-1/+1
| | |
| * | make navbar search use the module search function in /network and /channelMario Vavti2018-05-301-1/+13
| | |
| * | first cut on restructuring the previously called network tabsMario Vavti2018-05-303-12/+32
| |/
| * alternate fix for z_check_dnszotlabs2018-05-241-6/+14
| |
| * deal with db failure gracefullyzotlabs2018-05-231-2/+2
| |
| * new_channel - make text strings translatable and use the name as a base for ↵zotlabs2018-05-211-0/+10
| | | | | | | | the nick if you try to create without entering a nick
| * not null violation oauth1zotlabs2018-05-211-1/+1
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-05-203-5/+15
| |\
| | * Merge pull request #1174 from anaqreon/devgit-marijus2018-05-201-2/+2
| | |\ | | | | | | | | Rename Permission Groups to Permission Categories and clarify feature…
| | | * Rename Permission Groups to Permission Categories and clarify feature ↵Andrew Manning2018-05-151-2/+2
| | | | | | | | | | | | | | | | settings text.
| | * | implement jot reset buttonMario Vavti2018-05-201-1/+5
| | | |