Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update composer autoload cache. | Klaus Weidenbach | 2018-05-02 | 2 | -0/+18 |
| | | | | | Should add to Prepare RC Release documentation: composer dump-autoload --no-dev | ||||
* | Merge pull request #1146 from galettesaucisse/patch-46 | git-marijus | 2018-05-02 | 1 | -0/+13 |
|\ | | | | | Create /doc/context/fr/wiki/help.html | ||||
| * | Create /doc/context/fr/wiki/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+13 |
| | | |||||
* | | Merge pull request #1145 from galettesaucisse/patch-45 | git-marijus | 2018-05-02 | 1 | -0/+8 |
|\ \ | | | | | | | Create /doc/context/fr/webpages/help.html | ||||
| * | | Create /doc/context/fr/webpages/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+8 |
| | | | |||||
* | | | Merge pull request #1144 from galettesaucisse/patch-44 | git-marijus | 2018-05-02 | 1 | -0/+20 |
|\ \ \ | | | | | | | | | Create /doc/context/fr/settings/tokens | ||||
| * | | | Create /doc/context/fr/settings/tokens | Galette Saucisse | 2018-04-30 | 1 | -0/+20 |
| |/ / | |||||
* | | | Merge pull request #1143 from galettesaucisse/patch-43 | git-marijus | 2018-05-02 | 1 | -0/+18 |
|\ \ \ | | | | | | | | | Create /doc/context/fr/settings/channel/help.html | ||||
| * | | | Create /doc/context/fr/settings/channel/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+18 |
| |/ / | |||||
* | | | Merge pull request #1142 from galettesaucisse/patch-42 | git-marijus | 2018-05-02 | 1 | -0/+18 |
|\ \ \ | | | | | | | | | Create /doc/context/fr/settings/account/help.html | ||||
| * | | | Create /doc/context/fr/settings/account/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+18 |
| |/ / | |||||
* | | | Merge pull request #1141 from galettesaucisse/patch-40 | git-marijus | 2018-05-02 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | Create /doc/context/fr/profile/help.html | ||||
| * | | | Create /doc/context/fr/profile/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+6 |
| |/ / | |||||
* | | | Merge pull request #1140 from galettesaucisse/patch-39 | git-marijus | 2018-05-02 | 1 | -0/+6 |
|\ \ \ | | | | | | | | | Create /doc/context/photos/help.html | ||||
| * | | | Create /doc/context/photos/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+6 |
| |/ / | |||||
* | | | Merge pull request #1139 from galettesaucisse/patch-38 | git-marijus | 2018-05-02 | 1 | -0/+10 |
|\ \ \ | | | | | | | | | Create /doc/context/fr/mail/help.html | ||||
| * | | | Create /doc/context/fr/mail/help.html | Galette Saucisse | 2018-04-30 | 1 | -0/+10 |
| |/ / | |||||
* | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-05-02 | 9 | -86/+114 |
|\ \ \ | |||||
| * | | | 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 | ||||
* | | | | Revert "Revert "hubzilla issue #1119 - xml2array has issues with some ↵ | Mario Vavti | 2018-05-01 | 1 | -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 dev | Mario Vavti | 2018-05-01 | 2 | -62/+47 |
|\| | | | |_|/ |/| | | |||||
| * | | parent folder permissions weren't being checked back to the cloud root ↵ | zotlabs | 2018-04-30 | 2 | -62/+47 |
| | | | | | | | | | | | | directory in all cases | ||||
* | | | activitypub xchans do not have an xchan_addr. use xchan_url for the follow ↵ | Mario Vavti | 2018-04-30 | 1 | -1/+1 |
| |/ |/| | | | | | button if we do not find an xchan_addr | ||||
* | | 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 |