Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | SECURITY: sanitise vcard fields | zotlabs | 2018-07-28 | 1 | -8/+8 | |
| | | | | ||||||
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-07-27 | 13 | -7203/+15914 | |
|\| | | | |/ / |/| | | ||||||
| * | | fix sql error | Mario Vavti | 2018-07-26 | 1 | -1/+1 | |
| |/ | ||||||
| * | Merge branch 'patch-4' into 'dev' | Mario | 2018-07-23 | 0 | -0/+0 | |
| |\ | | | | | | | | | | | | | Update hmessages.po See merge request hubzilla/core!1238 | |||||
| | * | Update hmessages.po | kostikov | 2018-07-23 | 1 | -183/+171 | |
| | | | ||||||
| * | | Merge branch 'patch-5' into 'dev' | Mario | 2018-07-23 | 0 | -0/+0 | |
| |\ \ | | | | | | | | | | | | | | | | | Update hstrings.php See merge request hubzilla/core!1239 | |||||
| | * | | Update hstrings.php | kostikov | 2018-07-23 | 1 | -75/+94 | |
| | |/ | ||||||
| * | | Merge branch 'patch-2' into 'dev' | Mario | 2018-07-23 | 3 | -261/+268 | |
| |\ \ | | |/ | |/| | | | | | | | Escape internal quotes in translation on export See merge request hubzilla/core!1237 | |||||
| | * | Update hstrings.php | kostikov | 2018-07-23 | 1 | -75/+94 | |
| | | | ||||||
| | * | Update hmessages.po | kostikov | 2018-07-23 | 1 | -183/+171 | |
| | | | ||||||
| | * | Escape internal quotes in translation on export | kostikov | 2018-07-22 | 1 | -3/+3 | |
| |/ | ||||||
| * | update changelog | Mario Vavti | 2018-07-21 | 1 | -0/+94 | |
| | | ||||||
| * | Merge branch 'patch-2' into 'dev' | Mario | 2018-07-21 | 7 | -65/+118 | |
| |\ | | | | | | | | | | | | | New russian templates See merge request hubzilla/core!1233 | |||||
| | * | Update update_fail_eml.tpl | kostikov | 2018-07-20 | 1 | -13/+14 | |
| | | | ||||||
| | * | Create register_verify_member.tpl | kostikov | 2018-07-20 | 1 | -0/+34 | |
| | | | ||||||
| | * | Update register_verify_eml.tpl | kostikov | 2018-07-20 | 1 | -10/+9 | |
| | | | ||||||
| | * | Update register_open_eml.tpl | kostikov | 2018-07-20 | 1 | -14/+12 | |
| | | | ||||||
| | * | Update passchanged_eml.tpl | kostikov | 2018-07-20 | 1 | -11/+15 | |
| | | | ||||||
| | * | Update lostpass_eml.tpl | kostikov | 2018-07-20 | 1 | -17/+20 | |
| | | | ||||||
| | * | Add new file | kostikov | 2018-07-20 | 1 | -0/+14 | |
| | | | ||||||
| * | | Merge branch 'patch-1' into 'dev' | Mario | 2018-07-21 | 1 | -2/+2 | |
| |\ \ | | | | | | | | | | | | | | | | | Add var to respect current hstrings.php format See merge request hubzilla/core!1231 | |||||
| | * | | Add var to respect current hstrings.php format | kostikov | 2018-07-20 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Merge branch 'dev' into 'dev' | Mario | 2018-07-21 | 2 | -7104/+15657 | |
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | Update russian translation for 3.6 See merge request hubzilla/core!1230 | |||||
| | * | | Update hstrings.php | kostikov | 2018-07-20 | 1 | -1633/+3130 | |
| | | | | ||||||
| | * | | Update hmessages.po | kostikov | 2018-07-20 | 1 | -5471/+12527 | |
| | | | | ||||||
| * | | | prevent double file uploads when dropping files into jot | Mario Vavti | 2018-07-20 | 1 | -0/+1 | |
| | |/ | |/| | ||||||
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into dev | Mario Vavti | 2018-07-20 | 1 | -6/+6 | |
| |\ \ | ||||||
| | * | | Merge branch 'dev' into 'dev' | Mario | 2018-07-20 | 1 | -6/+6 | |
| | |\| | | | | | | | | | | | | | | | | | Update php2po.php See merge request hubzilla/core!1229 | |||||
| | | * | Update php2po.php | kostikov | 2018-07-20 | 1 | -6/+6 | |
| | | | | ||||||
| * | | | fix jot drag and drop | Mario Vavti | 2018-07-20 | 1 | -6/+9 | |
| |/ / | ||||||
* | | | don't sync system apps | zotlabs | 2018-07-27 | 1 | -3/+4 | |
| | | | ||||||
* | | | app delete issue with base installed apps and app photo being reloaded ↵ | zotlabs | 2018-07-27 | 1 | -19/+47 | |
| | | | | | | | | | | | | uneccessarily | |||||
* | | | app update and ownership issues | zotlabs | 2018-07-27 | 1 | -7/+50 | |
|/ / | ||||||
* | | checkjs fix ($page not bin-hex in all cases) | zotlabs | 2018-07-19 | 1 | -2/+2 | |
| | | ||||||
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-07-19 | 0 | -0/+0 | |
|\ \ | ||||||
| * \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-07-19 | 10 | -25/+28 | |
| |\ \ | ||||||
| * \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-07-18 | 7 | -25/+183 | |
| |\ \ \ | | |_|/ | |/| | | ||||||
* | | | | fix the filtered query string so it can potentially be re-used as is. | zotlabs | 2018-07-19 | 1 | -0/+2 | |
| | | | | ||||||
* | | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge | zotlabs | 2018-07-18 | 6 | -1573/+2048 | |
|\| | | | |_|/ |/| | | ||||||
| * | | set the correct album name when moving photos | Mario Vavti | 2018-07-18 | 1 | -1/+3 | |
| | | | ||||||
| * | | version 3.7 | Mario Vavti | 2018-07-18 | 1 | -1/+1 | |
| | | | ||||||
| * | | update composer autoload cache | Mario Vavti | 2018-07-18 | 2 | -2/+18 | |
| | | | ||||||
| * | | update strings | Mario Vavti | 2018-07-18 | 1 | -1568/+2025 | |
| | | | ||||||
| * | | version 3.6RC | Mario Vavti | 2018-07-18 | 1 | -1/+1 | |
| | | | ||||||
| * | | Update hmessages.po | kostikov | 2018-07-18 | 1 | -1/+1 | |
| | | | | | | | | | (cherry picked from commit cbab7d215046d999c3f808b3946ea378c4475a72) | |||||
| * | | Fix wrong plural function logic | kostikov | 2018-07-18 | 1 | -1/+1 | |
| | | | | | | | | | (cherry picked from commit 42840886119420b4efad511da0cb307f74542545) | |||||
* | | | typo | zotlabs | 2018-07-18 | 1 | -1/+1 | |
| | | | ||||||
* | | | query filter was a bit greedy | zotlabs | 2018-07-18 | 3 | -3/+3 | |
| | | | ||||||
* | | | mangled urls on redirects | zotlabs | 2018-07-18 | 8 | -16/+17 | |
| | | | ||||||
* | | | util/typo - perform php -l and then include the file. We'll catch a bunch ↵ | zotlabs | 2018-07-17 | 1 | -7/+9 | |
| |/ |/| | | | | | more stuff. |