aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' into calendar_mergeMario Vavti2019-04-191-1/+6
|\
| * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-155-46/+92
| |\
| * | add attachments to zot6 event objects, add zot6 to federated transports ↵zotlabs2019-04-151-1/+6
| | | | | | | | | | | | (webfinger)
* | | calendar merge initial commitMario Vavti2019-04-191-0/+4
| |/ |/|
* | Update xchan profile edited date only onceMax Kostikov2019-04-131-9/+10
| |
* | Set 'os_syspath' with local pathMax Kostikov2019-04-121-1/+2
| |
* | Override received 'content' if we saving thumbnail in filesystemMax Kostikov2019-04-121-0/+1
| |
* | Fix 'os_syspath' if we store thumbnails in filesystemMax Kostikov2019-04-121-1/+3
| |
* | Add comment on required changes in upcoming releasesMax Kostikov2019-04-121-31/+47
| |
* | Store thumbnails in filesystem or databaseMax Kostikov2019-04-121-6/+3
| |
* | Fetch thumbnails and store it in filesystem or DB; update xchan profile edit ↵Max Kostikov2019-04-121-4/+22
| | | | | | | | time on fetch
* | Fix use UNIX socket file to connect DBMax Kostikov2019-04-101-1/+1
| |
* | Merge branch 'dev' into 'dev'Mario2019-04-101-4/+12
|\| | | | | | | | | Dev See merge request hubzilla/core!1586
| * Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devzotlabs2019-04-071-8/+0
| |\
| * | permissions cleanupzotlabs2019-04-051-4/+12
| | |
* | | Revert "Update htconfig.sample.php"Max Kostikov2019-04-102-5/+15
| |/ |/| | | | | This reverts commit f2126ef18c8b66020305d07dcefeacc4e55a3c12
* | Merge branch 'dev' into 'dev'Mario2019-04-061-3/+3
|\| | | | | | | | | security: perms_pending not evaluated correctly See merge request hubzilla/core!1583
| * Merge branch 'dev' of ../hz into devzotlabs2019-04-051-3/+3
| |\
| | * security: perms_pending not evaluated correctlyzotlabs2019-04-051-3/+3
| | |
* | | Remove suggest channels from featuresMario2019-04-021-8/+0
|/ /
* | check service class limits when syncing fileszotlabs2019-03-301-0/+14
| |
* | Merge branch 'z6_discover_fixes' into 'dev'Max Kostikov2019-03-291-4/+6
|\ \ | | | | | | | | | | | | fix various issues in z6_discover() and add zot6 hubloc creation on channel import See merge request hubzilla/core!1575
| * | another fix for z6_discover() and create a zot6 hubloc if applicableMario Vavti2019-03-281-1/+1
| | |
| * | fix various issues in z6_discover()Mario Vavti2019-03-271-3/+5
| | |
* | | Fix wrong bracketMax Kostikov2019-03-271-2/+2
| | |
* | | Fix wrong permissions on attached images in personal messagesMax Kostikov2019-03-271-2/+2
|/ /
* | if we have an uuid deduplicate by uuid otherwise by midMario Vavti2019-03-251-5/+15
| |
* | fix wrong field nameMario Vavti2019-03-241-2/+2
| |
* | Revert "item_store(): deduplicate by mid OR uuid"Mario Vavti2019-03-241-2/+1
| | | | | | | | This reverts commit d8ce0d0df0b7b58b3f2a1abfc26f455fb943f8ea.
* | item_store(): deduplicate by mid OR uuidMario Vavti2019-03-241-1/+2
| |
* | Merge branch 'dev' into 'dev'Mario2019-03-211-0/+1
|\ \ | | | | | | | | | | | | hubzilla core issue #1356 , permissions not getting decrypted on follow See merge request hubzilla/core!1563
| * | hubzilla core issue #1356 , permissions not getting decrypted on followzotlabs2019-03-201-0/+1
| |/
* | another whitespace to trigger testsMario Vavti2019-03-211-1/+0
| |
* | just whitespace to trigger a new build testMario Vavti2019-03-201-1/+0
| |
* | VideoMario2019-03-201-0/+22
|/
* Merge branch 'dev' of ../hz into devzotlabs2019-03-181-2/+6
|\
| * messagefilter enhancements, fix edge case in unsupported advisory privacyzotlabs2019-03-181-2/+6
| |
* | clone systems apps to the extent possible, auto-configure imagick thumbnail ↵zotlabs2019-03-172-1/+99
|/ | | | binary during setup if possible
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devMike Macgirvin2019-03-188-63/+42
|\
| * Merge branch 'dev' into 'dev'Mario2019-03-151-2/+5
| |\ | | | | | | | | | | | | email_header_encode() producing output that is not spec compliant See merge request hubzilla/core!1555
| * | Cleanup and fixesMario2019-03-158-63/+42
| | |
* | | use php_eol for all mail header generationzotlabs2019-03-161-2/+2
| | |
* | | use the php_eol constant for encoded subjectszotlabs2019-03-161-1/+1
| |/ |/|
* | Merge branch 'dev' of ../hz into devzotlabs2019-03-141-2/+5
|\ \ | |/ |/|
| * email_header_encode() producing lines of illegal length because header field ↵zotlabs2019-03-141-2/+5
| | | | | | | | length was not considered in length calculation.
* | Merge branch 'dev' of ../hz into devzotlabs2019-03-131-2/+2
|\|
| * signature issue for zot6 content imported from zotfeeds to hubzillazotlabs2019-03-131-2/+2
| |
* | find unregistered z6 clones on hubzilla sites (does not happen automatically ↵zotlabs2019-03-131-0/+36
|/ | | | since z6 is not the default protocol on hubzilla). This will need to be pushed to master for the next point release.
* Merge branch 'dev' of https://gitlab.com/macgirvin/hubzilla into devMike Macgirvin2019-03-132-59/+190
|\
| * typoszotlabs2019-03-121-8/+8
| |