 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 |
|
|
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 |
|
|
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 f620274c6a.
|
2018-04-30 10:28:32 +02:00 |
|
 git-marijusandGitHub
|
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-marijusandGitHub
|
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-marijusandGitHub
|
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-marijusandGitHub
|
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-marijusandGitHub
|
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-marijusandGitHub
|
3ed19f5b00
|
Merge pull request #1133 from HappyPony/patch-1
Russian translation for cards
|
2018-04-30 09:53:49 +02:00 |
|
|
git-marijusandGitHub
|
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-marijusandGitHub
|
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-marijusandGitHub
|
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-marijusandGitHub
|
8d16092171
|
Merge pull request #1124 from galettesaucisse/patch-23
Create /doc/context/fr/appman/help.html
|
2018-04-30 09:49:18 +02:00 |
|
|
git-marijusandGitHub
|
83e0442b66
|
Merge pull request #1123 from galettesaucisse/patch-22
Create /doc/context/fr/apps/help.html
|
2018-04-30 09:48:13 +02:00 |
|
 Galette SaucisseandGitHub
|
98cfad5f2d
|
Create /doc/context/fr/events/help.html
|
2018-04-30 09:19:30 +02:00 |
|
|
Mario Vavti
|
7d3dfc3ed8
|
missing class
|
2018-04-30 09:13:26 +02:00 |
|
|
Galette SaucisseandGitHub
|
5b0991fabc
|
Create /doc/context/fr/connedit/help.html
|
2018-04-30 09:11:27 +02:00 |
|
|
Mario Vavti
|
0fa638399f
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-04-30 09:08:09 +02:00 |
|
|
Galette SaucisseandGitHub
|
d59c6aa887
|
Create /doc/context/fr/connections/ifpending/help.html
|
2018-04-30 09:00:25 +02:00 |
|
|
Galette SaucisseandGitHub
|
b6ec8bf687
|
Create /doc/context/fr/connections/help.html
|
2018-04-30 08:56:53 +02:00 |
|
|
Galette SaucisseandGitHub
|
f28d6ad59e
|
Create /doc/context/fr/cloud/help.html
|
2018-04-30 08:46:55 +02:00 |
|
|
zotlabs
|
e841e48258
|
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.
|
2018-04-29 23:05:38 -07:00 |
|
 HappyPonyandGitHub
|
c0141a7d5e
|
Russian translation for cards
|
2018-04-30 06:12:35 +02:00 |
|
|
zotlabs
|
aa15867c95
|
Update issues on postgres
|
2018-04-29 17:50:35 -07:00 |
|
|
Galette SaucisseandGitHub
|
8d87b529f5
|
Create /doc/context/fr/appman/help.html
|
2018-04-29 20:37:28 +02:00 |
|
|
Galette SaucisseandGitHub
|
900663b85f
|
Create /doc/context/fr/chat/help.html
|
2018-04-29 15:37:19 +02:00 |
|
|
Galette SaucisseandGitHub
|
1e79107d0e
|
Create /doc/context/fr/cards/help.html
|
2018-04-29 15:21:30 +02:00 |
|
|
Galette SaucisseandGitHub
|
52803a30b6
|
Create /doc/context/fr/apps/edit/help.html
|
2018-04-29 15:09:14 +02:00 |
|
|
Galette SaucisseandGitHub
|
eb30658c68
|
Create /doc/context/fr/appman/help.html
|
2018-04-29 15:05:41 +02:00 |
|
|
Galette SaucisseandGitHub
|
f77aaf1def
|
Create /doc/context/fr/apps/help.html
|
2018-04-29 14:57:16 +02:00 |
|
|
zotlabs
|
8c7bf6d2f3
|
remove unused function
|
2018-04-28 14:13:56 -07:00 |
|
|
Mario Vavti
|
873670594b
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-04-27 14:24:54 +02:00 |
|
|
zotlabs
|
09ef1b1bb6
|
sql error
|
2018-04-27 02:34:52 -07:00 |
|
|
git-marijusandGitHub
|
e98c74bce7
|
Merge pull request #1120 from phellmes/dev
Update DE translation strings
|
2018-04-27 10:07:06 +02:00 |
|
|
git-marijusandGitHub
|
bb8f73b58a
|
Merge pull request #1117 from galettesaucisse/patch-19
Update FR toc.html
|
2018-04-27 10:06:11 +02:00 |
|
|
git-marijusandGitHub
|
28d1913d84
|
Merge pull request #1116 from galettesaucisse/patch-18
Delete FR project.bb from wrong folder
|
2018-04-27 10:04:20 +02:00 |
|
|
git-marijusandGitHub
|
316f68c12d
|
Merge pull request #1115 from galettesaucisse/patch-17
Update project.bb and place in correct folder
|
2018-04-27 10:01:26 +02:00 |
|
|
git-marijusandGitHub
|
c3ca257f18
|
Merge pull request #1113 from mjfriaza/dev
New strings: Spanish translation
|
2018-04-27 09:59:35 +02:00 |
|
|
Mario Vavti
|
2e9738e204
|
Merge remote-tracking branch 'mike/master' into dev
|
2018-04-27 09:54:36 +02:00 |
|
|
zotlabs
|
9a7e8f4d68
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2018-04-26 20:31:16 -07:00 |
|
|
zotlabs
|
7b445a5b39
|
where possible strip zid parameter from links that get pasted into posts so that they will get a correct zid when rendered
|
2018-04-26 20:27:14 -07:00 |
|
|
zotlabs
|
ce13fef6aa
|
more testing of attach_move() uncovered some issues
|
2018-04-26 19:21:08 -07:00 |
|