aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-029-86/+114
| |\ \ \
| * | | | Revert "Revert "hubzilla issue #1119 - xml2array has issues with some ↵Mario Vavti2018-05-011-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 b223e364c6221aa3c680505fda4acfd6a1790272.
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-05-012-62/+47
| |\ \ \ \ | | |_|_|/ | |/| | |
| * | | | activitypub xchans do not have an xchan_addr. use xchan_url for the follow ↵Mario Vavti2018-04-301-1/+1
| | |_|/ | |/| | | | | | | | | | button if we do not find an xchan_addr
| * | | fix another pgsql update errorMario2018-04-301-1/+1
| | | |
| * | | Revert "hubzilla issue #1119 - xml2array has issues with some unicode ↵Mario Vavti2018-04-301-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Merge pull request #1138 from galettesaucisse/patch-37git-marijus2018-04-301-0/+8
| |\ \ \ | | | | | | | | | | Create /doc/context/fr/events/help.html
| | * | | Create /doc/context/fr/events/help.htmlGalette Saucisse2018-04-301-0/+8
| | | | |
| * | | | Merge pull request #1137 from galettesaucisse/patch-36git-marijus2018-04-301-0/+13
| |\ \ \ \ | | | | | | | | | | | | Create /doc/context/fr/connedit/help.html
| | * | | | Create /doc/context/fr/connedit/help.htmlGalette Saucisse2018-04-301-0/+13
| | | | | |
| * | | | | Merge pull request #1136 from galettesaucisse/patch-35git-marijus2018-04-301-0/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | Create /doc/context/fr/connections/ifpending/help.html
| | * | | | | Create /doc/context/fr/connections/ifpending/help.htmlGalette Saucisse2018-04-301-0/+8
| | | | | | |
| * | | | | | Merge pull request #1135 from galettesaucisse/patch-34git-marijus2018-04-301-0/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Create /doc/context/fr/connections/help.html
| | * | | | | | Create /doc/context/fr/connections/help.htmlGalette Saucisse2018-04-301-0/+8
| | |/ / / / /
| * | | | | | Merge pull request #1134 from galettesaucisse/patch-33git-marijus2018-04-301-0/+7
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Create /doc/context/fr/cloud/help.html
| | * | | | | | Create /doc/context/fr/cloud/help.htmlGalette Saucisse2018-04-301-0/+7
| | |/ / / / /
| * | | | | | Merge pull request #1133 from HappyPony/patch-1git-marijus2018-04-301-0/+16
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Russian translation for cards
| | * | | | | | Russian translation for cardsHappyPony2018-04-301-0/+16
| | |/ / / / /
| * | | | | | Merge pull request #1127 from galettesaucisse/patch-26git-marijus2018-04-301-0/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Create /doc/context/fr/chat/help.html
| | * | | | | | Create /doc/context/fr/chat/help.htmlGalette Saucisse2018-04-291-0/+8
| | |/ / / / /
| * | | | | | Merge pull request #1126 from galettesaucisse/patch-25git-marijus2018-04-301-0/+20
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Create /doc/context/fr/cards/help.html
| | * | | | | | Create /doc/context/fr/cards/help.htmlGalette Saucisse2018-04-291-0/+20
| | |/ / / / /
| * | | | | | Merge pull request #1125 from galettesaucisse/patch-24git-marijus2018-04-301-0/+4
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Create /doc/context/fr/apps/edit/help.html
| | * | | | | | Create /doc/context/fr/apps/edit/help.htmlGalette Saucisse2018-04-291-0/+4
| | |/ / / / /
| * | | | | | Merge pull request #1124 from galettesaucisse/patch-23git-marijus2018-04-301-0/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Create /doc/context/fr/appman/help.html
| | * | | | | | Create /doc/context/fr/appman/help.htmlGalette Saucisse2018-04-291-1/+1
| | | | | | | |
| | * | | | | | Create /doc/context/fr/appman/help.htmlGalette Saucisse2018-04-291-0/+5
| | |/ / / / /
| * | | | | | Merge pull request #1123 from galettesaucisse/patch-22git-marijus2018-04-301-0/+7
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Create /doc/context/fr/apps/help.html
| | * | | | | Create /doc/context/fr/apps/help.htmlGalette Saucisse2018-04-291-0/+7
| | |/ / / /
| * | / / / missing classMario Vavti2018-04-301-1/+1
| | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-304-27/+15
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-271-1/+1
| |\ \ \ \
| * \ \ \ \ Merge pull request #1120 from phellmes/devgit-marijus2018-04-272-1553/+1856
| |\ \ \ \ \ | | | | | | | | | | | | | | Update DE translation strings
| | * | | | | Update DE translation stringsphellmes2018-04-262-1553/+1856
| | | | | | | | | | | | | | | | | | | | | | | | | | | | German strings for development branch and release candidate 3.4
| * | | | | | Merge pull request #1117 from galettesaucisse/patch-19git-marijus2018-04-271-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Update FR toc.html
| | * | | | | | Update FR toc.htmlGalette Saucisse2018-04-251-3/+3
| | | | | | | |
| * | | | | | | Merge pull request #1116 from galettesaucisse/patch-18git-marijus2018-04-271-179/+0
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Delete FR project.bb from wrong folder
| | * | | | | | | Delete FR project.bb from wrong folderGalette Saucisse2018-04-251-179/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | apologies
| * | | | | | | Merge pull request #1115 from galettesaucisse/patch-17git-marijus2018-04-271-0/+174
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Update project.bb and place in correct folder
| | * | | | | | | Update project.bbGalette Saucisse2018-04-251-7/+6
| | | | | | | | |
| | * | | | | | | Update project.bb and place in correct folderGalette Saucisse2018-04-251-0/+175
| | |/ / / / / / | | | | | | | | | | | | | | | | FR toc.html needs editing
| * | | | | | | Merge pull request #1113 from mjfriaza/devgit-marijus2018-04-271-77/+109
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | New strings: Spanish translation
| | * | | | | | | New strings: Spanish translationmjfriaza2018-04-251-77/+109
| | | | | | | | |
| * | | | | | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-04-275-63/+89
| |\ \ \ \ \ \ \ \
* | | | | | | | | | provide easy access to the autoperms setting for forum and repository ↵zotlabs2018-05-022-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | make the cloud logging a bit less verbose until we actually need it.zotlabs2018-05-022-2/+2
| | | | | | | | | |
* | | | | | | | | | admin delete of fileszotlabs2018-05-025-12/+39
| | | | | | | | | |
* | | | | | | | | | backend work to allow admin to delete photos. Still requires frontend work ↵zotlabs2018-05-023-29/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to give admin access to either the photos and/or the delete link.
* | | | | | | | | | Provide admin delete ability if the viewer is admin but has no existing ↵zotlabs2018-05-023-8/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete authority. For 3.5+ as a new string is involved.
* | | | | | | | | | hubzilla issue #1151 - activitypub mention gets bookmarkedzotlabs2018-05-022-4/+4
| |_|_|_|_|_|_|_|/ |/| | | | | | | |