aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'dev' into 'dev'Mario2018-08-216-1851/+2442
* Merge branch 'patch-17' into 'master'Mario2018-08-211-1/+2
|\
| * Add missed app 'Order Apps'Max Kostikov2018-08-171-1/+2
|/
* Merge branch 'patch-16' into 'dev'Mario2018-08-121-1/+1
* search form action for channel search needs the channel addressMario Vavti2018-08-091-1/+1
* Merge branch 'fixactivityorderwithfilters' into 'master'Mario2018-08-021-0/+3
|\
| * Add GET for filtered forumsDM42.Net (Matt Dent)2018-08-011-0/+3
|/
* Merge branch 'dev' into 'dev'Mario2018-07-315-16/+33
* Merge branch 'patch-9' into 'dev'Mario2018-07-301-3/+3
* Merge branch 'patch-8' into 'dev'Mario2018-07-301-1/+5
* Merge branch 'patch-1' into 'master'Mario2018-07-301-1/+1
|\
| * Update network.phpgia vec2018-07-291-1/+1
|/
* fix sql empty query error in db update 12163.6.1Mario Vavti2018-07-291-1/+1
* verrsion bumpMario Vavti2018-07-291-1/+1
* wrong class nameMario Vavti2018-07-291-1/+1
* fix unsanitised xchan_namezotlabs2018-07-292-1/+20
* SECURITY: sanitise vcard fieldszotlabs2018-07-291-8/+8
* app update and ownership issueszotlabs2018-07-281-7/+50
* fix sql errorMario Vavti2018-07-261-1/+1
* version 3.63.6Mario Vavti2018-07-251-1/+1
* Merge branch '3.6RC'Mario Vavti2018-07-25459-21056/+33775
|\
| * Merge branch '3.6RC' of https://framagit.org/hubzilla/core into 3.6RCMario Vavti2018-07-2513-7204/+15883
| |\
| | * Merge branch 'patch-2' into 'dev'Mario2018-07-233-261/+268
| | * update changelogMario Vavti2018-07-211-0/+94
| | * Add var to respect current hstrings.php formatkostikov2018-07-211-2/+2
| | * Update php2po.phpkostikov2018-07-211-6/+6
| | * Update update_fail_eml.tplkostikov2018-07-211-13/+14
| | * Update register_verify_eml.tplkostikov2018-07-211-10/+9
| | * Update register_open_eml.tplkostikov2018-07-211-14/+12
| | * Update passchanged_eml.tplkostikov2018-07-211-11/+15
| | * Update lostpass_eml.tplkostikov2018-07-211-17/+20
| | * Add new filekostikov2018-07-211-0/+14
| | * Update hstrings.phpkostikov2018-07-211-1633/+3130
| | * Update hmessages.pokostikov2018-07-211-5471/+12527
| | * prevent double file uploads when dropping files into jotMario Vavti2018-07-201-0/+1
| | * fix jot drag and dropMario Vavti2018-07-201-6/+9
| | * checkjs fix ($page not bin-hex in all cases)zotlabs2018-07-201-2/+2
| | * fix the filtered query string so it can potentially be re-used as is.zotlabs2018-07-201-0/+2
| * | RC1Mario Vavti2018-07-191-1/+1
| |/
| * typozotlabs2018-07-191-1/+1
| * query filter was a bit greedyzotlabs2018-07-193-3/+3
| * Merge branch 'cherry-pick-5ce50d0a' into '3.6RC'Mario2018-07-198-16/+17
| |\
| | * mangled urls on redirectszotlabs2018-07-198-16/+17
| |/
| * set the correct album name when moving photosMario Vavti2018-07-181-1/+3
| * update composer autoload cacheMario Vavti2018-07-182-2/+18
| * update stringsMario Vavti2018-07-181-1568/+2025
| * version 3.6RCMario Vavti2018-07-181-1/+1
| * Update hmessages.pokostikov2018-07-181-1/+1
| * Fix wrong plural function logickostikov2018-07-181-1/+1
| * when calling timeago() from mod_mail.js it is called before the translations ...Mario Vavti2018-07-132-1/+3