aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* apporder style improvement and add to nav menu, also add language awareness t...zotlabs2017-05-226-17/+55
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-2211-73/+276
|\
| * bump versionMario Vavti2017-05-201-1/+1
| * resolve merge conflictzotlabs2017-05-202-24/+24
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-193-13/+13
| |\
| | * some styling for system notificationsMario Vavti2017-05-183-13/+13
| * | smileybutton fixesMario Vavti2017-05-191-2/+0
| |/
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-1713-497/+2764
| |\
| | * Merge pull request #783 from zotlabs/app_ordergit-marijus2017-05-172-0/+46
| | |\
| | | * provide mechanism to arbitrarily sort the nav tray apps, currently the prefer...zotlabs2017-05-162-0/+46
| | * | Merge pull request #782 from dawnbreak/QA_testinggit-marijus2017-05-172-52/+254
| | |\ \
| | | * | :construction_worker::white_check_mark: Documentation Permissions.php.Klaus Weidenbach2017-05-172-52/+254
| | | |/
| | * | Merge pull request #780 from zotlabs/docbuggit-marijus2017-05-172-10/+12
| | |\ \
| | | * | no bug reporting info in docszotlabs2017-05-152-10/+12
| | * | | Merge pull request #778 from beardyunixer/devgit-marijus2017-05-171-1/+1
| | |\ \ \
| | | * | | Update nginxThomas Willingham2017-05-151-1/+1
| | | |/ /
| | * | | Merge pull request #774 from zotlabs/pgappsgit-marijus2017-05-171-5/+5
| | |\ \ \
| | | * | | Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds ...zotlabs2017-05-141-5/+5
| | * | | | Merge pull request #775 from zotlabs/pgstuffgit-marijus2017-05-173-429/+429
| | |\ \ \ \ | | | |_|_|/ | | |/| | |
| | | * | | always wonder about people who say "do as I say, not as I do..."zotlabs2017-05-143-429/+429
| | | | |/ | | | |/|
| * | | | css first aid for mod setupMario Vavti2017-05-171-0/+6
| * | | | silence php warning during installMario Vavti2017-05-171-1/+1
| | |/ / | |/| |
* | | | schema fixeszotlabs2017-05-222-3/+7
* | | | some issues with the app order template logiczotlabs2017-05-212-7/+8
* | | | apporder module and all the associated backend stuff to make it work; probabl...zotlabs2017-05-215-2/+153
* | | | provide mechanism to arbitrarily sort the nav tray apps, currently the prefer...zotlabs2017-05-162-0/+46
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-166-18/+2061
|\ \ \ \ | | |/ / | |/| |
| * | | regenerate optimized autoload filesMario Vavti2017-05-162-0/+2016
| * | | include attach.php here (boot.php) instead of each file that uses it. Eventua...zotlabs2017-05-161-0/+1
| |/ /
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-05-124-16/+42
| |\ \
| | * \ Merge pull request #770 from zotlabs/mast496git-marijus2017-05-123-14/+40
| | |\ \
| | | * | consolidate and simplify the generation of activitystreams persons, add a cou...zotlabs2017-05-113-14/+40
| | * | | Merge pull request #771 from zotlabs/filesyncgit-marijus2017-05-121-2/+2
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | issue #769zotlabs2017-05-111-2/+2
| | | |/
| * | / Empty ACL should not result in no ACL when uploading a fileMario Vavti2017-05-111-4/+5
| |/ /
* | | danger - do not use 'char(n)' with postgres it creates a thing called a bpcha...zotlabs2017-05-152-24/+24
* | | no bug reporting info in docszotlabs2017-05-152-10/+12
* | | this looks like a slightly cleaner solution to the unicode dl issuezotlabs2017-05-141-1/+1
* | | hubzilla issue #777zotlabs2017-05-141-1/+1
* | | Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds ...zotlabs2017-05-141-5/+5
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-111-1/+3
|\| |
| * | Merge pull request #767 from zotlabs/realm_acgit-marijus2017-05-111-1/+3
| |\ \ | | |/ | |/|
| | * send directory realm_token for navbar autocomplete searches - if configuredzotlabs2017-05-101-1/+3
* | | consolidate email validation checkszotlabs2017-05-115-28/+3
* | | issue #769zotlabs2017-05-111-2/+2
* | | disable oauth2 until I can get back to it - it's throwing typoszotlabs2017-05-102-2/+4
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-105-11074/+10557
|\| |
| * | missing clearfixMario Vavti2017-05-103-3/+3
| * | Merge pull request #766 from phellmes/devgit-marijus2017-05-102-11071/+10554
| |\ \
| | * | Update DE translation stringsphellmes2017-05-092-11071/+10554
| | |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-04 06:10:08 +0000