Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-07-05 | 327 | -24960/+14604 | |
| | |\ | | |/ | |/| | ||||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-07-02 | 28 | -4377/+2399 | |
| | |\ | ||||||
| | * \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-06-20 | 30 | -3220/+1395 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-06-14 | 16 | -140/+447 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-06-11 | 9 | -444/+453 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-06-08 | 6 | -4/+52 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-06-07 | 88 | -24063/+3588 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-06-06 | 11 | -93/+89 | |
| | |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Revert "include/socgraph - remove a few obsolete and long-deprecated functions" | zotlabs | 2017-06-01 | 1 | -0/+71 | |
| | * | | | | | | | | include/socgraph - remove a few obsolete and long-deprecated functions | zotlabs | 2017-06-01 | 1 | -71/+0 | |
* | | | | | | | | | | there was a merge conflict in hmessages.po | zotlabs | 2017-07-05 | 1 | -5451/+3246 | |
* | | | | | | | | | | affinitiy slider settings were being updated on any submit of of settings/fea... | zotlabs | 2017-07-05 | 3 | -10/+12 | |
* | | | | | | | | | | reset project name | zotlabs | 2017-07-05 | 1 | -2/+3 | |
* | | | | | | | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-05 | 19 | -216/+907 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | 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 | |
| * | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | minor css fix | Mario Vavti | 2017-07-03 | 1 | -4/+0 | |
| * | | | | | | | | | | | merge red into hubzilla | Mario Vavti | 2017-07-03 | 322 | -24831/+13776 | |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | | bs-dev, minor css fix and min version | Mario Vavti | 2017-07-03 | 8 | -170/+192 | |
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | ||||||
* | | | | | | | | | | | some sites use the old style ostatus:conversation xml field, check for it. | zotlabs | 2017-07-04 | 1 | -2/+9 | |
| |_|/ / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | 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 | |
|\| | | | | | | | | | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | update bs-dev and min version bump | Mario Vavti | 2017-07-02 | 26 | -4374/+2392 | |
| * | | | | | | | | add files and photos to featured apps by default | git-marijus | 2017-06-22 | 2 | -2/+2 | |
| * | | | | | | | | fix post title radius | git-marijus | 2017-06-22 | 1 | -1/+5 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* | | | | | | | | 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 th... | zotlabs | 2017-06-29 | 1 | -0/+2 | |
* | | | | | | | | 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 | |
* | | | | | | | | 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 t... | zotlabs | 2017-06-28 | 1 | -5/+9 | |
* | | | | | | | | 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 |