aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Replace Mardownify library with html-to-markdown library.Klaus Weidenbach2017-05-2344-3352/+2372
|
* 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 th…
| | * provide mechanism to arbitrarily sort the nav tray apps, currently the ↵zotlabs2017-05-162-0/+46
| | | | | | | | | | | | preferred order list needs to be manually created
| * | Merge pull request #782 from dawnbreak/QA_testinggit-marijus2017-05-172-52/+254
| |\ \ | | | | | | | | :construction_worker::white_check_mark: Documentation Permissions.php.
| | * | :construction_worker::white_check_mark: Documentation Permissions.php.Klaus Weidenbach2017-05-172-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/docbuggit-marijus2017-05-172-10/+12
| |\ \ | | | | | | | | no bug reporting info in docs
| | * | no bug reporting info in docszotlabs2017-05-152-10/+12
| | | |
| * | | Merge pull request #778 from beardyunixer/devgit-marijus2017-05-171-1/+1
| |\ \ \ | | | | | | | | | | Update nginx
| | * | | 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 li…
| | * | | Do not yet understand why on postgres, app['plugin'] gets set to 3 linefeeds ↵zotlabs2017-05-141-5/+5
| | | | | | | | | | | | | | | | | | | | but this prevents it from rendering
| * | | | 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..."
| | * | | always wonder about people who say "do as I say, not as I do..."zotlabs2017-05-143-429/+429
| | | |/ | | |/|
| * | | regenerate optimized autoload filesMario Vavti2017-05-162-0/+2016
| | | |
| * | | include attach.php here (boot.php) instead of each file that uses it. ↵zotlabs2017-05-161-0/+1
| |/ / | | | | | | | | | Eventually this needs to move to an autoloader.
* | | css first aid for mod setupMario Vavti2017-05-171-0/+6
| | |
* | | silence php warning during installMario Vavti2017-05-171-1/+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, a…
| | * | consolidate and simplify the generation of activitystreams persons, add a ↵zotlabs2017-05-113-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/filesyncgit-marijus2017-05-121-2/+2
| |\ \ \ | | |_|/ | |/| | issue #769
| | * | issue #769zotlabs2017-05-111-2/+2
| | |/
* | / Empty ACL should not result in no ACL when uploading a fileMario Vavti2017-05-111-4/+5
|/ /
* | Merge pull request #767 from zotlabs/realm_acgit-marijus2017-05-111-1/+3
|\ \ | |/ |/| send directory realm_token for navbar autocomplete searches - if conf…
| * send directory realm_token for navbar autocomplete searches - if configuredzotlabs2017-05-101-1/+3
| |
* | missing clearfixMario Vavti2017-05-103-3/+3
| |
* | Merge pull request #766 from phellmes/devgit-marijus2017-05-102-11071/+10554
|\ \ | | | | | | Update DE translation strings (also for 2.4RC)
| * | Update DE translation stringsphellmes2017-05-092-11071/+10554
| |/
* | don't allow html in plugin comment blockszotlabs2017-05-101-0/+1
| |
* | use correct data typezotlabs2017-05-101-1/+1
| |
* | zot protocol doco updateszotlabs2017-05-101-2/+2
| |
* | handle mastodon urls in markdown/bbcode conversionzotlabs2017-05-102-3/+3
|/
* make all label boldMario Vavti2017-05-091-1/+1
|
* Merge pull request #763 from anaqreon/devgit-marijus2017-05-091-1/+43
|\ | | | | Implemented switch statement logic in Comanche layout parser.
| * Implemented switch statement logic in Comanche layout parser.root2017-05-081-1/+43
| |
* | Merge pull request #762 from mjfriaza/devgit-marijus2017-05-092-544/+564
|\ \ | |/ |/| Updated the Spanish translation
| * Updated the Spanish translationManuel Jiménez Friaza2017-05-082-544/+564
| |
* | get rid of edit activitieszotlabs2017-05-081-1/+11
| |
* | cover photo was unintentionally disabled when block_public in effectzotlabs2017-05-081-3/+4
| |
* | Merge pull request #756 from dawnbreak/QA_testinggit-marijus2017-05-074-6/+22
|\ \ | | | | | | :construction_worker::white_check_mark::bug: Import table structure in TravisCI.
| * | :construction_worker::white_check_mark::bug: Import table structure in TravisCI.Klaus Weidenbach2017-05-064-6/+22
| | | | | | | | | | | | | | | Fix a syntax error in schema_postres.sql which was discovered while working on this.
* | | Merge pull request #761 from anaqreon/devgit-marijus2017-05-071-1/+1
|\ \ \ | |/ / |/| | Mail subject bug fix
| * | Mail subject bug fixAndrew Manning2017-05-071-1/+1
|/ /
* | collapse sysapps if viewing a remote channelMario Vavti2017-05-053-11/+38
| |