aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1 from redmatrix/devmrjive2018-03-2914-28/+57
|\
| * bump versionMario Vavti2018-03-291-1/+1
| * hubzilla issue #1015 - login with unicode domain namezotlabs2018-03-282-3/+5
| * use context methodzotlabs2018-03-281-0/+1
| * update folder timestamp on uploaded files (fixme - we need to recurse back to...zotlabs2018-03-271-0/+10
| * uexport: set content-type to json and add sections info to the default filena...zotlabs2018-03-271-2/+2
| * 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 interna...zotlabs2018-03-251-5/+5
| * 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
* | | 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
|\ \ \ \ \ | | |_|_|/ | |/| | |
* | | | | 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
| | | | * 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
| * | | 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 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 09:46:06 +0000