aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | just comment out is_edit_activity() call and add comments on why it is ↵Mario2020-04-121-0/+34
| | | | | | | | | | | | commented out
* | | function is_edit_activity() is obsoleteMario2020-04-121-26/+0
|/ /
* | move from build_sync_packet() to Libsync::build_sync_packet()Mario2020-04-0953-87/+158
| |
* | remove voting from UI in favour of pollsMario2020-04-083-27/+1
| |
* | update 1236: we have seen situations in the wild where a zot6 xchan was ↵Mario2020-04-081-13/+33
| | | | | | | | present while its hubloc was missing. fix those separately if required so that we cover both situations.
* | Merge branch 'dev' into 'dev'Max Kostikov2020-04-081-4/+6
|\| | | | | | | | | Fix process id disclouse See merge request hubzilla/core!1848
| * Merge branch 'dev' into 'dev'Max Kostikov2020-04-0816-115/+247
| |\ | |/ |/| | | # Conflicts: # Zotlabs/Daemon/Expire.php
* | owa: look for zot6 firstMario2020-04-061-3/+3
| |
* | another import fix and do not allow importing channels < version 4.7.4 for ↵Mario2020-04-052-2/+8
| | | | | | | | zot6 compatibility reasons
* | more mod import fixesMario2020-04-051-2/+2
| |
* | fix mod importMario2020-04-051-57/+55
| |
* | fix warning if iconfig value is an arrayMario2020-04-051-1/+1
| |
* | show event timezone only if adjust ist set and the offset of the event ↵Mario2020-04-052-6/+17
| | | | | | | | timezone is different from the channel default timezone offset
* | show event timezone if it differs from the channel default timezoneMario2020-04-052-2/+18
| |
* | fix unseen forum posts countMario2020-04-051-1/+1
| |
* | another attempt to get events rightMario2020-04-042-30/+36
| |
* | Revert "more timezone changes"Mario2020-04-032-9/+7
| | | | | | This reverts commit cec2e92fe381a5e4bb67426290303639dd260358
* | Revert "use timezone info for timezone display only- the actual time is in ↵Mario2020-04-031-5/+9
| | | | | | | | | | utc already." This reverts commit 625438ff642381472b4ba6c86bad7f26f69e8083
* | Revert "set timezone iconfig a little earlier in the process so that it will ↵Mario2020-04-031-3/+1
| | | | | | | | | | be included in the object" This reverts commit 6cfaa5cba32eb1e7f2b4a0ba6bb281ebd610a54b
* | more timezone changesMario2020-04-032-7/+9
| |
* | use timezone info for timezone display only- the actual time is in utc already.Mario2020-04-031-9/+5
| |
* | set timezone iconfig a little earlier in the process so that it will be ↵Mario2020-04-031-1/+3
| | | | | | | | included in the object
* | Merge branch 'dev' into 'dev'Mario2020-04-033-4/+25
|\ \ | | | | | | | | | | | | fix app links in DB when doing a site rename See merge request hubzilla/core!1846
| * | issue 1454 - some photo item ActivityStreams links not returning json-ld; ↵zotlabs2020-03-242-4/+9
| | | | | | | | | | | | requires related fixes in addons/pubcrawl
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2020-03-12104-520/+1039
| |\ \
| * | | fix app links in DB when doing a site renamezotlabs2020-03-111-0/+16
| | | |
* | | | Merge branch 'dev' into 'dev'Mario2020-04-031-0/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Avoid multiple run of expiry procedure on large sites See merge request hubzilla/core!1847
| * | | | Avoid multiple run of expiry procedure on large sitesMax Kostikov2020-04-031-0/+9
| | | | |
* | | | | ATOM_TIME format is not compatible with the DBMario2020-04-021-2/+2
| | | | |
* | | | | bump versionMario2020-04-011-1/+1
| | | | |
* | | | | fix outgoing mails to zot connectionsMario2020-04-011-4/+10
|/ / / /
* | | | cheat with guid_sig to reflect transition to zot6 and re-enable transition ↵Mario2020-04-013-3/+3
| | | | | | | | | | | | | | | | of connections
* | | | do not enable transition of connections yetMario2020-04-012-2/+2
| | | |
* | | | transition connections to zot6 if their site has been updatedMario2020-04-014-4/+72
| | | |
| | | * Fix process id disclouseMax Kostikov2020-04-081-4/+6
| | | |
| | | * Use config instead pconfigMax Kostikov2020-04-011-3/+3
| | | |
| | | * Use pconfigMax Kostikov2020-03-311-4/+4
| | | |
| | | * Use POSIX kill 0 to check expire process statusMax Kostikov2020-03-311-1/+1
| | | |
| | | * Check if POSIX PHP module is available on PID checkMax Kostikov2020-03-311-1/+1
| | | |
| | | * Add check if expire procedure is still runningMax Kostikov2020-03-311-1/+1
| | | |
| | | * Update Expire.phpMax Kostikov2020-03-311-5/+5
| | | |
| | | * Avoid multiple run of expiry procedure on large sitesMax Kostikov2020-03-311-0/+9
| | | |
| | | * Merge branch 'dev' into 'dev'Max Kostikov2020-03-3120-168/+1315
| | | |\ | |_|_|/ |/| | | | | | | | | | | Sync dev See merge request kostikov/core!2
* | | | use Libsync::build_sync_packet() in mod item, default Lib/Queue driver to ↵Mario2020-03-294-44/+46
| | | | | | | | | | | | | | | | zot6 and some whitespace cleanup in queue_deliver()
* | | | fix check for existing hublocsMario2020-03-291-1/+2
| | | |
* | | | port fhublocs to zot6 and fix issue with primary detectionMario2020-03-291-9/+27
| | | |
* | | | Merge branch 'z6connect' into 'dev'Mario2020-03-2815-115/+1111
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Transition to zot6 See merge request hubzilla/core!1823
| * | | prevent mod fhublocs breaking things. it needs porting to zot6 but has no ↵Mario2020-03-281-0/+3
| | | | | | | | | | | | | | | | priority for now.
| * | | fix z6_discover() to do the right thing after transitionMario2020-03-261-2/+2
| | | |
| * | | do not use channel_portable_id in process_channel_sync_delivery(). we should ↵Mario2020-03-252-5/+5
| | | | | | | | | | | | | | | | only accept sync packages from channels which are already transitioned to zot6.