aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* apporder module and all the associated backend stuff to make it work; ↵zotlabs2017-05-215-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 ↵zotlabs2017-05-162-0/+46
| | | | preferred order list needs to be manually created
* 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. ↵zotlabs2017-05-161-0/+1
| | | | | | | | Eventually this needs to move to an autoloader.
| * 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
| |/ /
* | | danger - do not use 'char(n)' with postgres it creates a thing called a ↵zotlabs2017-05-152-24/+24
| | | | | | | | | | | | bpchar which is different than a normal text field in subtle ways.
* | | 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
| | | | | | | | | | | | but this prevents it from rendering
* | | 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 conf…
| | * 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 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
| |/
* | don't allow html in plugin comment blockszotlabs2017-05-091-0/+1
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-094-546/+608
|\|
| * 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
| | |
* | | use correct data typezotlabs2017-05-091-1/+1
| | |
* | | zot protocol doco updateszotlabs2017-05-091-2/+2
| | |
* | | handle mastodon urls in markdown/bbcode conversionzotlabs2017-05-082-3/+3
| | |
* | | errorzotlabs2017-05-083-115/+2
| | |
* | | cleanup of last checkinzotlabs2017-05-071-2/+4
| | |
* | | cover photo was unintentionally disabled when block_public in effectzotlabs2017-05-071-3/+4
| | |
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-05-075-7/+23
|\| |
| * | 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
| |/ /