aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* uexport: set content-type to json and add sections info to the default ↵zotlabs2018-03-271-2/+2
| | | | filename if present
* put vcard widget with author of top-level post on display pagezotlabs2018-03-273-2/+12
|
* don't include the q and PHPSESSID request variables in a redirected rpostzotlabs2018-03-271-1/+3
|
* Hard fail imports of removed channels. This is silly.zotlabs2018-03-271-0/+5
|
* IDN: force baseurl to be punycode; for consistency and federation all ↵zotlabs2018-03-251-5/+5
| | | | internal urls are US-ASCII, unicode MAY be used for display.
* php strpos() empty needle warning when a term entry has no urlzotlabs2018-03-251-1/+1
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-250-0/+0
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-254-36/+45
| |\
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-241-1/+9
| |\ \
* | \ \ Merge branch 'newmemberwidget'zotlabs2018-03-252-13/+12
|\ \ \ \ | |_|_|/ |/| | |
| * | | testing start_menu featurezotlabs2018-03-251-2/+3
| | | |
| * | | turn newmember widget into a featurezotlabs2018-03-232-12/+10
| | | |
* | | | preserve existing categories when updating an app from an embed sourcezotlabs2018-03-241-0/+6
| | | |
* | | | app sellpage not being storedzotlabs2018-03-242-0/+2
| | | |
* | | | code optimisations and de-duplication on updating parent commented timestampzotlabs2018-03-242-36/+37
| | | |
* | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2018-03-23807-19102/+37200
|\ \ \ \ | | |/ / | |/| / | |_|/ |/| |
| * | Update hmessages.pogoofy-bz2018-03-231-6/+6
| | | | | | | | | typofix
| * | Update translations for catalan (ca/ca_ES) from transifexfadelkon2018-03-236-6966/+11194
| | |
| * | Merge pull request #1009 from dawnbreak/QA_testinggit-marijus2018-03-232-15/+28
| |\ \ | | | | | | | | :construction_worker:Extend Travis, add PostgreSQL10.
| | * | :construction_worker:Extend Travis, add PostgreSQL10.Klaus Weidenbach2018-03-172-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/devgit-marijus2018-03-23795-12112/+25965
| |\ \ \ | | | | | | | | | | :arrow_up: Update libraries.
| | * | | :arrow_up: Update libraries.Klaus Weidenbach2018-03-18795-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 PermissionRolesTestMario Vavti2018-03-231-1/+2
| | | | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-236-17/+94
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | new markdown lib seems to handle < and > correct. remove the workaraound.Mario Vavti2018-03-231-2/+2
| | | | |
| * | | | prevent reload loop if somebody lands on /ochannel (without channel_address ↵Mario Vavti2018-03-221-0/+3
| | | | | | | | | | | | | | | | | | | | and without trailing slash)
* | | | | logic fallacy when updating parent timestamp of moderated commentzotlabs2018-03-231-1/+9
| |/ / / |/| | |
* | | | tagadelic was being overly protective of permissions.zotlabs2018-03-221-2/+2
| | | |
* | | | slight change in mail privacy implementation. If you initiate a private mail ↵zotlabs2018-03-221-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 articleszotlabs2018-03-224-8/+42
| | | |
* | | | make alt_pager work for articles/cardszotlabs2018-03-222-6/+29
| | | |
* | | | hubzilla issue #1013 - comments not displayed in single card/article viewzotlabs2018-03-222-4/+6
|/ / /
* | | Hubzilla issue #1006, fix anonymous comments bump thread before being approved.zotlabs2018-03-212-2/+16
| | |
* | | initial support for alternative sort orders on the cloud pages. Can be ↵zotlabs2018-03-213-1/+24
| | | | | | | | | | | | triggered manually but further development is required.
* | | Add Ochannel module for testing OStatus bad behaviourzotlabs2018-03-211-0/+66
| | |
* | | add the social "party" permission rolezotlabs2018-03-203-5/+29
|/ /
* / do not include pending registrations in accounts and goaway to ↵Mario Vavti2018-03-172-3/+6
|/ | | | /admin/accounts after approval or denial of an pending registration
* Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-174-21/+20
|\
| * slight re-org and update of documentation, moving the tutorial to the top.zotlabs2018-03-164-21/+20
| |
* | change hearts for heart in reactions but cheet with the unicodeMario Vavti2018-03-161-0/+0
| |
* | use transform to scale emojis. this prevents text jumping on hoverMario Vavti2018-03-161-2/+3
|/
* add auth flag to share attributes so we can make a costly determination to ↵zotlabs2018-03-156-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 zidMario Vavti2018-03-151-7/+7
|
* do not always zid share links. add missing <Mario Vavti2018-03-151-4/+4
|
* add xchan_network = zot and xchan_deleted = 0 to the random_profile() queryMario Vavti2018-03-151-1/+4
|
* add zotadel.net to directory fallback serversMario Vavti2018-03-151-1/+2
|
* mastodon content-warning cont: only strip nsfw tag if a content warning ↵zotlabs2018-03-141-1/+1
| | | | spoiler is used. Else it's legitimately nsfw.
* more work with unicode usernameszotlabs2018-03-142-4/+4
|
* use original exif_read_data() parameters which were lost in a regression; ↵zotlabs2018-03-142-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 Vavti2018-03-141-0/+8
| | | | class from secondary to danger. issue #1001