Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | | * | | | | Update Apps.php | Max Kostikov | 2018-07-27 | 1 | -3/+4 | |
| | | | | | | | ||||||
| | | * | | | | Update Apps.php | Max Kostikov | 2018-07-27 | 1 | -1/+4 | |
| | | |/ / / | ||||||
| | * | | | | Merge branch 'patch-7' into 'dev' | Mario | 2018-07-28 | 4 | -20/+21 | |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Russian translation update See merge request hubzilla/core!1241 | |||||
| | | * | | | | Update hstrings.php | Max Kostikov | 2018-07-26 | 1 | -9/+9 | |
| | | | | | | | ||||||
| | | * | | | | Update hmessages.po | Max Kostikov | 2018-07-26 | 1 | -9/+10 | |
| | | | | | | | ||||||
| | | * | | | | Update passchanged_eml.tpl | Max Kostikov | 2018-07-26 | 1 | -1/+1 | |
| | | | | | | | ||||||
| | | * | | | | Update lostpass_eml.tpl | Max Kostikov | 2018-07-26 | 1 | -1/+1 | |
| | | |/ / / | ||||||
| | * | | | | Merge branch 'patch-6' into 'dev' | Mario | 2018-07-28 | 1 | -1/+1 | |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | | | | | | | | | | | | | Fix duplicate transport displaying See merge request hubzilla/core!1240 | |||||
| | | * | | | Fix duplicate transport displaying | kostikov | 2018-07-25 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | wrong class name | Mario Vavti | 2018-07-29 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-07-29 | 3 | -9/+28 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2018-07-28 | 1 | -26/+98 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
* | | | | | | this may conflict | zotlabs | 2018-07-29 | 2 | -16/+17 | |
| |_|/ / / |/| | | | | ||||||
* | | | | | fix unsanitised xchan_name | zotlabs | 2018-07-28 | 2 | -1/+20 | |
| | | | | | ||||||
* | | | | | 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 | |
| |\ \ \ |