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-marijus
|
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-marijus
|
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-marijus
|
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-marijus
|
e9225b15d2
|
Merge pull request #1144 from galettesaucisse/patch-44
Create /doc/context/fr/settings/tokens
|
2018-05-02 09:44:49 +02:00 |
|
git-marijus
|
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-marijus
|
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-marijus
|
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-marijus
|
34717cc83c
|
Merge pull request #1140 from galettesaucisse/patch-39
Create /doc/context/photos/help.html
|
2018-05-02 09:42:49 +02:00 |
|
git-marijus
|
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 |
|
zotlabs
|
32423a7706
|
parent folder permissions weren't being checked back to the cloud root directory in all cases
|
2018-04-30 22:30:59 -07:00 |
|
Galette Saucisse
|
57cb4ccb74
|
Create /doc/context/fr/wiki/help.html
|
2018-04-30 14:36:19 +02:00 |
|
Mario Vavti
|
d872a0ca86
|
activitypub xchans do not have an xchan_addr. use xchan_url for the follow button if we do not find an xchan_addr
|
2018-04-30 14:33:35 +02:00 |
|
Galette Saucisse
|
9c5ddf079a
|
Create /doc/context/fr/webpages/help.html
|
2018-04-30 14:27:05 +02:00 |
|
Galette Saucisse
|
f094ac19d1
|
Create /doc/context/fr/settings/tokens
|
2018-04-30 14:16:02 +02:00 |
|
Galette Saucisse
|
7f244a8039
|
Create /doc/context/fr/settings/channel/help.html
|
2018-04-30 14:04:38 +02:00 |
|
Galette Saucisse
|
14953fa5c9
|
Create /doc/context/fr/settings/account/help.html
|
2018-04-30 14:02:26 +02:00 |
|
Galette Saucisse
|
75f73fffe1
|
Create /doc/context/fr/profile/help.html
|
2018-04-30 12:35:46 +02:00 |
|
Galette Saucisse
|
897dd7f380
|
Create /doc/context/photos/help.html
|
2018-04-30 12:30:55 +02:00 |
|
Galette Saucisse
|
95f1366f0c
|
Create /doc/context/fr/mail/help.html
|
2018-04-30 12:22:42 +02:00 |
|
Mario
|
feb5d3af89
|
fix another pgsql update error
|
2018-04-30 11:52:04 +02:00 |
|
Mario Vavti
|
b223e364c6
|
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 f620274c6a68ae9a2a6a5142947aa199862087fc.
|
2018-04-30 10:28:32 +02:00 |
|
git-marijus
|
0c27fdd944
|
Merge pull request #1138 from galettesaucisse/patch-37
Create /doc/context/fr/events/help.html
|
2018-04-30 09:58:35 +02:00 |
|
git-marijus
|
1bc9672ec8
|
Merge pull request #1137 from galettesaucisse/patch-36
Create /doc/context/fr/connedit/help.html
|
2018-04-30 09:57:41 +02:00 |
|
git-marijus
|
6e61e2a45b
|
Merge pull request #1136 from galettesaucisse/patch-35
Create /doc/context/fr/connections/ifpending/help.html
|
2018-04-30 09:56:12 +02:00 |
|
git-marijus
|
2af61605f2
|
Merge pull request #1135 from galettesaucisse/patch-34
Create /doc/context/fr/connections/help.html
|
2018-04-30 09:55:33 +02:00 |
|
git-marijus
|
f08777c9ac
|
Merge pull request #1134 from galettesaucisse/patch-33
Create /doc/context/fr/cloud/help.html
|
2018-04-30 09:54:40 +02:00 |
|
git-marijus
|
3ed19f5b00
|
Merge pull request #1133 from HappyPony/patch-1
Russian translation for cards
|
2018-04-30 09:53:49 +02:00 |
|
git-marijus
|
40dd8aa3d4
|
Merge pull request #1127 from galettesaucisse/patch-26
Create /doc/context/fr/chat/help.html
|
2018-04-30 09:53:04 +02:00 |
|
git-marijus
|
774dc871cc
|
Merge pull request #1126 from galettesaucisse/patch-25
Create /doc/context/fr/cards/help.html
|
2018-04-30 09:52:32 +02:00 |
|
git-marijus
|
6e0be570dd
|
Merge pull request #1125 from galettesaucisse/patch-24
Create /doc/context/fr/apps/edit/help.html
|
2018-04-30 09:51:24 +02:00 |
|
git-marijus
|
8d16092171
|
Merge pull request #1124 from galettesaucisse/patch-23
Create /doc/context/fr/appman/help.html
|
2018-04-30 09:49:18 +02:00 |
|