aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* find_parent for feeds needs more debug logging. Something is still falling th...zotlabs2017-07-091-0/+4
* regression: allow position attributes in oembedable zcards by separating allo...zotlabs2017-07-091-2/+4
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-0929-762/+430
|\
| * remove if not exist clause on index creation - it seems to be supported in ma...Mario Vavti2017-07-081-1/+1
| * update bs-dev and popper.jsMario Vavti2017-07-076-90/+86
| * Merge pull request #822 from dawnbreak/composer-lightgit-marijus2017-07-0722-671/+343
| |\
| | * :arrow_up: Updating some PHP libraries.Klaus Weidenbach2017-07-0615-223/+252
| | * 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 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
| | |\ | | |/ | |/|
| | * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-07-0228-4377/+2399
| | |\
| | * \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-2030-3220/+1395
| | |\ \
| | * \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-1416-140/+447
| | |\ \ \
| | * \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-119-444/+453
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-086-4/+52
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-0788-24063/+3588
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_mergezotlabs2017-06-0611-93/+89
| | |\ \ \ \ \ \ \
| | * | | | | | | | Revert "include/socgraph - remove a few obsolete and long-deprecated functions"zotlabs2017-06-011-0/+71
| | * | | | | | | | include/socgraph - remove a few obsolete and long-deprecated functionszotlabs2017-06-011-71/+0
* | | | | | | | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 11:57:22 +0000