aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'patch-8' into 'dev'Mario2018-07-281-1/+5
|\ | | | | | | | | Fix navbar missed translations See merge request hubzilla/core!1242
| * Update Apps.phpMax Kostikov2018-07-271-3/+4
| |
| * Update Apps.phpMax Kostikov2018-07-271-1/+4
| |
* | Merge branch 'patch-7' into 'dev'Mario2018-07-284-20/+21
|\ \ | | | | | | | | | | | | Russian translation update See merge request hubzilla/core!1241
| * | Update hstrings.phpMax Kostikov2018-07-261-9/+9
| | |
| * | Update hmessages.poMax Kostikov2018-07-261-9/+10
| | |
| * | Update passchanged_eml.tplMax Kostikov2018-07-261-1/+1
| | |
| * | Update lostpass_eml.tplMax Kostikov2018-07-261-1/+1
| |/
* | Merge branch 'patch-6' into 'dev'Mario2018-07-281-1/+1
|\ \ | | | | | | | | | | | | Fix duplicate transport displaying See merge request hubzilla/core!1240
| * | Fix duplicate transport displayingkostikov2018-07-251-1/+1
| | |
* | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-281-26/+98
|\ \ \ | |_|/ |/| |
| * | don't sync system appszotlabs2018-07-271-3/+4
| | |
| * | app delete issue with base installed apps and app photo being reloaded ↵zotlabs2018-07-271-19/+47
| | | | | | | | | | | | uneccessarily
| * | app update and ownership issueszotlabs2018-07-271-7/+50
| | |
* | | fix sql errorMario Vavti2018-07-261-1/+1
| |/ |/|
* | Merge branch 'patch-4' into 'dev'Mario2018-07-230-0/+0
|\ \ | | | | | | | | | | | | Update hmessages.po See merge request hubzilla/core!1238
| * | Update hmessages.pokostikov2018-07-231-183/+171
| | |
* | | Merge branch 'patch-5' into 'dev'Mario2018-07-230-0/+0
|\ \ \ | | | | | | | | | | | | | | | | Update hstrings.php See merge request hubzilla/core!1239
| * | | Update hstrings.phpkostikov2018-07-231-75/+94
| |/ /
* | | Merge branch 'patch-2' into 'dev'Mario2018-07-233-261/+268
|\ \ \ | |/ / |/| | | | | | | | Escape internal quotes in translation on export See merge request hubzilla/core!1237
| * | Update hstrings.phpkostikov2018-07-231-75/+94
| | |
| * | Update hmessages.pokostikov2018-07-231-183/+171
| | |
| * | Escape internal quotes in translation on exportkostikov2018-07-221-3/+3
|/ /
* | update changelogMario Vavti2018-07-211-0/+94
| |
* | Merge branch 'patch-2' into 'dev'Mario2018-07-217-65/+118
|\ \ | | | | | | | | | | | | New russian templates See merge request hubzilla/core!1233
| * | Update update_fail_eml.tplkostikov2018-07-201-13/+14
| | |
| * | Create register_verify_member.tplkostikov2018-07-201-0/+34
| | |
| * | Update register_verify_eml.tplkostikov2018-07-201-10/+9
| | |
| * | Update register_open_eml.tplkostikov2018-07-201-14/+12
| | |
| * | Update passchanged_eml.tplkostikov2018-07-201-11/+15
| | |
| * | Update lostpass_eml.tplkostikov2018-07-201-17/+20
| | |
| * | Add new filekostikov2018-07-201-0/+14
| | |
* | | Merge branch 'patch-1' into 'dev'Mario2018-07-211-2/+2
|\ \ \ | | | | | | | | | | | | | | | | Add var to respect current hstrings.php format See merge request hubzilla/core!1231
| * | | Add var to respect current hstrings.php formatkostikov2018-07-201-2/+2
| | | |
* | | | Merge branch 'dev' into 'dev'Mario2018-07-212-7104/+15657
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | Update russian translation for 3.6 See merge request hubzilla/core!1230
| * | | Update hstrings.phpkostikov2018-07-201-1633/+3130
| | | |
| * | | Update hmessages.pokostikov2018-07-201-5471/+12527
| | | |
* | | | prevent double file uploads when dropping files into jotMario Vavti2018-07-201-0/+1
| |/ / |/| |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-07-201-6/+6
|\ \ \
| * | | Merge branch 'dev' into 'dev'Mario2018-07-201-6/+6
| |\| | | | |/ | |/| | | | | | | Update php2po.php See merge request hubzilla/core!1229
| | * Update php2po.phpkostikov2018-07-201-6/+6
| | |
* | | fix jot drag and dropMario Vavti2018-07-201-6/+9
|/ /
* | checkjs fix ($page not bin-hex in all cases)zotlabs2018-07-191-2/+2
| |
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-190-0/+0
|\ \
| * \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-1910-25/+28
| |\ \
| * \ \ Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-187-25/+183
| |\ \ \ | | |_|/ | |/| |
* | | | fix the filtered query string so it can potentially be re-used as is.zotlabs2018-07-191-0/+2
| | | |
* | | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-186-1573/+2048
|\| | | | |_|/ |/| |
| * | set the correct album name when moving photosMario Vavti2018-07-181-1/+3
| | |
| * | version 3.7Mario Vavti2018-07-181-1/+1
| | |