aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-08-065-16/+33
|\
| * Merge branch 'fixactivityorderwithfilters' into 'master'Mario2018-08-021-0/+3
| | | | | | | | | | | | | | | | | | Add GET for filtered forums See merge request hubzilla/core!1251 (cherry picked from commit 4e6539efec70027facb70233254e9b47f8e86c6d) ee1fde42 Add GET for filtered forums
| * Merge branch 'dev' into 'dev'Mario2018-07-315-16/+33
| |\ | | | | | | | | | | | | Update Spanish translation See merge request hubzilla/core!1249
| | * Update Spanish translationManuel Jiménez Friaza2018-07-305-16/+33
| | |
| * | Merge branch 'dev' of https://framagit.org/hubzilla/core into devMario Vavti2018-07-312-9/+14
| |\|
* | | bring some Zot6 libraries and interfaces to red/hubzillazotlabs2018-08-0613-0/+7764
| | |
* | | create alter_pdl hookzotlabs2018-08-051-2/+10
| | |
* | | ability for addons to create .pdl files and load them automaticallyzotlabs2018-08-041-0/+2
| | |
* | | add app_options fieldzotlabs2018-08-027-12/+38
| | |
* | | update certszotlabs2018-08-012-1704/+422
| | |
* | | hubzilla core issue #1258zotlabs2018-08-011-0/+4
| | |
* | | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-302-9/+14
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'patch-13' into 'dev'Mario2018-07-301-8/+13
| |\ | | | | | | | | | | | | Workaround on possible error with php2po See merge request hubzilla/core!1247
| | * 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
| | |
| * | Update network.phpgia vec2018-07-301-1/+1
| |/ | | | | (cherry picked from commit 8db006d9a1b3401f79ad0458e3a2ebae64c3575c)
* | When checking permissions ignore checking site "Block Public" settings in ↵zotlabs2018-07-305-12/+16
| | | | | | | | cases where site permissions aren't applicable
* | Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_mergezotlabs2018-07-299-85/+99
|\|
| * 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 plurals See merge request hubzilla/core!1246
| | * 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 added See merge request hubzilla/core!1245
| | | * Plural form strings export addedMax Kostikov2018-07-281-59/+62
| | | |
| | * | Merge branch 'patch-9' into 'dev'Mario2018-07-281-3/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | Respect navbar translations See merge request hubzilla/core!1243
| | | * | Update nav.phpMax Kostikov2018-07-271-3/+3
| | | | |
| | * | | 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
| | | | |
| * | | | wrong class nameMario Vavti2018-07-291-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-293-9/+28
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'mike/master' into devMario Vavti2018-07-281-26/+98
| |\ \ \ \ | | |_|_|/ | |/| | |
* | | | | this may conflictzotlabs2018-07-292-16/+17
| |_|/ / |/| | |
* | | | 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
|\| | | | |/ / |/| |
| * | 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
| | |/