| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-22 | 11 | -73/+276 |
| |\ | |||||
| | * | bump version | Mario Vavti | 2017-05-20 | 1 | -1/+1 |
| | | | |||||
| | * | resolve merge conflict | zotlabs | 2017-05-20 | 2 | -24/+24 |
| | | | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-05-19 | 3 | -13/+13 |
| | |\ | |||||
| | | * | some styling for system notifications | Mario Vavti | 2017-05-18 | 3 | -13/+13 |
| | | | | |||||
| | * | | smileybutton fixes | Mario Vavti | 2017-05-19 | 1 | -2/+0 |
| | |/ | |||||
| | * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-05-17 | 13 | -497/+2764 |
| | |\ | |||||
| | | * | Merge pull request #783 from zotlabs/app_order | git-marijus | 2017-05-17 | 2 | -0/+46 |
| | | |\ | | | | | | | | | provide mechanism to arbitrarily sort the nav tray apps, currently th… | ||||
| | | | * | provide mechanism to arbitrarily sort the nav tray apps, currently the ↵ | zotlabs | 2017-05-16 | 2 | -0/+46 |
| | | | | | | | | | | | | | | | | | preferred order list needs to be manually created | ||||
| | | * | | Merge pull request #782 from dawnbreak/QA_testing | git-marijus | 2017-05-17 | 2 | -52/+254 |
| | | |\ \ | | | | | | | | | | | :construction_worker::white_check_mark: Documentation Permissions.php. | ||||
| | | | * | | :construction_worker::white_check_mark: Documentation Permissions.php. | Klaus Weidenbach | 2017-05-17 | 2 | -52/+254 |
| | | | |/ | | | | | | | | | | | | | | | | | Also add some phpunit tests for this class, but there are some problems yet with mocking static functions. | ||||
| | | * | | Merge pull request #780 from zotlabs/docbug | git-marijus | 2017-05-17 | 2 | -10/+12 |
| | | |\ \ | | | | | | | | | | | no bug reporting info in docs | ||||
| | | | * | | no bug reporting info in docs | zotlabs | 2017-05-15 | 2 | -10/+12 |
| | | | | | | |||||
| | | * | | | Merge pull request #778 from beardyunixer/dev | git-marijus | 2017-05-17 | 1 | -1/+1 |
| | | |\ \ \ | | | | | | | | | | | | | Update nginx | ||||
| | | | * | | | Update nginx | Thomas Willingham | 2017-05-15 | 1 | -1/+1 |
| | | | |/ / | |||||
| | | * | | | Merge pull request #774 from zotlabs/pgapps | git-marijus | 2017-05-17 | 1 | -5/+5 |
| | | |\ \ \ | | | | | | | | | | | | | Do not yet understand why on postgres, app['plugin'] gets set to 3 li… | ||||
| | | | * | | | Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds ↵ | zotlabs | 2017-05-14 | 1 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | but this prevents it from rendering | ||||
| | | * | | | | Merge pull request #775 from zotlabs/pgstuff | git-marijus | 2017-05-17 | 3 | -429/+429 |
| | | |\ \ \ \ | | | |_|_|/ | | |/| | | | always wonder about people who say "do as I say, not as I do..." | ||||
| | | | * | | | always wonder about people who say "do as I say, not as I do..." | zotlabs | 2017-05-14 | 3 | -429/+429 |
| | | | | |/ | | | |/| | |||||
| | * | | | | css first aid for mod setup | Mario Vavti | 2017-05-17 | 1 | -0/+6 |
| | | | | | | |||||
| | * | | | | silence php warning during install | Mario Vavti | 2017-05-17 | 1 | -1/+1 |
| | | |/ / | |/| | | |||||
| * | | | | schema fixes | zotlabs | 2017-05-22 | 2 | -3/+7 |
| | | | | | |||||
| * | | | | some issues with the app order template logic | zotlabs | 2017-05-21 | 2 | -7/+8 |
| | | | | | |||||
| * | | | | apporder module and all the associated backend stuff to make it work; ↵ | zotlabs | 2017-05-21 | 5 | -2/+153 |
| | | | | | | | | | | | | | | | | | probably needs a bit of UI cleanup and a link to it from somewhere | ||||
| * | | | | provide mechanism to arbitrarily sort the nav tray apps, currently the ↵ | zotlabs | 2017-05-16 | 2 | -0/+46 |
| | | | | | | | | | | | | | | | | | preferred order list needs to be manually created | ||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-16 | 6 | -18/+2061 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | regenerate optimized autoload files | Mario Vavti | 2017-05-16 | 2 | -0/+2016 |
| | | | | | |||||
| | * | | | include attach.php here (boot.php) instead of each file that uses it. ↵ | zotlabs | 2017-05-16 | 1 | -0/+1 |
| | |/ / | | | | | | | | | | Eventually this needs to move to an autoloader. | ||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-05-12 | 4 | -16/+42 |
| | |\ \ | |||||
| | | * \ | Merge pull request #770 from zotlabs/mast496 | git-marijus | 2017-05-12 | 3 | -14/+40 |
| | | |\ \ | | | | | | | | | | | consolidate and simplify the generation of activitystreams persons, a… | ||||
| | | | * | | consolidate and simplify the generation of activitystreams persons, add a ↵ | zotlabs | 2017-05-11 | 3 | -14/+40 |
| | | | | | | | | | | | | | | | | | | | | | couple more fields hoping eventually Mastodon will accept legal follow activities without choking on them. Requires an update of plugins also. | ||||
| | | * | | | Merge pull request #771 from zotlabs/filesync | git-marijus | 2017-05-12 | 1 | -2/+2 |
| | | |\ \ \ | | | |_|/ | | |/| | | issue #769 | ||||
| | | | * | | issue #769 | zotlabs | 2017-05-11 | 1 | -2/+2 |
| | | | |/ | |||||
| | * | / | Empty ACL should not result in no ACL when uploading a file | Mario Vavti | 2017-05-11 | 1 | -4/+5 |
| | |/ / | |||||
| * | | | danger - do not use 'char(n)' with postgres it creates a thing called a ↵ | zotlabs | 2017-05-15 | 2 | -24/+24 |
| | | | | | | | | | | | | | bpchar which is different than a normal text field in subtle ways. | ||||
| * | | | no bug reporting info in docs | zotlabs | 2017-05-15 | 2 | -10/+12 |
| | | | | |||||
| * | | | this looks like a slightly cleaner solution to the unicode dl issue | zotlabs | 2017-05-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | hubzilla issue #777 | zotlabs | 2017-05-14 | 1 | -1/+1 |
| | | | | |||||
| * | | | Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds ↵ | zotlabs | 2017-05-14 | 1 | -5/+5 |
| | | | | | | | | | | | | | but this prevents it from rendering | ||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-11 | 1 | -1/+3 |
| |\| | | |||||
| | * | | Merge pull request #767 from zotlabs/realm_ac | git-marijus | 2017-05-11 | 1 | -1/+3 |
| | |\ \ | | |/ | |/| | send directory realm_token for navbar autocomplete searches - if conf… | ||||
| | | * | send directory realm_token for navbar autocomplete searches - if configured | zotlabs | 2017-05-10 | 1 | -1/+3 |
| | | | | |||||
| * | | | consolidate email validation checks | zotlabs | 2017-05-11 | 5 | -28/+3 |
| | | | | |||||
| * | | | issue #769 | zotlabs | 2017-05-11 | 1 | -2/+2 |
| | | | | |||||
| * | | | disable oauth2 until I can get back to it - it's throwing typos | zotlabs | 2017-05-10 | 2 | -2/+4 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-10 | 5 | -11074/+10557 |
| |\| | | |||||
| | * | | missing clearfix | Mario Vavti | 2017-05-10 | 3 | -3/+3 |
| | | | | |||||
| | * | | Merge pull request #766 from phellmes/dev | git-marijus | 2017-05-10 | 2 | -11071/+10554 |
| | |\ \ | | | | | | | | | Update DE translation strings (also for 2.4RC) | ||||
| | | * | | Update DE translation strings | phellmes | 2017-05-09 | 2 | -11071/+10554 |
| | | |/ | |||||
| | * | | don't allow html in plugin comment blocks | zotlabs | 2017-05-10 | 1 | -0/+1 |
| | | | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |