Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | 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 | |
| | | | | ||||||
* | | | | some issues with the app order template logic | zotlabs | 2017-05-21 | 2 | -7/+8 | |
| | | | | ||||||
* | | | | apporder module and all the associated backend stuff to make it work; ↵ | zotlabs | 2017-05-21 | 5 | -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 ↵ | zotlabs | 2017-05-16 | 2 | -0/+46 | |
| | | | | | | | | | | | | | | | | preferred order list needs to be manually created | |||||
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-16 | 6 | -18/+2061 | |
|\ \ \ \ | | |/ / | |/| | | ||||||
| * | | | 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. ↵ | zotlabs | 2017-05-16 | 1 | -0/+1 | |
| |/ / | | | | | | | | | | Eventually this needs to move to an autoloader. | |||||
| * | | 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, a… | |||||
| | | * | | consolidate and simplify the generation of activitystreams persons, add a ↵ | zotlabs | 2017-05-11 | 3 | -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/filesync | git-marijus | 2017-05-12 | 1 | -2/+2 | |
| | |\ \ \ | | | |_|/ | | |/| | | issue #769 | |||||
| | | * | | 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 | |
| |/ / | ||||||
* | | | danger - do not use 'char(n)' with postgres it creates a thing called a ↵ | zotlabs | 2017-05-15 | 2 | -24/+24 | |
| | | | | | | | | | | | | bpchar which is different than a normal text field in subtle ways. | |||||
* | | | no bug reporting info in docs | zotlabs | 2017-05-15 | 2 | -10/+12 | |
| | | | ||||||
* | | | this looks like a slightly cleaner solution to the unicode dl issue | zotlabs | 2017-05-14 | 1 | -1/+1 | |
| | | | ||||||
* | | | hubzilla issue #777 | zotlabs | 2017-05-14 | 1 | -1/+1 | |
| | | | ||||||
* | | | 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 branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-11 | 1 | -1/+3 | |
|\| | | ||||||
| * | | 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 conf… | |||||
| | * | send directory realm_token for navbar autocomplete searches - if configured | zotlabs | 2017-05-10 | 1 | -1/+3 | |
| | | | ||||||
* | | | consolidate email validation checks | zotlabs | 2017-05-11 | 5 | -28/+3 | |
| | | | ||||||
* | | | issue #769 | zotlabs | 2017-05-11 | 1 | -2/+2 | |
| | | | ||||||
* | | | disable oauth2 until I can get back to it - it's throwing typos | zotlabs | 2017-05-10 | 2 | -2/+4 | |
| | | | ||||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-10 | 5 | -11074/+10557 | |
|\| | | ||||||
| * | | 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 (also for 2.4RC) | |||||
| | * | | 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 | |
| |/ | ||||||
* | | don't allow html in plugin comment blocks | zotlabs | 2017-05-09 | 1 | -0/+1 | |
| | | ||||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-05-09 | 4 | -546/+608 | |
|\| | ||||||
| * | 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. | |||||
| | * | Implemented switch statement logic in Comanche layout parser. | root | 2017-05-08 | 1 | -1/+43 | |
| | | | ||||||
| * | | Merge pull request #762 from mjfriaza/dev | git-marijus | 2017-05-09 | 2 | -544/+564 | |
| |\ \ | | |/ | |/| | Updated the Spanish translation | |||||
| | * | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-05-08 | 2 | -544/+564 | |
| | | | ||||||
| * | | get rid of edit activities | zotlabs | 2017-05-08 | 1 | -1/+11 | |
| | | | ||||||
| * | | cover photo was unintentionally disabled when block_public in effect | zotlabs | 2017-05-08 | 1 | -3/+4 | |
| | | | ||||||
* | | | use correct data type | zotlabs | 2017-05-09 | 1 | -1/+1 | |
| | | | ||||||
* | | | zot protocol doco updates | zotlabs | 2017-05-09 | 1 | -2/+2 | |
| | | | ||||||
* | | | handle mastodon urls in markdown/bbcode conversion | zotlabs | 2017-05-08 | 2 | -3/+3 | |
| | | | ||||||
* | | | error | zotlabs | 2017-05-08 | 3 | -115/+2 | |
| | | | ||||||
* | | | cleanup of last checkin | zotlabs | 2017-05-07 | 1 | -2/+4 | |
| | | | ||||||
* | | | cover photo was unintentionally disabled when block_public in effect | zotlabs | 2017-05-07 | 1 | -3/+4 | |
| | | |