aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Module
Commit message (Expand)AuthorAgeFilesLines
* form security token for mod register ported from zapMario Vavti2019-05-131-4/+8
* calendar merge: implement channel calendar import in cdav/calendarMario Vavti2019-05-103-18/+15
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-091-18/+1
|\
| * remove the caldav and event app and make calendar the default appMario Vavti2019-05-091-18/+1
* | Merge branch 'dev' into 'dev'Max Kostikov2019-05-091-0/+1
|\ \ | |/ |/|
| * Add 'Create' button translationMax Kostikov2019-05-091-0/+1
* | calendar merge: cleanup and comment out some unused codeMario Vavti2019-05-092-68/+56
|/
* Update Photos.phpMax Kostikov2019-05-081-1/+1
* Respect thumbnail storage location on image editingMax Kostikov2019-05-081-77/+35
* port db update improvements from zapMario Vavti2019-05-031-2/+43
* update directory on cover photo changesMario Vavti2019-05-031-2/+7
* Merge branch 'unfriend_delete_posts_bug' into 'dev'Mario2019-05-032-0/+64
|\
| * emojireaction compatzotlabs2019-05-021-0/+8
| * move apschema to core to use for emojiReaction mapping for zot6zotlabs2019-05-021-0/+56
* | 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' of https://framagit.org/hubzilla/core into devzotlabs2019-04-282-13/+8
| |\ \
* | \ \ Merge branch 'dev' into 'dev'Mario2019-05-012-7/+11
|\ \ \ \ | | |_|/ | |/| |
| * | | Add displaying support for threaded commentsMax Kostikov2019-04-301-1/+1
| * | | Add initial threaded comments supportMax Kostikov2019-04-291-6/+10
* | | | 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-303-3/+44
* | | | Merge branch 'dev' into 'dev'Mario2019-04-293-3/+100
|\ \ \ \
| * \ \ \ Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-04-281-11/+7
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge branch 'dev' of ../hz into devzotlabs2019-04-273-3/+100
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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-242-6/+24
* | | | | 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-252-6/+24
| |/ |/|
* | 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
| |\|
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-16 12:20:25 +0000