aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-021-0/+1
|\
| * Add Zap threads supportMax Kostikov2019-05-021-0/+1
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-011-2/+2
|\|
| * Add threaded comments supportMax Kostikov2019-05-011-4/+11
* | Update Item.phpMax Kostikov2019-05-011-9/+5
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-012-7/+7
|\|
| * Fix missprintMax Kostikov2019-05-011-1/+1
| * Use thr_parent for comment repliesMax Kostikov2019-05-011-6/+6
| * Revert code to use thr_parent for comment repliesMax Kostikov2019-05-011-1/+1
* | calendar merge: remove deprecated share variableMario Vavti2019-05-011-20/+2
* | calendar merge: fix event_xchan mixupMario Vavti2019-05-011-6/+0
* | Merge branch 'dev' into 'dev'Mario2019-05-011-5/+33
|\ \
| * | disable directory options when using suggestion mode and only return one page...zotlabs2019-04-301-2/+8
| * | fix suggestion ordering in directory modulezotlabs2019-04-301-3/+25
* | | Merge branch 'dev' into 'dev'Mario2019-05-013-12/+16
|\ \ \ | | |/ | |/|
| * | Add "reply to" hint to submit buttonMax Kostikov2019-04-301-1/+1
| * | Add displaying support for threaded commentsMax Kostikov2019-04-301-1/+1
| * | Add initial threaded comments supportMax Kostikov2019-04-291-6/+10
| * | Add variables for threaded comments supportMax Kostikov2019-04-291-5/+5
* | | do not allow editing events that do not belong to usMario Vavti2019-04-301-0/+5
* | | select event by event_hash instead of item_idMario Vavti2019-04-304-12/+19
* | | calendar merge: implement single event editing UIMario Vavti2019-04-304-4/+45
* | | Merge branch 'dev' into 'dev'Mario2019-04-294-5/+109
|\ \ \ | | |/ | |/|
| * | 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-282-13/+8
| |\ \
| * | | Add jot videos inline and with poster if possiblezotlabs2019-04-273-3/+100
| * | | import/export zot6 hublocs+xchanszotlabs2019-04-261-6/+41
| * | | hubloc confusion during magic auth where hublocs with more than one network m...zotlabs2019-04-243-7/+29
* | | | calendar merge: d&d support and some minor cleanup and fixesMario Vavti2019-04-291-2/+11
| |/ / |/| |
* | | Merge branch 'sql_fixes' into 'dev'Max Kostikov2019-04-281-11/+7
|\ \ \
| * | | improve channel date queryMario Vavti2019-04-271-11/+7
* | | | Merge branch 'dev' into 'dev'Max Kostikov2019-04-271-2/+1
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Use goaway() base functionMax Kostikov2019-04-271-2/+1
* | | import/export zot6 hublocs+xchansZot2019-04-261-6/+41
* | | hubloc confusion in magic authZot2019-04-253-7/+29
| |/ |/|
* | 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-242-29/+31
* | resolve merge conflictMario Vavti2019-04-201-0/+1
|\ \
| * | Merge branch 'dev' into 'dev'Max Kostikov2019-04-191-0/+1
| |\|
| | * Add translation to update buttonMax Kostikov2019-04-191-0/+1
* | | Merge branch 'dev' into calendar_mergeMario Vavti2019-04-191-4/+30
|\| |
| * | Merge branch 'dev' into 'dev'Mario2019-04-191-4/+30
| |\|
| | * Add remove profile photo buttonMax Kostikov2019-04-191-4/+30
* | | provide location and description informationMario Vavti2019-04-192-6/+13
* | | provide link to source and some cleanupMario Vavti2019-04-193-140/+4
* | | Merge branch 'dev' into calendar_mergeMario Vavti2019-04-193-32/+15
|\| |
| * | Merge branch 'dev' into 'dev'Mario2019-04-191-1/+1
| |\ \
| | * | required php version not available but allowed to continuezotlabs2019-04-181-1/+1
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 09:02:17 +0000