Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | fix another pgsql update error | Mario | 2018-04-30 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | Revert "hubzilla issue #1119 - xml2array has issues with some unicode ↵ | Mario Vavti | 2018-04-30 | 1 | -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-37 | git-marijus | 2018-04-30 | 1 | -0/+8 | |
| |\ \ \ \ | | | | | | | | | | | | | Create /doc/context/fr/events/help.html | |||||
| | * | | | | Create /doc/context/fr/events/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+8 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #1137 from galettesaucisse/patch-36 | git-marijus | 2018-04-30 | 1 | -0/+13 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Create /doc/context/fr/connedit/help.html | |||||
| | * | | | | | Create /doc/context/fr/connedit/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+13 | |
| | | | | | | | ||||||
| * | | | | | | Merge pull request #1136 from galettesaucisse/patch-35 | git-marijus | 2018-04-30 | 1 | -0/+8 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Create /doc/context/fr/connections/ifpending/help.html | |||||
| | * | | | | | | Create /doc/context/fr/connections/ifpending/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+8 | |
| | | | | | | | | ||||||
| * | | | | | | | Merge pull request #1135 from galettesaucisse/patch-34 | git-marijus | 2018-04-30 | 1 | -0/+8 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Create /doc/context/fr/connections/help.html | |||||
| | * | | | | | | | Create /doc/context/fr/connections/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+8 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #1134 from galettesaucisse/patch-33 | git-marijus | 2018-04-30 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Create /doc/context/fr/cloud/help.html | |||||
| | * | | | | | | | Create /doc/context/fr/cloud/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+7 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #1133 from HappyPony/patch-1 | git-marijus | 2018-04-30 | 1 | -0/+16 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Russian translation for cards | |||||
| | * | | | | | | | Russian translation for cards | HappyPony | 2018-04-30 | 1 | -0/+16 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #1127 from galettesaucisse/patch-26 | git-marijus | 2018-04-30 | 1 | -0/+8 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Create /doc/context/fr/chat/help.html | |||||
| | * | | | | | | | Create /doc/context/fr/chat/help.html | Galette Saucisse | 2018-04-29 | 1 | -0/+8 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #1126 from galettesaucisse/patch-25 | git-marijus | 2018-04-30 | 1 | -0/+20 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Create /doc/context/fr/cards/help.html | |||||
| | * | | | | | | | Create /doc/context/fr/cards/help.html | Galette Saucisse | 2018-04-29 | 1 | -0/+20 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #1125 from galettesaucisse/patch-24 | git-marijus | 2018-04-30 | 1 | -0/+4 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Create /doc/context/fr/apps/edit/help.html | |||||
| | * | | | | | | | Create /doc/context/fr/apps/edit/help.html | Galette Saucisse | 2018-04-29 | 1 | -0/+4 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #1124 from galettesaucisse/patch-23 | git-marijus | 2018-04-30 | 1 | -0/+5 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Create /doc/context/fr/appman/help.html | |||||
| | * | | | | | | | Create /doc/context/fr/appman/help.html | Galette Saucisse | 2018-04-29 | 1 | -1/+1 | |
| | | | | | | | | | ||||||
| | * | | | | | | | Create /doc/context/fr/appman/help.html | Galette Saucisse | 2018-04-29 | 1 | -0/+5 | |
| | |/ / / / / / | ||||||
| * | | | | | | | Merge pull request #1123 from galettesaucisse/patch-22 | git-marijus | 2018-04-30 | 1 | -0/+7 | |
| |\ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | Create /doc/context/fr/apps/help.html | |||||
| | * | | | | | | Create /doc/context/fr/apps/help.html | Galette Saucisse | 2018-04-29 | 1 | -0/+7 | |
| | |/ / / / / | ||||||
| * | / / / / | missing class | Mario Vavti | 2018-04-30 | 1 | -1/+1 | |
| | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-30 | 4 | -27/+15 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-27 | 1 | -1/+1 | |
| |\ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge pull request #1120 from phellmes/dev | git-marijus | 2018-04-27 | 2 | -1553/+1856 | |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Update DE translation strings | |||||
| | * | | | | | | Update DE translation strings | phellmes | 2018-04-26 | 2 | -1553/+1856 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | German strings for development branch and release candidate 3.4 | |||||
| * | | | | | | | Merge pull request #1117 from galettesaucisse/patch-19 | git-marijus | 2018-04-27 | 1 | -3/+3 | |
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Update FR toc.html | |||||
| | * | | | | | | | Update FR toc.html | Galette Saucisse | 2018-04-25 | 1 | -3/+3 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge pull request #1116 from galettesaucisse/patch-18 | git-marijus | 2018-04-27 | 1 | -179/+0 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Delete FR project.bb from wrong folder | |||||
| | * | | | | | | | | Delete FR project.bb from wrong folder | Galette Saucisse | 2018-04-25 | 1 | -179/+0 | |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | apologies | |||||
| * | | | | | | | | Merge pull request #1115 from galettesaucisse/patch-17 | git-marijus | 2018-04-27 | 1 | -0/+174 | |
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Update project.bb and place in correct folder | |||||
| | * | | | | | | | | Update project.bb | Galette Saucisse | 2018-04-25 | 1 | -7/+6 | |
| | | | | | | | | | | ||||||
| | * | | | | | | | | Update project.bb and place in correct folder | Galette Saucisse | 2018-04-25 | 1 | -0/+175 | |
| | |/ / / / / / / | | | | | | | | | | | | | | | | | | | FR toc.html needs editing | |||||
| * | | | | | | | | Merge pull request #1113 from mjfriaza/dev | git-marijus | 2018-04-27 | 1 | -77/+109 | |
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | New strings: Spanish translation | |||||
| | * | | | | | | | New strings: Spanish translation | mjfriaza | 2018-04-25 | 1 | -77/+109 | |
| | | | | | | | | | ||||||
| * | | | | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-04-27 | 5 | -63/+89 | |
| |\ \ \ \ \ \ \ \ | ||||||
* | | | | | | | | | | provide easy access to the autoperms setting for forum and repository ↵ | zotlabs | 2018-05-02 | 2 | -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. | zotlabs | 2018-05-02 | 2 | -2/+2 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | admin delete of files | zotlabs | 2018-05-02 | 5 | -12/+39 | |
| | | | | | | | | | | ||||||
* | | | | | | | | | | backend work to allow admin to delete photos. Still requires frontend work ↵ | zotlabs | 2018-05-02 | 3 | -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 ↵ | zotlabs | 2018-05-02 | 3 | -8/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delete authority. For 3.5+ as a new string is involved. | |||||
* | | | | | | | | | | hubzilla issue #1151 - activitypub mention gets bookmarked | zotlabs | 2018-05-02 | 2 | -4/+4 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
* | | | | | | | | | new feature (post 3.4): allow a different username to be used when importing. | zotlabs | 2018-05-01 | 3 | -2/+24 | |
| | | | | | | | | | ||||||
* | | | | | | | | | The channel import page seems to have missed the big theme cleanup of the ↵ | zotlabs | 2018-05-01 | 4 | -79/+62 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | last couple of years. | |||||
* | | | | | | | | | provide warnings about profile photo and cover photo permissions | zotlabs | 2018-05-01 | 4 | -1/+8 | |
| | | | | | | | | | ||||||
* | | | | | | | | | hubzilla issue #1149, don't duplicate addressbook entries on repeated ↵ | zotlabs | 2018-05-01 | 1 | -4/+20 | |
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | channel imports |