aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* select event by event_hash instead of item_idMario Vavti2019-04-305-12/+23
* remove loggingMario Vavti2019-04-301-3/+0
* calendar merge: implement single event editing UIMario Vavti2019-04-305-8/+71
* Merge branch 'dev' into 'dev'Mario2019-04-294-5/+109
|\
| * Merge branch 'dev' of ../hz into devzotlabs2019-04-281-2/+9
| |\
| | * event attachments still weren't being delivered to zot6zotlabs2019-04-281-2/+9
| | * Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-28102-3792/+2900
| | |\
| * | \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-282-12/+8
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'dev' of ../hz into devzotlabs2019-04-273-3/+100
| |\ \ \ | | | |/ | | |/|
| | * | Add jot videos inline and with poster if possiblezotlabs2019-04-273-3/+100
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-272-2/+12
| |\ \ \
| * \ \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-260-0/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'dev' of ../hz into devzotlabs2019-04-262-6/+48
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | import/export zot6 hublocs+xchanszotlabs2019-04-262-6/+48
| * | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-2598-3778/+2880
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | update fix_system_urls() to handle zot6 hublocszotlabs2019-04-251-3/+4
| * | | | | compound name warningzotlabs2019-04-241-1/+0
| * | | | | hubloc confusion during magic auth where hublocs with more than one network m...zotlabs2019-04-246-28/+90
| * | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-2420-592/+1242
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'dev' of ../hm into devzotlabs2019-04-181-1/+1
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-182-12/+6
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-162-12/+6
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-15156-14399/+42049
| |\ \ \ \ \ \ \ \ \
* | | | | | | | | | | calendar merge: d&d support and some minor cleanup and fixesMario Vavti2019-04-293-39/+91
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
* | | | | | | | | | Merge branch 'sql_fixes' into 'dev'Max Kostikov2019-04-282-12/+8
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | improve channel date queryMario Vavti2019-04-271-11/+7
| * | | | | | | | | possible sql performance improvementMario Vavti2019-04-271-1/+1
* | | | | | | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-271-2/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Use goaway() base functionMax Kostikov2019-04-271-2/+1
* | | | | | | | | | update changelogMario Vavti2019-04-261-0/+11
* | | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-262-6/+48
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | import/export zot6 hublocs+xchansZot2019-04-262-6/+48
|/ / / / / / / / /
* | | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-261-3/+4
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to mas...Zot2019-04-261-3/+4
|/ / / / / / / /
* | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-256-28/+89
|\ \ \ \ \ \ \ \
| * | | | | | | | hubloc confusion in magic authZot2019-04-256-28/+89
|/ / / / / / / /
* | | | | | | | update blueimp/jquery-file-uploadMario Vavti2019-04-257-26/+34
* | | | | | | | add missing filesMario Vavti2019-04-252-0/+15
* | | | | | | | update sabre/vobjectMario Vavti2019-04-2591-3752/+2831
* | | | | | | | Revert "update composer libs"Mario2019-04-25102-3125/+3985
* | | | | | | | Revert "fix test"Mario2019-04-251-2/+2
* | | | | | | | Revert "dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9"Mario2019-04-252-3/+3
* | | | | | | | dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9Mario Vavti2019-04-252-3/+3
* | | | | | | | fix testMario Vavti2019-04-251-2/+2
* | | | | | | | update composer libsMario Vavti2019-04-25102-3985/+3125
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-241-14/+21
|\| | | | | |
| * | | | | | Optimize cached photos processingMax Kostikov2019-04-241-11/+13
| * | | | | | Add modified date in Etag hash calculationMax Kostikov2019-04-241-3/+8
* | | | | | | calendar merge: bring back event categoriesMario Vavti2019-04-244-33/+52
* | | | | | | Merge branch 'update-docs' into 'dev'Max Kostikov2019-04-221-105/+164
|\ \ \ \ \ \ \