| Commit message (Expand) | Author | Age | Files | Lines |
* | 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 t... | zotlabs | 2017-05-23 | 6 | -17/+55 |
* | 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; probabl... | zotlabs | 2017-05-23 | 5 | -2/+153 |
* | Merge pull request #794 from dawnbreak/dev | git-marijus | 2017-05-23 | 44 | -3352/+2372 |
|\ |
|
| * | Replace Mardownify library with html-to-markdown library. | Klaus Weidenbach | 2017-05-23 | 44 | -3352/+2372 |
|/ |
|
* | 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 the prefer... | zotlabs | 2017-05-16 | 2 | -0/+46 |
| * | | Merge pull request #782 from dawnbreak/QA_testing | git-marijus | 2017-05-17 | 2 | -52/+254 |
| |\ \ |
|
| | * | | :construction_worker::white_check_mark: Documentation Permissions.php. | Klaus Weidenbach | 2017-05-17 | 2 | -52/+254 |
| | |/ |
|
| * | | Merge pull request #780 from zotlabs/docbug | git-marijus | 2017-05-17 | 2 | -10/+12 |
| |\ \ |
|
| | * | | 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 | 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 linefeeds ... | zotlabs | 2017-05-14 | 1 | -5/+5 |
| * | | | | 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..." | zotlabs | 2017-05-14 | 3 | -429/+429 |
| | | |/
| | |/| |
|
| * | | | 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. Eventua... | zotlabs | 2017-05-16 | 1 | -0/+1 |
| |/ / |
|
* | | | 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 |
|/ / |
|
* | | 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, add a cou... | zotlabs | 2017-05-11 | 3 | -14/+40 |
| * | | | Merge pull request #771 from zotlabs/filesync | git-marijus | 2017-05-12 | 1 | -2/+2 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | 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 |
|/ / |
|
* | | 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 configured | zotlabs | 2017-05-10 | 1 | -1/+3 |
* | | 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 | phellmes | 2017-05-09 | 2 | -11071/+10554 |
| |/ |
|
* | | don't allow html in plugin comment blocks | zotlabs | 2017-05-10 | 1 | -0/+1 |
* | | use correct data type | zotlabs | 2017-05-10 | 1 | -1/+1 |
* | | zot protocol doco updates | zotlabs | 2017-05-10 | 1 | -2/+2 |
* | | handle mastodon urls in markdown/bbcode conversion | zotlabs | 2017-05-10 | 2 | -3/+3 |
|/ |
|
* | make all label bold | Mario Vavti | 2017-05-09 | 1 | -1/+1 |
* | Merge pull request #763 from anaqreon/dev | git-marijus | 2017-05-09 | 1 | -1/+43 |
|\ |
|
| * | Implemented switch statement logic in Comanche layout parser. | root | 2017-05-08 | 1 | -1/+43 |