aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* don't do oembed processing on naked links and smarty lib cleanup. ported from...Mario Vavti2019-05-132-36/+45
* form security token for mod register ported from zapMario Vavti2019-05-131-4/+8
* Merge branch 'dev' into 'dev'Mario2019-05-111-10/+10
|\
| * use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendere...zotlabs2019-05-091-10/+10
* | typoMario Vavti2019-05-101-1/+1
* | calendar merge: implement channel calendar import in cdav/calendarMario Vavti2019-05-104-20/+18
|/
* Merge branch 'dev' into 'dev'Max Kostikov2019-05-093-21/+29
|\
| * remove the caldav and event app and make calendar the default appMario Vavti2019-05-093-21/+29
* | 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-093-69/+57
* | another DB update to fix uid_mid index in item table and add xchan_photo_m in...Mario Vavti2019-05-081-0/+38
* | Channel updateMario2019-05-081-0/+47
|/
* Update Photos.phpMax Kostikov2019-05-081-1/+1
* Update PhotoDriver.phpMax Kostikov2019-05-081-13/+3
* Respect thumbnail storage location on image editingMax Kostikov2019-05-081-77/+35
* Add photo usage detection if not exist on thumbnail saveMax Kostikov2019-05-081-0/+12
* Use own variable for "Go to previous comment" hintMax Kostikov2019-05-051-1/+2
* Add arrows to scroll between related commentsMax Kostikov2019-05-051-7/+5
* port db update improvements from zapMario Vavti2019-05-032-3/+51
* update directory on cover photo changesMario Vavti2019-05-031-2/+7
* Merge branch 'replyto_fixes' into 'dev'Mario2019-05-031-3/+3
|\
| * more provide xchan_url if there is no xchan_addrMario Vavti2019-05-021-2/+2
| * provide xchan_url if there is no xchan_addrMario Vavti2019-05-021-1/+1
* | Merge branch 'unfriend_delete_posts_bug' into 'dev'Mario2019-05-033-2/+70
|\ \
| * | emojireaction compatzotlabs2019-05-022-0/+12
| * | move apschema to core to use for emojiReaction mapping for zot6zotlabs2019-05-022-2/+58
* | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-0217-52/+935
|\ \ \ | | |/ | |/|
| * | Revert "Merge branch 'dev' into 'dev'"Max Kostikov2019-05-021-1/+1
| * | Merge branch 'dev' into 'dev'Mario2019-05-021-1/+1
| |\ \
| * \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-05-021-0/+1
| |\ \ \
| * \ \ \ Merge branch 'dev' into 'dev'Max Kostikov2019-05-011-2/+2
| |\ \ \ \
| * | | | | Update Item.phpMax Kostikov2019-05-011-9/+5
| * | | | | Merge branch 'dev' into 'dev'Max Kostikov2019-05-012-7/+7
| |\ \ \ \ \
| * | | | | | 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
| |\ \ \ \ \ \
| * | | | | | | 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
| | |/ / / / / / | |/| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 12:20:05 +0000