Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
|/ / | |||||
* / | do not include pending registrations in accounts and goaway to ↵ | Mario Vavti | 2018-03-17 | 2 | -3/+6 |
|/ | | | | /admin/accounts after approval or denial of an pending registration | ||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-17 | 4 | -21/+20 |
|\ | |||||
| * | slight re-org and update of documentation, moving the tutorial to the top. | zotlabs | 2018-03-16 | 4 | -21/+20 |
| | | |||||
* | | change hearts for heart in reactions but cheet with the unicode | Mario Vavti | 2018-03-16 | 1 | -0/+0 |
| | | |||||
* | | use transform to scale emojis. this prevents text jumping on hover | Mario Vavti | 2018-03-16 | 1 | -2/+3 |
|/ | |||||
* | add auth flag to share attributes so we can make a costly determination to ↵ | zotlabs | 2018-03-15 | 6 | -52/+43 |
| | | | | use zid at post submission time instead of making multiple calls to is_matrix_url() at render time | ||||
* | match hosts instead of urls to decide if to zid or not to zid | Mario Vavti | 2018-03-15 | 1 | -7/+7 |
| | |||||
* | do not always zid share links. add missing < | Mario Vavti | 2018-03-15 | 1 | -4/+4 |
| | |||||
* | add xchan_network = zot and xchan_deleted = 0 to the random_profile() query | Mario Vavti | 2018-03-15 | 1 | -1/+4 |
| | |||||
* | add zotadel.net to directory fallback servers | Mario Vavti | 2018-03-15 | 1 | -1/+2 |
| | |||||
* | mastodon content-warning cont: only strip nsfw tag if a content warning ↵ | zotlabs | 2018-03-14 | 1 | -1/+1 |
| | | | | spoiler is used. Else it's legitimately nsfw. | ||||
* | more work with unicode usernames | zotlabs | 2018-03-14 | 2 | -4/+4 |
| | |||||
* | use original exif_read_data() parameters which were lost in a regression; ↵ | zotlabs | 2018-03-14 | 2 | -1/+9 |
| | | | | unset automatic nsfw category generated for Mastodon content warning posts, as people use CW as a spoiler mechanism 99% of the time and flagging inappropriate content 1% of the time. | ||||
* | indicate that there are events today in notifications by changing the badge ↵ | Mario Vavti | 2018-03-14 | 1 | -0/+8 |
| | | | | class from secondary to danger. issue #1001 | ||||
* | update justified gallery lib from 3.6.3 to 3.6.5 | Mario Vavti | 2018-03-14 | 4 | -60/+93 |
| | |||||
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-03-14 | 3 | -7/+14 |
|\ | |||||
| * | make unicode usernames work in chanview module | zotlabs | 2018-03-14 | 1 | -1/+1 |
| | |