aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into oauth2Andrew Manning2018-03-3124-50/+99
|\
| * Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-316-5/+10
| |\
| | * Hubzilla issue #1022 - improve the usabilityzotlabs2018-03-302-5/+3
| | * Hubzilla issue #1022 - provide a way to share wiki pages. Currently this is o...zotlabs2018-03-302-0/+7
| | * hubzilla issue #1020 - PM using unicode domain for recipient. May require fur...zotlabs2018-03-302-3/+3
| | * allow case independence of replacements as well as patternszotlabs2018-03-302-2/+2
| * | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-03-306-17/+32
| |\|
| | * display and link issues with quoted tagszotlabs2018-03-291-6/+7
| | * add directory keyword links to profilezotlabs2018-03-291-2/+13
| | * directory: link entry keywords to a directory keyword searchzotlabs2018-03-291-2/+2
| | * hubzilla issue #1019 - punycode urls on connedit page when displaying locationszotlabs2018-03-293-7/+10
| * | 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 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
* | | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-19 03:17:30 +0000