| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-13 | 5 | -458/+467 | |
| |\ | ||||||
| | * | Merge red/master | Mario Vavti | 2017-07-11 | 11 | -16/+56 | |
| | |\ | ||||||
| | * | | update to match primary color | Mario Vavti | 2017-07-10 | 2 | -4/+4 | |
| | | | | ||||||
| | * | | update r1191: return update_success if table principals exists otherwise ↵ | Mario Vavti | 2017-07-10 | 1 | -404/+414 | |
| | | | | | | | | | | | | | proceed with creating cdav tables. | |||||
| * | | | implement chunked uploads on the wall; making it work painlessly on /cloud ↵ | zotlabs | 2017-07-13 | 4 | -134/+206 | |
| | | | | | | | | | | | | | was attempted but will not be implemented today. That presents some interesting dragons to slay. | |||||
| * | | | fix typos | zotlabs | 2017-07-12 | 1 | -6/+8 | |
| | | | | ||||||
| * | | | make websub/PuSH and salmon both use consume_feed() for item storage as ↵ | zotlabs | 2017-07-12 | 1 | -13/+43 | |
| | | | | | | | | | | | | | there is a lot of duplication of effort and patches applied to one that haven't been applied to the other. This will require an update of addons as well or follow activities may be duplicated | |||||
| * | | | even more logging of conversation parent discovery | zotlabs | 2017-07-11 | 1 | -0/+1 | |
| | |/ |/| | ||||||
| * | | prevent expiration of conversations you are involved with - allows you to ↵ | zotlabs | 2017-07-10 | 6 | -4/+36 | |
| | | | | | | | | | find your own comments months from now | |||||
| * | | find_parent for feeds needs more debug logging. Something is still falling ↵ | zotlabs | 2017-07-09 | 1 | -0/+4 | |
| | | | | | | | | | through the cracks and it isn't obvious why | |||||
| * | | regression: allow position attributes in oembedable zcards by separating ↵ | zotlabs | 2017-07-09 | 1 | -2/+4 | |
| | | | | | | | | | | | | | allow_position from the decision to allow zrls. Should probably turn the entire zcard into a gd image as other consumers of zcards are also likely to purify the position attributes. | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-09 | 29 | -762/+430 | |
| |\| | ||||||
| | * | remove if not exist clause on index creation - it seems to be supported in ↵ | Mario Vavti | 2017-07-08 | 1 | -1/+1 | |
| | | | | | | | | | mariadb only | |||||
| | * | update bs-dev and popper.js | Mario Vavti | 2017-07-07 | 6 | -90/+86 | |
| | | | ||||||
| | * | Merge pull request #822 from dawnbreak/composer-light | git-marijus | 2017-07-07 | 22 | -671/+343 | |
| | |\ | | | | | | | Add optimize-autoloader to composer config. | |||||
| | | * | :arrow_up: Updating some PHP libraries. | Klaus Weidenbach | 2017-07-06 | 15 | -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 Weidenbach | 2017-07-06 | 7 | -448/+91 | |
| | |/ | ||||||
| | * | 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 | |
| | | |\ | | |/ | |/| | ||||||
| | | * | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e2d028fb97b2d877c029d1fba8c34589250004da. | |||||
| | | * | | | | | | | | 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 ↵ | zotlabs | 2017-07-05 | 3 | -10/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | settings/featured, plus minor non-code changes | |||||
| * | | | | | | | | | | 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 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 | |
| | |\ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | minor css fix | Mario Vavti | 2017-07-03 | 1 | -4/+0 | |
| | | | | | | | | | | | | | ||||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |