Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | work through the diaspora_v2 outgoing status posts | zotlabs | 2017-05-28 | 1 | -1/+2 |
| | |||||
* | replace really old example widgets with pointer to current widget list | zotlabs | 2017-05-28 | 1 | -7/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-27 | 0 | -0/+0 |
|\ | |||||
| * | Merge pull request #798 from zotlabs/pagetitlefix | git-marijus | 2017-05-27 | 3 | -4/+6 |
| |\ | | | | | | | hubzilla issue #795 | ||||
| | * | hubzilla issue #795 | zotlabs | 2017-05-27 | 3 | -4/+6 |
| |/ | |||||
* | | hubzilla issue #795 | zotlabs | 2017-05-26 | 3 | -4/+6 |
| | | |||||
* | | update link to account roles help on new_channel page | zotlabs | 2017-05-25 | 1 | -1/+1 |
| | | |||||
* | | update the link to account roles help on register page | zotlabs | 2017-05-25 | 1 | -1/+1 |
| | | |||||
* | | looks like a commit was lost someplace, but I'll re-do it later (convert sql ↵ | zotlabs | 2017-05-25 | 1 | -18/+18 |
| | | | | | | | | schema files to default integers to int values); in any event change all the mysql strings that were 255 maxlength to 191 maxlength in case they get used as indexes down the line | ||||
* | | put back obsolete permission fields in abook and channel schema files so we ↵ | zotlabs | 2017-05-25 | 1 | -0/+20 |
| | | | | | | | | can restore the old data without choking when upgrading the table type | ||||
* | | start using the abook_not_here flag (requires changes in addons, not easily ↵ | zotlabs | 2017-05-25 | 3 | -5/+14 |
| | | | | | | | | portable to hubzilla) | ||||
* | | only store search info for text filetypes when updating the documentation ↵ | zotlabs | 2017-05-24 | 1 | -4/+10 |
| | | | | | | | | indexes | ||||
* | | some minor help cleanup - add '-/foo' override of language detection | zotlabs | 2017-05-24 | 2 | -42/+45 |
| | | |||||
* | | remove php version checks for older ( < 5.4) code incompatibilities | zotlabs | 2017-05-23 | 3 | -30/+15 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-23 | 46 | -3355/+2376 |
|\| | |||||
| * | bump version | Mario Vavti | 2017-05-23 | 1 | -1/+1 |
| | | |||||
| * | this looks like a slightly cleaner solution to the unicode dl issue | zotlabs | 2017-05-23 | 1 | -1/+1 |
| | | |||||
| * | hubzilla issue #777 | zotlabs | 2017-05-23 | 1 | -1/+1 |
| | | |||||
| * | wiki auto language select to match webpages implementation | zotlabs | 2017-05-23 | 2 | -6/+28 |
| | | |||||
| * | apporder style improvement and add to nav menu, also add language awareness ↵ | zotlabs | 2017-05-23 | 6 | -17/+55 |
| | | | | | | | | to webpages | ||||
| * | schema fixes | zotlabs | 2017-05-23 | 2 | -3/+7 |
| | | |||||
| * | some issues with the app order template logic | zotlabs | 2017-05-23 | 2 | -7/+8 |
| | | |||||
| * | apporder module and all the associated backend stuff to make it work; ↵ | zotlabs | 2017-05-23 | 5 | -2/+153 |
| | | | | | | | | probably needs a bit of UI cleanup and a link to it from somewhere | ||||
| * | Merge pull request #794 from dawnbreak/dev | git-marijus | 2017-05-23 | 44 | -3352/+2372 |
| |\ | | | | | | | Replace Mardownify library with html-to-markdown library. | ||||
| | * | Replace Mardownify library with html-to-markdown library. | Klaus Weidenbach | 2017-05-23 | 44 | -3352/+2372 |
| |/ | |||||
* | | add 'apps' app | zotlabs | 2017-05-23 | 2 | -0/+6 |
| | | |||||
* | | wiki auto language select to match webpages implementation | zotlabs | 2017-05-22 | 2 | -6/+28 |
| | | |||||
* | | apporder style improvement and add to nav menu, also add language awareness ↵ | zotlabs | 2017-05-22 | 6 | -17/+55 |
| | | | | | | | | to webpages | ||||
* | | 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 |
| | | | |