harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,490 Commits 6 Branches 36 Tags
894f5bc79a7fc91ee1f5a3502f3069a48abcb4f5
Commit Graph
21490 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
zotlabs 894f5bc79a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-05 02:24:37 -07:00
zotlabs b47b917eb0 check_item_source: always log uid 2018-05-05 01:52:35 -07:00
zotlabs c41c04cf11 log all possible return conditions from check_item_source(), use consistent xchan 2018-05-05 01:43:14 -07:00
Mario Vavti 0895756658 Merge remote-tracking branch 'mike/master' into dev 2018-05-05 10:03:57 +02:00
zotlabs c6e65ec6da support '@' paths 2018-05-05 00:39:53 -07:00
Mario Vavti 192b69b11a update nginx conf to address issue #1155 2018-05-05 08:38:20 +02:00
Mario Vavti 733a5ccb08 use cursor-pointer class instead of fakelink to avoid the link color for the dropdown caret 2018-05-05 07:32:35 +02:00
Mario Vavti b0ca73c1ba Merge remote-tracking branch 'mike/master' into dev 2018-05-05 07:22:31 +02:00
zotlabs 367937e479 removed the fakelink attribute as it changed the colour of the down arrow. We probably do want to change the hover cursor but not the colour. 2018-05-04 15:20:07 -07:00
zotlabs 6e91d85bcb If somebody precisely clicks the down-arrow on the author photo it should probably also trigger the dropdown 2018-05-04 15:17:15 -07:00
Mario Vavti f995ef0124 set XML_OPTION_SKIP_WHITE to 1 again 2018-05-04 22:46:43 +02:00
zotlabs 4a26f0d2d4 turn skip white back on - (xml actually doesn't parse if you disable this) 2018-05-04 13:44:34 -07:00
Mario Vavti 90cf238019 fix too big buttons in wiki list 2018-05-04 22:13:45 +02:00
Mario Vavti 97cb108937 missing permission description 2018-05-04 22:03:51 +02:00
Mario Vavti 34f6d9f714 missing basetag 2018-05-04 13:54:12 +02:00
Mario Vavti 76e644e18a bump version 2018-05-04 12:00:59 +02:00
Mario Vavti a0cefe7fdb Merge remote-tracking branch 'mike/master' into dev 2018-05-04 11:59:46 +02:00
Mario Vavti 998dd58206 switch DIRECTORY_FALLBACK_MASTER to https://zotadel.net 2018-05-04 09:37:22 +02:00
Mario Vavti ace8252569 update changelog 2018-05-04 09:34:44 +02:00
zotlabs 56113b0bde check for directories 2018-05-03 23:20:09 -07:00
zotlabs b52e9731e3 tagging changes: + (old style forum mentions), and underscore space replacement are no longer supported. 2018-05-03 20:14:58 -07:00
zotlabs 61a8a16139 add changes from ae35ac0cec to contact_autocomplete so channel source completion will work correctly 2018-05-03 17:37:16 -07:00
zotlabs eff72aeb47 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-03 17:18:36 -07:00
Mario Vavti ae35ac0cec quick fix for issue #1150 - needs improvement and review of other textcomplete implementations. 2018-05-03 13:14:12 +02:00
Mario Vavti 204838bd10 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2018-05-03 12:29:57 +02:00
git-marijusandGitHub 8442693d7a Merge pull request #1152 from dawnbreak/dev 
Update composer autoload cache.
 2018-05-03 12:17:09 +02:00
Mario Vavti cd526139fb Merge remote-tracking branch 'mike/master' into dev 2018-05-03 09:44:53 +02:00
zotlabs 75c8f656c9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2018-05-02 23:18:09 -07:00
zotlabs 459ec78a5e provide easy access to the autoperms setting for forum and repository channels. This may be needed in the future to protect an existing forum from assault by spammers with changing identities. The forum can quickly be turned into membership by approval and either left that way permanently or hopefully reversed at a later date. Previously this would require switching to expert mode or setting a pconfig manually. 2018-05-02 22:59:21 -07:00
zotlabs 6bf5eea646 make the cloud logging a bit less verbose until we actually need it. 2018-05-02 22:05:55 -07:00
zotlabs e9f49d9d9c admin delete of files 2018-05-02 20:08:59 -07:00
zotlabs 9713436f49 backend work to allow admin to delete photos. Still requires frontend work to give admin access to either the photos and/or the delete link. 2018-05-02 18:23:42 -07:00
zotlabs 406ea67bbc Provide admin delete ability if the viewer is admin but has no existing delete authority. For 3.5+ as a new string is involved. 2018-05-02 17:39:12 -07:00
Klaus Weidenbach a24d254404 Update composer autoload cache. 
Should add to Prepare RC Release documentation:
composer dump-autoload --no-dev
 2018-05-02 23:24:48 +02:00
zotlabs 285781b887 hubzilla issue #1151 - activitypub mention gets bookmarked 2018-05-02 13:49:22 -07:00
git-marijusandGitHub d83f12e883 Merge pull request #1146 from galettesaucisse/patch-46 
Create /doc/context/fr/wiki/help.html
 2018-05-02 09:46:24 +02:00
git-marijusandGitHub 76770c69bf Merge pull request #1145 from galettesaucisse/patch-45 
Create /doc/context/fr/webpages/help.html
 2018-05-02 09:45:31 +02:00
git-marijusandGitHub e9225b15d2 Merge pull request #1144 from galettesaucisse/patch-44 
Create /doc/context/fr/settings/tokens
 2018-05-02 09:44:49 +02:00
git-marijusandGitHub 3056b96bb0 Merge pull request #1143 from galettesaucisse/patch-43 
Create /doc/context/fr/settings/channel/help.html
 2018-05-02 09:44:36 +02:00
git-marijusandGitHub 856945d838 Merge pull request #1142 from galettesaucisse/patch-42 
Create /doc/context/fr/settings/account/help.html
 2018-05-02 09:44:10 +02:00
git-marijusandGitHub be1c05a03f Merge pull request #1141 from galettesaucisse/patch-40 
Create /doc/context/fr/profile/help.html
 2018-05-02 09:43:37 +02:00
git-marijusandGitHub 34717cc83c Merge pull request #1140 from galettesaucisse/patch-39 
Create /doc/context/photos/help.html
 2018-05-02 09:42:49 +02:00
git-marijusandGitHub e73cde1612 Merge pull request #1139 from galettesaucisse/patch-38 
Create /doc/context/fr/mail/help.html
 2018-05-02 09:42:14 +02:00
Mario Vavti 9615d02b35 Merge remote-tracking branch 'mike/master' into dev 2018-05-02 09:22:23 +02:00
zotlabs 7a55ead97d new feature (post 3.4): allow a different username to be used when importing. 2018-05-01 20:29:07 -07:00
zotlabs cd200ee706 The channel import page seems to have missed the big theme cleanup of the last couple of years. 2018-05-01 19:38:32 -07:00
zotlabs db930b794d provide warnings about profile photo and cover photo permissions 2018-05-01 16:54:54 -07:00
zotlabs 08bcd29eee hubzilla issue #1149, don't duplicate addressbook entries on repeated channel imports 2018-05-01 16:15:59 -07:00
Mario Vavti 3f75dd1083 Revert "Revert "hubzilla issue #1119 - xml2array has issues with some unicode sequences/conversions. Working around it using the older simplexml parser until it can be debugged, as Diaspora does not use complex XML with namespaces; which is where we need the more advaced capabilities of xml2array."" 
This reverts commit b223e364c6.
 2018-05-01 10:34:23 +02:00
Mario Vavti eb2d6fca3a Merge remote-tracking branch 'mike/master' into dev 2018-05-01 10:19:03 +02:00