aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into oauth2Andrew Manning2018-03-27864-27843/+50994
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-254-36/+45
| |\
| | * 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
| | |\
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-241-1/+9
| |\| | | | |/ | |/|
| | * logic fallacy when updating parent timestamp of moderated commentzotlabs2018-03-231-1/+9
| * | Update hmessages.pogoofy-bz2018-03-231-6/+6
| * | 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.Klaus Weidenbach2018-03-172-15/+28
| * | | Merge pull request #1010 from dawnbreak/devgit-marijus2018-03-23795-12112/+25965
| |\ \ \
| | * | | :arrow_up: Update libraries.Klaus Weidenbach2018-03-18795-12112/+25965
| * | | | an attemot to fix the PermissionRolesTestMario Vavti2018-03-231-1/+2
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-236-17/+94
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | 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
| | * | | 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
| * | | | 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 a...Mario Vavti2018-03-221-0/+3
| |/ / /
| * | | 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 trigge...zotlabs2018-03-213-1/+24
| * | | 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 /admin/account...Mario Vavti2018-03-172-3/+6
| |/
| * 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 us...zotlabs2018-03-156-52/+43
| * 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 spoil...zotlabs2018-03-141-1/+1
| * more work with unicode usernameszotlabs2018-03-142-4/+4
| * use original exif_read_data() parameters which were lost in a regression; uns...zotlabs2018-03-142-1/+9
| * indicate that there are events today in notifications by changing the badge c...Mario Vavti2018-03-141-0/+8
| * update justified gallery lib from 3.6.3 to 3.6.5Mario Vavti2018-03-144-60/+93
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-143-7/+14
| |\
| | * make unicode usernames work in chanview modulezotlabs2018-03-141-1/+1
| | * somewhere along the line the output of exif_read_data() changed and it no lon...zotlabs2018-03-132-6/+13
| * | fix channel_addressMario Vavti2018-03-141-1/+1
| * | make the oneway-overlay slightly opaqueMario Vavti2018-03-141-0/+1
| * | reveal the profile name field only if multi prifiles feature is enabledMario Vavti2018-03-142-9/+10
| * | show site registration notifications setting only to site adminMario Vavti2018-03-142-3/+5
| * | whitespaceMario Vavti2018-03-141-16/+16
| |/
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-13 15:52:45 +0000