Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-31 | 6 | -5/+10 |
|\ | |||||
| * | Hubzilla issue #1022 - improve the usability | zotlabs | 2018-03-30 | 2 | -5/+3 |
| | | |||||
| * | Hubzilla issue #1022 - provide a way to share wiki pages. Currently this is ↵ | zotlabs | 2018-03-30 | 2 | -0/+7 |
| | | | | | | | | only implemented in the 'edit' pane and could use some improvement/enhancement | ||||
| * | hubzilla issue #1020 - PM using unicode domain for recipient. May require ↵ | zotlabs | 2018-03-30 | 2 | -3/+3 |
| | | | | | | | | further testing | ||||
| * | allow case independence of replacements as well as patterns | zotlabs | 2018-03-30 | 2 | -2/+2 |
| | | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-30 | 6 | -17/+32 |
|\| | |||||
| * | display and link issues with quoted tags | zotlabs | 2018-03-29 | 1 | -6/+7 |
| | | |||||
| * | add directory keyword links to profile | zotlabs | 2018-03-29 | 1 | -2/+13 |
| | | |||||
| * | directory: link entry keywords to a directory keyword search | zotlabs | 2018-03-29 | 1 | -2/+2 |
| | | |||||
| * | hubzilla issue #1019 - punycode urls on connedit page when displaying locations | zotlabs | 2018-03-29 | 3 | -7/+10 |
| | | |||||
* | | bump version | Mario Vavti | 2018-03-29 | 1 | -1/+1 |
|/ | |||||
* | hubzilla issue #1015 - login with unicode domain name | zotlabs | 2018-03-28 | 2 | -3/+5 |
| | |||||
* | use context method | zotlabs | 2018-03-28 | 1 | -0/+1 |
| | |||||
* | update folder timestamp on uploaded files (fixme - we need to recurse back ↵ | zotlabs | 2018-03-27 | 1 | -0/+10 |
| | | | | to the storage root but that is for another day) | ||||
* | uexport: set content-type to json and add sections info to the default ↵ | zotlabs | 2018-03-27 | 1 | -2/+2 |
| | | | | filename if present | ||||
* | put vcard widget with author of top-level post on display page | zotlabs | 2018-03-27 | 3 | -2/+12 |
| | |||||
* | don't include the q and PHPSESSID request variables in a redirected rpost | zotlabs | 2018-03-27 | 1 | -1/+3 |
| | |||||
* | Hard fail imports of removed channels. This is silly. | zotlabs | 2018-03-27 | 1 | -0/+5 |
| | |||||
* | IDN: force baseurl to be punycode; for consistency and federation all ↵ | zotlabs | 2018-03-25 | 1 | -5/+5 |
| | | | | internal urls are US-ASCII, unicode MAY be used for display. | ||||
* | php strpos() empty needle warning when a term entry has no url | zotlabs | 2018-03-25 | 1 | -1/+1 |
| | |||||
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-03-25 | 0 | -0/+0 |
|\ | |||||
| * | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-25 | 4 | -36/+45 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-24 | 1 | -1/+9 |
| |\ \ | |||||
* | \ \ | Merge branch 'newmemberwidget' | zotlabs | 2018-03-25 | 2 | -13/+12 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | testing start_menu feature | zotlabs | 2018-03-25 | 1 | -2/+3 |
| | | | | |||||
| * | | | turn newmember widget into a feature | zotlabs | 2018-03-23 | 2 | -12/+10 |
| | | | | |||||
* | | | | preserve existing categories when updating an app from an embed source | zotlabs | 2018-03-24 | 1 | -0/+6 |
| | | | | |||||
* | | | | app sellpage not being stored | zotlabs | 2018-03-24 | 2 | -0/+2 |
| | | | | |||||
* | | | | code optimisations and de-duplication on updating parent commented timestamp | zotlabs | 2018-03-24 | 2 | -36/+37 |
| | | | | |||||
* | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2018-03-23 | 807 | -19102/+37200 |
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| | | |||||
| * | | Update hmessages.po | goofy-bz | 2018-03-23 | 1 | -6/+6 |
| | | | | | | | | | typofix | ||||
| * | | Update translations for catalan (ca/ca_ES) from transifex | fadelkon | 2018-03-23 | 6 | -6966/+11194 |
| | | | |||||
| * | | Merge pull request #1009 from dawnbreak/QA_testing | git-marijus | 2018-03-23 | 2 | -15/+28 |
| |\ \ | | | | | | | | | :construction_worker:Extend Travis, add PostgreSQL10. | ||||
| | * | | :construction_worker:Extend Travis, add PostgreSQL10. | Klaus Weidenbach | 2018-03-17 | 2 | -15/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | Add PostgreSQL10 to TravisCI through Docker container. Use PHP7.2 instead of PHP7.1 as default test environment. Update to current stable MariaDB 10.2 from stable (GA) 10.1. | ||||
| * | | | Merge pull request #1010 from dawnbreak/dev | git-marijus | 2018-03-23 | 795 | -12112/+25965 |
| |\ \ \ | | | | | | | | | | | :arrow_up: Update libraries. | ||||
| | * | | | :arrow_up: Update libraries. | Klaus Weidenbach | 2018-03-18 | 795 | -12112/+25965 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | michelf/php-markdown (1.7.0 => 1.8.0) ezyang/htmlpurifier (v4.9.3 => v4.10.0) commerceguys/intl (v0.7.4 => v0.7.5) sabre/http (4.2.3 => v4.2.4) sabre/vobject (4.1.3 => 4.1.5) | ||||
| * | | | | an attemot to fix the PermissionRolesTest | Mario Vavti | 2018-03-23 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-23 | 6 | -17/+94 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | new markdown lib seems to handle < and > correct. remove the workaraound. | Mario Vavti | 2018-03-23 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | prevent reload loop if somebody lands on /ochannel (without channel_address ↵ | Mario Vavti | 2018-03-22 | 1 | -0/+3 |
| | | | | | | | | | | | | | | | | | | | | and without trailing slash) | ||||
* | | | | | logic fallacy when updating parent timestamp of moderated comment | zotlabs | 2018-03-23 | 1 | -1/+9 |
| |/ / / |/| | | | |||||
* | | | | tagadelic was being overly protective of permissions. | zotlabs | 2018-03-22 | 1 | -2/+2 |
| | | | | |||||
* | | | | slight change in mail privacy implementation. If you initiate a private mail ↵ | zotlabs | 2018-03-22 | 1 | -4/+22 |
| | | | | | | | | | | | | | | | | conversation and they respond, accept the reply. You can't hide behind your permissions or lack thereof. Often this will be accidental. If you truly want to block them from replying and your permissions otherwise would not allow them to reply, delete the conversation. | ||||
* | | | | make list mode work in cards and articles | zotlabs | 2018-03-22 | 4 | -8/+42 |
| | | | | |||||
* | | | | make alt_pager work for articles/cards | zotlabs | 2018-03-22 | 2 | -6/+29 |
| | | | | |||||
* | | | | hubzilla issue #1013 - comments not displayed in single card/article view | zotlabs | 2018-03-22 | 2 | -4/+6 |
|/ / / | |||||
* | | | Hubzilla issue #1006, fix anonymous comments bump thread before being approved. | zotlabs | 2018-03-21 | 2 | -2/+16 |
| | | | |||||
* | | | initial support for alternative sort orders on the cloud pages. Can be ↵ | zotlabs | 2018-03-21 | 3 | -1/+24 |
| | | | | | | | | | | | | triggered manually but further development is required. | ||||
* | | | Add Ochannel module for testing OStatus bad behaviour | zotlabs | 2018-03-21 | 1 | -0/+66 |
| | | | |||||
* | | | add the social "party" permission role | zotlabs | 2018-03-20 | 3 | -5/+29 |
|/ / |