Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'dspr' into red | zotlabs | 2017-03-09 | 11 | -7395/+7326 |
|\ | |||||
| * | move all the diaspora content hacks to the diaspora plugin | zotlabs | 2017-03-08 | 1 | -408/+9 |
| | | |||||
| * | DCV stuff | zotlabs | 2017-03-07 | 1 | -20/+6 |
| | | |||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-03-07 | 3 | -10/+10 |
| |\ | |||||
| | * | allow post_activity_item to be passed an empty ACL without resetting to ↵ | zotlabs | 2017-03-06 | 1 | -1/+2 |
| | | | | | | | | | | | | channel default | ||||
| | * | add public_policy to the nwiki container also. This should not affect the ↵ | zotlabs | 2017-03-06 | 1 | -0/+2 |
| | | | | | | | | | | | | recent bug as presented, but is being added for consistency. | ||||
| | * | correct fix for wiki anonymous read issue (items_permissions_sql checks ↵ | zotlabs | 2017-03-06 | 2 | -9/+6 |
| | | | | | | | | | | | | item.public_policy which was set for posts, not wikis) | ||||
| * | | Big 2.2 string update Dutch | jeroenpraat | 2017-03-07 | 2 | -6864/+7305 |
| |/ | |||||
| * | allow unauthenticated access to public wiki pages | Mario Vavti | 2017-03-06 | 1 | -2/+10 |
| | | |||||
| * | do not collapse long nsfw content | Mario Vavti | 2017-03-06 | 1 | -1/+1 |
| | | |||||
| * | remove include/probe.php which has never completed development and has never ↵ | zotlabs | 2017-03-05 | 4 | -106/+1 |
| | | | | | | | | been used | ||||
* | | go back to where the problem started | zotlabs | 2017-03-09 | 2 | -600/+13 |
| | | |||||
* | | Merge branch 'dev' into red | zotlabs | 2017-03-05 | 1824 | -18/+2 |
|\| | |||||
| * | move emoji emoticons (not reactions) to plugin | zotlabs | 2017-03-05 | 1824 | -18/+2 |
| | | |||||
* | | some event work | zotlabs | 2017-03-05 | 2 | -0/+5 |
|/ | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-05 | 22 | -4756/+5247 |
|\ | |||||
| * | Merge pull request #689 from mjfriaza/dev | zotlabs | 2017-03-05 | 2 | -2329/+2378 |
| |\ | | | | | | | Translated the last strings into Spanish version | ||||
| | * | Translated the last strings into Spanish version | Manuel Jiménez Friaza | 2017-03-05 | 2 | -2329/+2378 |
| | | | |||||
| * | | Merge pull request #688 from dawnbreak/markdown | zotlabs | 2017-03-05 | 20 | -2427/+2869 |
| |\ \ | | | | | | | | | :arrow_up: :hammer: Upgrade Markdownify library. | ||||
| | * | | :arrow_up: :hammer: Upgrade Markdownify library. | Klaus Weidenbach | 2017-03-05 | 20 | -2427/+2869 |
| |/ / | | | | | | | | | | | | | | | | | | | | | | The current version 2.0.0 (alpha) throws deprecated warning with PHP7.1 and PHPUnit. Upgrade the HTML to Markdown converter for PHP to the current Markdownify 2.2.1. Used composer to manage this library. | ||||
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-04 | 2 | -1/+2 |
|\| | | |||||
| * | | update changelog | Mario Vavti | 2017-03-04 | 1 | -0/+1 |
| | | | |||||
| * | | we need item edited for wiki page history, not item created | Mario Vavti | 2017-03-04 | 1 | -1/+1 |
| | | | |||||
* | | | minor feed issue | zotlabs | 2017-03-04 | 1 | -0/+8 |
|/ / | |||||
* | | string update | zotlabs | 2017-03-03 | 1 | -887/+910 |
| | | |||||
* | | fix badge position for narrow navbar | Mario Vavti | 2017-03-03 | 1 | -4/+0 |
| | | |||||
* | | reverse sort order | zotlabs | 2017-03-02 | 1 | -1/+1 |
| | | |||||
* | | activity widget - turns out the owner is not relevant. | zotlabs | 2017-03-02 | 1 | -9/+5 |
| | | |||||
* | | document the activity widget | zotlabs | 2017-03-02 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge | zotlabs | 2017-03-02 | 9 | -28/+23 |
|\ \ | |||||
| * | | provide info if there are no sche,es available | Mario Vavti | 2017-03-02 | 1 | -4/+9 |
| | | | |||||
| * | | reset schema value after we empty and repopulate it. second half of fix for #624 | Mario Vavti | 2017-03-02 | 2 | -2/+2 |
| | | | |||||
| * | | reset schema value after we empty and repopulate it. first half of fix for #624 | Mario Vavti | 2017-03-02 | 1 | -0/+2 |
| | | | |||||
| * | | setting top position of contextual-help in schemes does not work with narrow ↵ | Mario Vavti | 2017-03-02 | 4 | -5/+0 |
| | | | | | | | | | | | | navbar setting. schema css is always called last. | ||||
| * | | add title to connect button | Mario Vavti | 2017-03-01 | 1 | -1/+1 |
| | | | |||||
| * | | minor template fixes | Mario Vavti | 2017-03-01 | 3 | -19/+12 |
| | | | |||||
* | | | activity widget - like the forum widget but represents unseen activity by ↵ | zotlabs | 2017-03-02 | 9 | -4/+97 |
| | | | | | | | | | | | | author. Still experimental until it can be tested with diaspora xchans, which may require additional urlencoding. | ||||
* | | | make system.expire_delivery_reports default setting consistent (10 days) | zotlabs | 2017-03-01 | 1 | -1/+1 |
|/ / | |||||
* | | cleaner integration between the headers and session options of z_fetch_url() | zotlabs | 2017-02-28 | 1 | -7/+26 |
| | | |||||
* | | expire unread system notifications after a year. It would provide a better ↵ | zotlabs | 2017-02-28 | 1 | -0/+7 |
| | | | | | | | | experience for infrequent visitors if we didn't expire them at all, but at some point we need to draw a line so as not to degrade system performance searching through old notifications that it's highly unlikely will ever be viewed again. | ||||
* | | Merge pull request #686 from dawnbreak/markdown | zotlabs | 2017-03-01 | 28 | -3075/+7787 |
|\ \ | | | | | | | Upgrade PHP Markdown library. | ||||
| * | | :arrow_up: :hammer: Upgrade PHP Markdown library. | Klaus Weidenbach | 2017-02-27 | 27 | -2420/+7132 |
| | | | | | | | | | | | | | | | | | | The current version throws deprecated warning with PHP7.1 and PHPUnit. Upgrade the Markdown library to the current PHP Markdown Lib 1.7.0. Used composer to manage this library. | ||||
| * | | Move library/markdown.php to keep history. | Klaus Weidenbach | 2017-02-27 | 1 | -0/+0 |
| | | | |||||
* | | | missing css class | Mario Vavti | 2017-02-28 | 1 | -1/+1 |
| | | | |||||
* | | | provide 'session' option to z_fetch_url to assist with remote fetches ↵ | zotlabs | 2017-02-27 | 2 | -1/+5 |
| | | | | | | | | | | | | requiring magic auth | ||||
* | | | make magic-auth work with profile vcard fetch | zotlabs | 2017-02-27 | 1 | -1/+2 |
| | | | |||||
* | | | remove logging | zotlabs | 2017-02-27 | 1 | -1/+1 |
| | | | |||||
* | | | fetch profile vcard for connection | zotlabs | 2017-02-27 | 2 | -1/+50 |
| | | | |||||
* | | | string update | zotlabs | 2017-02-27 | 1 | -1424/+1442 |
| | | | |||||
* | | | a bit more DAV doco improvement | zotlabs | 2017-02-27 | 1 | -1/+1 |
| | | |