aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Workaround on possible errorMax Kostikov2018-07-291-5/+6
* Update php2po.phpMax Kostikov2018-07-291-2/+3
* Workaround on possible errorMax Kostikov2018-07-291-2/+5
* fix sql empty query error in db update 1216Mario Vavti2018-07-291-1/+1
* Merge branch 'patch-12' into 'dev'Mario2018-07-291-9/+15
|\
| * Process msgctxt pluralsMax Kostikov2018-07-291-9/+15
* | versionMario Vavti2018-07-291-1/+1
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-07-298-84/+92
|\|
| * Merge branch 'patch-11' into 'dev'Mario2018-07-281-59/+62
| |\
| | * Plural form strings export addedMax Kostikov2018-07-281-59/+62
| * | Merge branch 'patch-9' into 'dev'Mario2018-07-281-3/+3
| |\ \
| | * | Update nav.phpMax Kostikov2018-07-271-3/+3
| * | | Merge branch 'patch-8' into 'dev'Mario2018-07-281-1/+5
| |\ \ \
| | * | | 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
| |\ \ \
| | * | | 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 displayingkostikov2018-07-251-1/+1
* | | | wrong class nameMario Vavti2018-07-291-1/+1
* | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-293-9/+28
|\ \ \ \ | |/ / / |/| | |
| * | | fix unsanitised xchan_namezotlabs2018-07-282-1/+20
| * | | SECURITY: sanitise vcard fieldszotlabs2018-07-281-8/+8
| * | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-2713-7203/+15914
| |\ \ \ | | | |/ | | |/|
* | / | 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 unecce...zotlabs2018-07-271-19/+47
| * | 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.pokostikov2018-07-231-183/+171
* | | Merge branch 'patch-5' into 'dev'Mario2018-07-230-0/+0
|\ \ \
| * | | Update hstrings.phpkostikov2018-07-231-75/+94
| |/ /
* | | Merge branch 'patch-2' into 'dev'Mario2018-07-233-261/+268
|\ \ \ | |/ / |/| |
| * | 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
|\ \
| * | 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
|\ \ \