aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into devzotlabs2019-05-287-113/+131
|\
| * mod cal band-aid fixesMario Vavti2019-05-261-14/+22
| * adjust birthday handling according to community decision and slightly change ...Mario Vavti2019-05-262-18/+1
| * get channel from photo uidMario Vavti2019-05-241-1/+1
| * Merge branch 'dev' into 'dev'Mario2019-05-221-0/+8
| |\
| * | improve timezone detection for caldav and remove smart birthday feature. Forc...Mario Vavti2019-05-222-12/+20
| * | remove unused codeMario Vavti2019-05-211-4/+1
| * | fix all day events for caldav calendarsMario Vavti2019-05-211-15/+45
| * | move smart birthday feature to calendar settings and override the adjust flag...Mario Vavti2019-05-201-0/+3
| * | fix event notifications viewall urlMario Vavti2019-05-201-1/+1
| * | be more precise with table selectionMario Vavti2019-05-201-4/+4
| * | calendar merge: initial commit for timezone supportMario Vavti2019-05-202-67/+56
| * | wiki: urlencode the entire share linkMario Vavti2019-05-171-2/+2
| * | use escape_tags() wiki headersMario Vavti2019-05-171-2/+2
* | | another forum -> group wording changezotlabs2019-05-211-3/+3
| |/ |/|
* | translate make-friend activities to zot6zotlabs2019-05-201-0/+8
|/
* calendar merge: only export events that will not break the importer. this wil...Mario Vavti2019-05-151-2/+3
* add autocomplete js to calendar and fix issue with extended likes midMario Vavti2019-05-141-3/+3
* deal with privacy mentions in event descriptionsMario Vavti2019-05-131-11/+35
* calendar merge: cleanupMario Vavti2019-05-131-138/+9
* 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
| |\ \