| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-15 | 3 | -3/+8 |
| |\ | |||||
| | * | typo | Mario Vavti | 2017-08-14 | 1 | -1/+1 |
| | | | |||||
| | * | changelog | Mario Vavti | 2017-08-14 | 1 | -0/+1 |
| | | | |||||
| | * | Merge pull request #842 from dawnbreak/dev | git-marijus | 2017-08-14 | 2 | -2/+6 |
| | |\ | | | | | | | Update composer autload cache. | ||||
| | | * | Update composer autload cache. | Klaus Weidenbach | 2017-08-11 | 2 | -2/+6 |
| | | | | |||||
| * | | | more work on activitypub httpsignature verification | zotlabs | 2017-08-14 | 2 | -1/+18 |
| | | | | |||||
| * | | | new content type | zotlabs | 2017-08-14 | 2 | -3/+2 |
| |/ / | |||||
| * | | contact_slider.tpl didn't get updated with one of the bootstrap changes ↵ | zotlabs | 2017-08-13 | 1 | -3/+3 |
| | | | | | | | | | where 'in' was renamed to 'show' | ||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-12 | 19 | -158/+151 |
| |\ \ | |||||
| | * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-08-12 | 1 | -2/+5 |
| | |\ \ | |||||
| | * | | | minor js and css changes | git-marijus | 2017-08-12 | 3 | -10/+16 |
| | | |/ | |/| | |||||
| | * | | bump version | Mario Vavti | 2017-08-11 | 1 | -1/+1 |
| | | | | |||||
| | * | | update to bootstrap beta | Mario Vavti | 2017-08-11 | 15 | -147/+134 |
| | | | | |||||
| * | | | add parent item (if applicable) to notifier plugin info | zotlabs | 2017-08-12 | 1 | -0/+2 |
| | |/ |/| | |||||
| * | | add protocol selection to following feeds | zotlabs | 2017-08-12 | 1 | -2/+5 |
| |/ | |||||
| * | deliverable_singleton - also check hubloc_hash in case we don't have an ↵ | zotlabs | 2017-08-10 | 1 | -1/+9 |
| | | | | | xchan_hash | ||||
| * | prevent uploads to comments if the channel has a default private ACL. | zotlabs | 2017-08-10 | 3 | -3/+23 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-10 | 5 | -17/+23 |
| |\ | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-08-10 | 2 | -4/+10 |
| | |\ | |||||
| | | * | update changelog | git-marijus | 2017-08-10 | 1 | -0/+1 |
| | | | | |||||
| | | * | do not show channel manager and nav channel select if we are in a delegate ↵ | git-marijus | 2017-08-10 | 1 | -4/+8 |
| | | | | | | | | | | | | | session | ||||
| | | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | git-marijus | 2017-08-10 | 9 | -20/+22 |
| | | |\ | |||||
| | | * | | update changelog | git-marijus | 2017-08-09 | 1 | -0/+1 |
| | | | | | |||||
| | * | | | create cdav principal also on client access and remove redundant pconfig ↵ | Mario Vavti | 2017-08-10 | 2 | -6/+12 |
| | | |/ | |/| | | | | | | | check in authentication process | ||||
| | * | | merge red/master into dev | Mario Vavti | 2017-08-10 | 9 | -20/+22 |
| | |/ | |||||
| | * | App::get_channel() does not return the right channel if we are not looking ↵ | git-marijus | 2017-08-09 | 1 | -7/+1 |
| | | | | | | | | | at our own channel. fix issue #841 | ||||
| * | | include the mastodon summary in the post | zotlabs | 2017-08-10 | 1 | -2/+2 |
| | | | |||||
| * | | when following, allow [network]follow_address syntax to connect with a ↵ | zotlabs | 2017-08-10 | 2 | -7/+20 |
| | | | | | | | | | specific network for multi-protocol services | ||||
| * | | some doco fixes and other real minor stuff to improve logreading ability | zotlabs | 2017-08-09 | 5 | -14/+15 |
| | | | |||||
| * | | libxml errors | zotlabs | 2017-08-09 | 4 | -6/+7 |
| |/ | |||||
| * | only show upload button to those with write_storage permission | zotlabs | 2017-08-08 | 2 | -0/+3 |
| | | |||||
| * | support upload of files and attachments into comments. This has some ↵ | zotlabs | 2017-08-08 | 5 | -0/+49 |
| | | | | | repercussions when it comes to post permissions since the commenter will not know the distribution of the post. Basically the files will be uploaded with the commenter's default ACL. Most of the time this will do the right thing. | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-08 | 1 | -1/+95 |
| |\ | |||||
| | * | changelog | git-marijus | 2017-08-08 | 1 | -1/+95 |
| | | | |||||
| * | | remove some no longer used images/icons | zotlabs | 2017-08-07 | 11 | -0/+0 |
| |/ | |||||
| * | ostatus feed was missing comments | zotlabs | 2017-08-06 | 2 | -9/+5 |
| | | |||||
| * | Merge pull request #838 from phellmes/dev | git-marijus | 2017-08-06 | 2 | -2361/+2411 |
| |\ | | | | | Update DE translation strings (also for 2.6RC) | ||||
| | * | Update DE translation strings | phellmes | 2017-08-05 | 2 | -2361/+2411 |
| | | | |||||
| * | | Merge pull request #839 from anaqreon/doco | git-marijus | 2017-08-06 | 2 | -0/+9 |
| |\ \ | | | | | | | Fix CSS for help page content list in sidebar. | ||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into doco | Andrew Manning | 2017-08-05 | 20 | -52/+81 |
| | |\| | |||||
| | * | | Fix CSS for help page content list in sidebar. | www-data | 2017-08-03 | 2 | -0/+9 |
| | | | | |||||
| * | | | make config requirements in apps more universal - provide key and value | git-marijus | 2017-08-06 | 2 | -8/+6 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | git-marijus | 2017-08-06 | 5 | -0/+198 |
| |\ \ \ | |||||
| | * | | | allow channel address to be changed | zotlabs | 2017-08-04 | 4 | -0/+195 |
| | | | | | |||||
| | * | | | auto preview mail on media insertion also | zotlabs | 2017-08-03 | 1 | -0/+3 |
| | | |/ | |/| | |||||
| * / | | consolidate disable_discover_tab config if it was not yet set to either 1 or ↵ | git-marijus | 2017-08-06 | 7 | -12/+15 |
| |/ / | | | | | | | 0 in DB | ||||
| * | | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-08-03 | 15 | -22/+52 |
| |\ \ | |||||
| | * | | some bb-to-markdown issues | zotlabs | 2017-08-03 | 1 | -5/+2 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-02 | 2 | -2291/+2341 |
| | |\| | |||||
| | * | | minor activitypub rendering stuff | zotlabs | 2017-08-02 | 2 | -2/+2 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |