Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #821 from zotlabs/hmessages | git-marijus | 2017-07-06 | 1 | -5441/+3236 |
|\ | | | | | Hmessages.po corruption | ||||
| * | hmessages.po was corrupt from an old merge conflict - regenerated | zotlabs | 2017-07-05 | 1 | -5441/+3236 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-07-05 | 327 | -24960/+14604 |
| |\ | |/ |/| | |||||
* | | remove apps app | Mario Vavti | 2017-07-05 | 1 | -5/+0 |
| | | |||||
* | | typo | Mario Vavti | 2017-07-05 | 1 | -1/+1 |
| | | |||||
* | | some sites use the old style ostatus:conversation xml field, check for it. | zotlabs | 2017-07-05 | 1 | -2/+9 |
| | | |||||
* | | use if not exists clause to not error if the index was already there | Mario Vavti | 2017-07-05 | 1 | -1/+1 |
| | | |||||
* | | version 2.5.8 | Mario Vavti | 2017-07-05 | 1 | -1/+1 |
| | | |||||
* | | missing abook_{my,their}_perms in pg schema and missing keys in mysql schema | Mario Vavti | 2017-07-05 | 2 | -0/+6 |
| | | |||||
* | | update_version bump | Mario Vavti | 2017-07-05 | 1 | -1/+1 |
| | | |||||
* | | missing semicolon | Mario Vavti | 2017-07-05 | 1 | -1/+1 |
| | | |||||
* | | db-update for cdav | Mario Vavti | 2017-07-04 | 2 | -1/+411 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-07-04 | 1 | -1/+1 |
|\ \ | |||||
| * | | version 2.5.7 | Mario Vavti | 2017-07-04 | 1 | -1/+1 |
| | | | |||||
* | | | reimplement creation of default calendar and default addressbook using sabre ↵ | Mario Vavti | 2017-07-04 | 1 | -23/+19 |
| | | | | | | | | | | | | classes | ||||
* | | | add apd files for cdav | Mario Vavti | 2017-07-04 | 2 | -0/+12 |
| | | | |||||
* | | | add the cdav pgsql schemas | Mario Vavti | 2017-07-04 | 1 | -0/+222 |
| | | | |||||
* | | | keep hubzillas license and readme | Mario Vavti | 2017-07-04 | 2 | -9/+42 |
| | | | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-07-04 | 2 | -6/+6 |
|\ \ \ | |||||
| * | | | revert using channel_hash for cdav until we figure out how to do so cleanly | zotlabs | 2017-07-03 | 2 | -6/+6 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-02 | 27 | -4376/+2398 |
| |\ \ \ | |||||
* | | | | | minor css fix | Mario Vavti | 2017-07-03 | 1 | -4/+0 |
| | | | | | |||||
* | | | | | merge red into hubzilla | Mario Vavti | 2017-07-03 | 322 | -24831/+13776 |
|\| | | | | |_|/ / |/| | | | |||||
| * | | | duplicated posts after conversation fetch | zotlabs | 2017-06-30 | 1 | -0/+11 |
| | | | | |||||
| * | | | use "Full Name (username)" for ostatus commenter xchans | zotlabs | 2017-06-29 | 1 | -2/+28 |
| | | | | |||||
| * | | | forgot to return true from the conversation_fetch routine - which triggers ↵ | zotlabs | 2017-06-29 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | the rescan for potential parent posts | ||||
| * | | | log the conversation so we can debug this easier | zotlabs | 2017-06-28 | 1 | -0/+1 |
| | | | | |||||
| * | | | conversation fetching is partially working - but it isn't always glueing the ↵ | zotlabs | 2017-06-28 | 1 | -7/+20 |
| | | | | | | | | | | | | | | | | conversation pieces together. | ||||
| * | | | pretend it's a real feed even though it isn't | zotlabs | 2017-06-28 | 1 | -2/+12 |
| | | | | |||||
| * | | | add logging | zotlabs | 2017-06-28 | 1 | -0/+3 |
| | | | | |||||
| * | | | minor weirdness in zot finger results after deleting a clone from a channel ↵ | zotlabs | 2017-06-28 | 1 | -5/+9 |
| | | | | | | | | | | | | | | | | that was on a site which was previously migrated from http to https and still had the old hubloc | ||||
| * | | | diaspora hcard wasn't being rendered | zotlabs | 2017-06-28 | 1 | -2/+2 |
| | | | | |||||
| * | | | missing space in nav tpl | zotlabs | 2017-06-28 | 4 | -2/+6 |
| | | | | |||||
| * | | | more refetch testing | zotlabs | 2017-06-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | refetch testing | zotlabs | 2017-06-28 | 1 | -1/+1 |
| | | | | |||||
| * | | | remove logging statement | zotlabs | 2017-06-27 | 1 | -1/+1 |
| | | | | |||||
| * | | | provide a gender icon on the profile sidebar within reason | zotlabs | 2017-06-27 | 2 | -1/+26 |
| | | | | |||||
| * | | | translate 'favorite' verb to 'like' if it's an ostatus feed | zotlabs | 2017-06-27 | 1 | -6/+15 |
| | | | | |||||
| * | | | log conversation fetches (also a missed / char in the string replace) | zotlabs | 2017-06-27 | 1 | -1/+3 |
| | | | | |||||
| * | | | (untested currently) fetch conversation for GNU-Social and Mastodon when ↵ | zotlabs | 2017-06-27 | 1 | -1/+47 |
| | | | | | | | | | | | | | | | | provided a comment with no local copy of the parent. | ||||
| * | | | support linked media (audio/video) elements in feeds as well as images | zotlabs | 2017-06-26 | 1 | -4/+17 |
| | | | | |||||
| * | | | provide more comprehensible information on the admin summary page | zotlabs | 2017-06-26 | 2 | -9/+12 |
| | | | | |||||
| * | | | upgrade blueimp from 9.8 to 9.18 | zotlabs | 2017-06-26 | 54 | -1117/+913 |
| | | | | |||||
| * | | | in gnu-social reshare objects are activities, not posts or comments | zotlabs | 2017-06-26 | 1 | -1/+1 |
| | | | | |||||
| * | | | add ostatus attached photos (inline to the post body) even if there's a link ↵ | zotlabs | 2017-06-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | to the photo in the post but it isn't wrapped in an img tag. | ||||
| * | | | better fix for dav headers already sent issue | zotlabs | 2017-06-26 | 2 | -2/+4 |
| | | | | |||||
| * | | | minor usability enhancements with the connections list - label the edit icon ↵ | zotlabs | 2017-06-25 | 3 | -2/+7 |
| | | | | | | | | | | | | | | | | so it's more obvious; the intuitive action is to click the photo or name which isn't what we usually want. Also move the Delete button over just a bit more so it's harder to accidentally click on small screens with big thumbs. | ||||
| * | | | typo in chanview, remove output buffering in mod_cloud which is preventing ↵ | zotlabs | 2017-06-25 | 2 | -3/+3 |
| | | | | | | | | | | | | | | | | large files from being downloaded. IIRC this was put there to avoid a SAML warning in SabreDAV but I'm not seeing that currently. | ||||
| * | | | chanview - if already connected, bypass the chanview intermediary page and ↵ | zotlabs | 2017-06-25 | 1 | -3/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | go straight to the remote profile. The chanview page is only there to present a connect link since the remote profile may not have one. | ||||
| * | | | allow poke by xchan_hash | zotlabs | 2017-06-25 | 1 | -9/+21 |
| | | | |