Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | zotlabs | 2019-05-28 | 7 | -113/+131 |
|\ | |||||
| * | mod cal band-aid fixes | Mario Vavti | 2019-05-26 | 1 | -14/+22 |
| | | |||||
| * | adjust birthday handling according to community decision and slightly change ↵ | Mario Vavti | 2019-05-26 | 2 | -18/+1 |
| | | | | | | | | display of allday event items | ||||
| * | get channel from photo uid | Mario Vavti | 2019-05-24 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'dev' into 'dev' | Mario | 2019-05-22 | 1 | -0/+8 |
| |\ | | | | | | | | | | | | | translate make-friend activities to zot6 See merge request hubzilla/core!1654 | ||||
| * | | improve timezone detection for caldav and remove smart birthday feature. ↵ | Mario Vavti | 2019-05-22 | 2 | -12/+20 |
| | | | | | | | | | | | | Force adjust birthdays until we agree on how to deal with this. | ||||
| * | | remove unused code | Mario Vavti | 2019-05-21 | 1 | -4/+1 |
| | | | |||||
| * | | fix all day events for caldav calendars | Mario Vavti | 2019-05-21 | 1 | -15/+45 |
| | | | |||||
| * | | move smart birthday feature to calendar settings and override the adjust ↵ | Mario Vavti | 2019-05-20 | 1 | -0/+3 |
| | | | | | | | | | | | | flag at display time instead of import | ||||
| * | | fix event notifications viewall url | Mario Vavti | 2019-05-20 | 1 | -1/+1 |
| | | | |||||
| * | | be more precise with table selection | Mario Vavti | 2019-05-20 | 1 | -4/+4 |
| | | | |||||
| * | | calendar merge: initial commit for timezone support | Mario Vavti | 2019-05-20 | 2 | -67/+56 |
| | | | |||||
| * | | wiki: urlencode the entire share link | Mario Vavti | 2019-05-17 | 1 | -2/+2 |
| | | | |||||
| * | | use escape_tags() wiki headers | Mario Vavti | 2019-05-17 | 1 | -2/+2 |
| | | | |||||
* | | | another forum -> group wording change | zotlabs | 2019-05-21 | 1 | -3/+3 |
| |/ |/| | |||||
* | | translate make-friend activities to zot6 | zotlabs | 2019-05-20 | 1 | -0/+8 |
|/ | |||||
* | calendar merge: only export events that will not break the importer. this ↵ | Mario Vavti | 2019-05-15 | 1 | -2/+3 |
| | | | | will probably dismiss some old experimental entries | ||||
* | add autocomplete js to calendar and fix issue with extended likes mid | Mario Vavti | 2019-05-14 | 1 | -3/+3 |
| | |||||
* | deal with privacy mentions in event descriptions | Mario Vavti | 2019-05-13 | 1 | -11/+35 |
| | |||||
* | calendar merge: cleanup | Mario Vavti | 2019-05-13 | 1 | -138/+9 |
| | |||||
* | don't do oembed processing on naked links and smarty lib cleanup. ported ↵ | Mario Vavti | 2019-05-13 | 2 | -36/+45 |
| | | | | from zap. | ||||
* | form security token for mod register ported from zap | Mario Vavti | 2019-05-13 | 1 | -4/+8 |
| | |||||
* | Merge branch 'dev' into 'dev' | Mario | 2019-05-11 | 1 | -10/+10 |
|\ | | | | | | | | | use 'cache' flag to bbcode() on content destined for Zot6. We've seen rendered... See merge request hubzilla/core!1644 | ||||
| * | use 'cache' flag to bbcode() on content destined for Zot6. We've seen ↵ | zotlabs | 2019-05-09 | 1 | -10/+10 |
| | | | | | | | | rendered map HTML in a couple of places and these should never be rendered for outgoing content as they will only be purified on the other end. | ||||
* | | typo | Mario Vavti | 2019-05-10 | 1 | -1/+1 |
| | | |||||
* | | calendar merge: implement channel calendar import in cdav/calendar | Mario Vavti | 2019-05-10 | 4 | -20/+18 |
|/ | |||||
* | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-09 | 3 | -21/+29 |
|\ | | | | | | | | | remove the caldav and event app and make calendar the default app See merge request hubzilla/core!1643 | ||||
| * | remove the caldav and event app and make calendar the default app | Mario Vavti | 2019-05-09 | 3 | -21/+29 |
| | | |||||
* | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-09 | 1 | -0/+1 |
|\ \ | |/ |/| | | | | | Add 'Create' button translation in CalDAV See merge request hubzilla/core!1642 | ||||
| * | Add 'Create' button translation | Max Kostikov | 2019-05-09 | 1 | -0/+1 |
| | | |||||
* | | calendar merge: cleanup and comment out some unused code | Mario Vavti | 2019-05-09 | 3 | -69/+57 |
| | | |||||
* | | another DB update to fix uid_mid index in item table and add xchan_photo_m ↵ | Mario Vavti | 2019-05-08 | 1 | -0/+38 |
| | | | | | | | | index to xchan table | ||||
* | | Channel update | Mario | 2019-05-08 | 1 | -0/+47 |
|/ | |||||
* | Update Photos.php | Max Kostikov | 2019-05-08 | 1 | -1/+1 |
| | |||||
* | Update PhotoDriver.php | Max Kostikov | 2019-05-08 | 1 | -13/+3 |
| | |||||
* | Respect thumbnail storage location on image editing | Max Kostikov | 2019-05-08 | 1 | -77/+35 |
| | |||||
* | Add photo usage detection if not exist on thumbnail save | Max Kostikov | 2019-05-08 | 1 | -0/+12 |
| | |||||
* | Use own variable for "Go to previous comment" hint | Max Kostikov | 2019-05-05 | 1 | -1/+2 |
| | |||||
* | Add arrows to scroll between related comments | Max Kostikov | 2019-05-05 | 1 | -7/+5 |
| | |||||
* | port db update improvements from zap | Mario Vavti | 2019-05-03 | 2 | -3/+51 |
| | |||||
* | update directory on cover photo changes | Mario Vavti | 2019-05-03 | 1 | -2/+7 |
| | |||||
* | Merge branch 'replyto_fixes' into 'dev' | Mario | 2019-05-03 | 1 | -3/+3 |
|\ | | | | | | | | | provide xchan_url if there is no xchan_addr See merge request hubzilla/core!1622 | ||||
| * | more provide xchan_url if there is no xchan_addr | Mario Vavti | 2019-05-02 | 1 | -2/+2 |
| | | |||||
| * | provide xchan_url if there is no xchan_addr | Mario Vavti | 2019-05-02 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'unfriend_delete_posts_bug' into 'dev' | Mario | 2019-05-03 | 3 | -2/+70 |
|\ \ | | | | | | | | | | | | | Unfriend delete posts bug See merge request hubzilla/core!1624 | ||||
| * | | emojireaction compat | zotlabs | 2019-05-02 | 2 | -0/+12 |
| | | | |||||
| * | | move apschema to core to use for emojiReaction mapping for zot6 | zotlabs | 2019-05-02 | 2 | -2/+58 |
| | | | |||||
* | | | Merge branch 'dev' into 'dev' | Max Kostikov | 2019-05-02 | 17 | -52/+935 |
|\ \ \ | | |/ | |/| | | | | # Conflicts: # Zotlabs/Lib/ThreadItem.php | ||||
| * | | Revert "Merge branch 'dev' into 'dev'" | Max Kostikov | 2019-05-02 | 1 | -1/+1 |
| | | | | | | | | | This reverts merge request !1620 | ||||
| * | | Merge branch 'dev' into 'dev' | Mario | 2019-05-02 | 1 | -1/+1 |
| |\ \ | | | | | | | | | | | | | | | | | Check if 'reply on comment' enabled for this profile See merge request hubzilla/core!1620 |