aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* there was a merge conflict in hmessages.pozotlabs2017-07-051-5451/+3246
* affinitiy slider settings were being updated on any submit of of settings/fea...zotlabs2017-07-053-10/+12
* reset project namezotlabs2017-07-051-2/+3
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-0519-216/+907
|\
| * 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
| * | 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
| |\ \
| * | | minor css fixMario Vavti2017-07-031-4/+0
| * | | merge red into hubzillaMario Vavti2017-07-03322-24831/+13776
| |\ \ \ | | |_|/ | |/| |
| * | | bs-dev, minor css fix and min versionMario Vavti2017-07-038-170/+192
* | | | some sites use the old style ostatus:conversation xml field, check for it.zotlabs2017-07-041-2/+9
| |_|/ |/| |
* | | 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
|\| | | |/ |/|
| * update bs-dev and min version bumpMario Vavti2017-07-0226-4374/+2392
| * add files and photos to featured apps by defaultgit-marijus2017-06-222-2/+2
| * fix post title radiusgit-marijus2017-06-221-1/+5
* | 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 th...zotlabs2017-06-291-0/+2
* | 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
* | 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 t...zotlabs2017-06-281-5/+9
* | 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 prov...zotlabs2017-06-271-1/+47
* | 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