aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* do not allow editing events that do not belong to usMario Vavti2019-04-302-1/+10
|
* 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
|\ | | | | | | | | Add jot videos inline and with poster if possible See merge request hubzilla/core!1613
| * 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 ↵zotlabs2019-04-246-28/+90
| | | | | | | | | | | | | | | | | | | | | | | | may exist
| * | | | | 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
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | possible sql performance improvement See merge request hubzilla/core!1611
| * | | | | | | | | 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 function See merge request hubzilla/core!1612
| * | | | | | | | | 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+xchans See merge request hubzilla/core!1610
| * | | | | | | | | 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 master) See merge request hubzilla/core!1609
| * | | | | | | | update fix_system_urls() to handle zot6 hublocs (recommend cherry-pick to ↵Zot2019-04-261-3/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | master)
* | | | | | | | Merge branch 'dev' into 'dev'Mario2019-04-256-28/+89
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hubloc confusion in magic auth See merge request hubzilla/core!1608
| * | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e779335d060b3a51d6a144d23af4097ae6801473
* | | | | | | | Revert "fix test"Mario2019-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit c5fca0a1e784130b0e6f7aeee0bc36999f120bbf
* | | | | | | | Revert "dbunit does not work wirh phpunit v 8.1.3 - try 7.5.9"Mario2019-04-252-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 8401e9c2b4bca3bf19eb7590f827b7169f4647d9
* | | | | | | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add modification date in Etag hash calculation and optimize cached photos processing See merge request hubzilla/core!1607
| * | | | | | 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
| | | | | | |