aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #822 from dawnbreak/composer-lightgit-marijus2017-07-0722-671/+343
|\ | | | | Add optimize-autoloader to composer config.
| * :arrow_up: Updating some PHP libraries.Klaus Weidenbach2017-07-0615-223/+252
| | | | | | | | | | htmlpurifier (v4.9.2 => v4.9.3) with bugfix for PHP7.1 sabre/http (4.2.2 => 4.2.3)
| * Add optimize-autoloader to composer config.Klaus Weidenbach2017-07-067-448/+91
|/
* Merge pull request #821 from zotlabs/hmessagesgit-marijus2017-07-061-5441/+3236
|\ | | | | Hmessages.po corruption
| * hmessages.po was corrupt from an old merge conflict - regeneratedzotlabs2017-07-051-5441/+3236
| |
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-07-05327-24960/+14604
| |\ | |/ |/|
* | remove apps appMario Vavti2017-07-051-5/+0
| |
* | typoMario Vavti2017-07-051-1/+1
| |
* | some sites use the old style ostatus:conversation xml field, check for it.zotlabs2017-07-051-2/+9
| |
* | use if not exists clause to not error if the index was already thereMario Vavti2017-07-051-1/+1
| |
* | version 2.5.8Mario Vavti2017-07-051-1/+1
| |
* | missing abook_{my,their}_perms in pg schema and missing keys in mysql schemaMario Vavti2017-07-052-0/+6
| |
* | update_version bumpMario Vavti2017-07-051-1/+1
| |
* | missing semicolonMario Vavti2017-07-051-1/+1
| |
* | db-update for cdavMario Vavti2017-07-042-1/+411
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-07-041-1/+1
|\ \
| * | version 2.5.7Mario Vavti2017-07-041-1/+1
| | |
* | | reimplement creation of default calendar and default addressbook using sabre ↵Mario Vavti2017-07-041-23/+19
| | | | | | | | | | | | classes
* | | add apd files for cdavMario Vavti2017-07-042-0/+12
| | |
* | | add the cdav pgsql schemasMario Vavti2017-07-041-0/+222
| | |
* | | keep hubzillas license and readmeMario Vavti2017-07-042-9/+42
| | |
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-07-042-6/+6
|\ \ \
| * | | revert using channel_hash for cdav until we figure out how to do so cleanlyzotlabs2017-07-032-6/+6
| | | |
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-0227-4376/+2398
| |\ \ \
* | | | | minor css fixMario Vavti2017-07-031-4/+0
| | | | |
* | | | | merge red into hubzillaMario Vavti2017-07-03322-24831/+13776
|\| | | | | |_|/ / |/| | |
| * | | duplicated posts after conversation fetchzotlabs2017-06-301-0/+11
| | | |
| * | | use "Full Name (username)" for ostatus commenter xchanszotlabs2017-06-291-2/+28
| | | |
| * | | forgot to return true from the conversation_fetch routine - which triggers ↵zotlabs2017-06-291-0/+2
| | | | | | | | | | | | | | | | the rescan for potential parent posts
| * | | log the conversation so we can debug this easierzotlabs2017-06-281-0/+1
| | | |
| * | | conversation fetching is partially working - but it isn't always glueing the ↵zotlabs2017-06-281-7/+20
| | | | | | | | | | | | | | | | conversation pieces together.
| * | | pretend it's a real feed even though it isn'tzotlabs2017-06-281-2/+12
| | | |
| * | | add loggingzotlabs2017-06-281-0/+3
| | | |
| * | | minor weirdness in zot finger results after deleting a clone from a channel ↵zotlabs2017-06-281-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 renderedzotlabs2017-06-281-2/+2
| | | |
| * | | missing space in nav tplzotlabs2017-06-284-2/+6
| | | |
| * | | more refetch testingzotlabs2017-06-281-1/+1
| | | |
| * | | refetch testingzotlabs2017-06-281-1/+1
| | | |
| * | | remove logging statementzotlabs2017-06-271-1/+1
| | | |
| * | | provide a gender icon on the profile sidebar within reasonzotlabs2017-06-272-1/+26
| | | |
| * | | translate 'favorite' verb to 'like' if it's an ostatus feedzotlabs2017-06-271-6/+15
| | | |
| * | | log conversation fetches (also a missed / char in the string replace)zotlabs2017-06-271-1/+3
| | | |
| * | | (untested currently) fetch conversation for GNU-Social and Mastodon when ↵zotlabs2017-06-271-1/+47
| | | | | | | | | | | | | | | | provided a comment with no local copy of the parent.
| * | | support linked media (audio/video) elements in feeds as well as imageszotlabs2017-06-261-4/+17
| | | |
| * | | provide more comprehensible information on the admin summary pagezotlabs2017-06-262-9/+12
| | | |
| * | | upgrade blueimp from 9.8 to 9.18zotlabs2017-06-2654-1117/+913
| | | |
| * | | in gnu-social reshare objects are activities, not posts or commentszotlabs2017-06-261-1/+1
| | | |
| * | | add ostatus attached photos (inline to the post body) even if there's a link ↵zotlabs2017-06-261-1/+1
| | | | | | | | | | | | | | | | to the photo in the post but it isn't wrapped in an img tag.
| * | | better fix for dav headers already sent issuezotlabs2017-06-262-2/+4
| | | |
| * | | minor usability enhancements with the connections list - label the edit icon ↵zotlabs2017-06-253-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.