aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-202-1/+8
|\
| * Merge pull request #5705 from senky/ticket/16140Marc Alexander2019-10-202-1/+8
| |\
| | * [ticket/16140] Use twigJakub Senko2019-10-081-1/+1
| | * [ticket/16140] Rename event to ucp_profile_profile_info_birthday_label_appendJakub Senko2019-10-072-2/+2
| | * [ticket/16140] Add ucp_profile_profile_info_birthday_label_afterJakub Senko2019-10-042-1/+8
* | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-201-0/+16
|\ \ \ | |/ /
| * | Merge pull request #5710 from kasimi/ticket/16182Marc Alexander2019-10-201-0/+16
| |\ \
| | * | [ticket/16182] Add core.generate_smilies_modify_rowsetkasimi2019-10-171-0/+16
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-201-1/+20
|\ \ \ \ | |/ / /
| * | | Merge pull request #5715 from marc1706/ticket/16078Marc Alexander2019-10-201-1/+20
| |\ \ \
| | * | | [ticket/16078] Use while loop for visit retriesMarc Alexander2019-10-201-7/+10
| | * | | [ticket/16078] Try using retries for timeout issueMarc Alexander2019-10-191-1/+17
| | |/ /
* | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-202-3/+3
|\ \ \ \ | |/ / /
| * | | Merge pull request #5712 from kasimi/ticket/16184Marc Alexander2019-10-202-3/+3
| |\ \ \ | | |/ / | |/| |
| | * | [ticket/16184] Don't entity-encode & character in AJAX responsekasimi2019-10-172-3/+3
| |/ /
* | | Merge pull request #5713 from marc1706/ticket/16185Marc Alexander2019-10-193-5/+8
|\ \ \
| * | | [ticket/16185] Add mysql, postgresql to services and use mariadb 10.1Marc Alexander2019-10-192-2/+5
| * | | [ticket/16185] Use /mode for -perm when checking executablesMarc Alexander2019-10-191-2/+2
| * | | [ticket/16185] Use xenial for builds on travisMarc Alexander2019-10-181-1/+1
|/ / /
* | | Merge pull request #5700 from marc1706/ticket/16175Marc Alexander2019-10-151-219/+225
|\ \ \
| * | | [ticket/16175] Update composer dependencies for 3.3.0-b1Marc Alexander2019-10-031-219/+225
* | | | Merge pull request #5708 from marc1706/ticket/16051Marc Alexander2019-10-1326-1034/+25
|\ \ \ \
| * | | | [ticket/16051] Automatically convert mysql driver to mysqliMarc Alexander2019-10-062-1/+7
| * | | | [ticket/16051] Remove mysql driver as it's no longer supported in PHP >= 7.0Marc Alexander2019-10-0626-1035/+20
* | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-072-2/+36
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #5671 from 3D-I/ticket/16144Marc Alexander2019-10-072-2/+36
| |\ \ \ \
| | * | | | [ticket/16144] Provide extra fallback to board's default style for $user3D-I2019-09-231-1/+1
| | * | | | [ticket/16144] As per request3D-I2019-09-221-10/+5
| | * | | | [ticket/16144] Provide extra fallback to board's default style for $user3D-I2019-09-012-2/+41
* | | | | | Merge branch '3.2.x' into 3.3.xMarc Alexander2019-10-0723-38/+38
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #5706 from senky/ticket/16083Marc Alexander2019-10-0723-38/+38
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | [ticket/16083] Remove "defer" from inline scriptsJakub Senko2019-10-072-2/+2
| | * | | | [ticket/16083] Add role=menuJakub Senko2019-10-042-2/+2
| | * | | | [ticket/16083] Add itemscopeJakub Senko2019-10-041-3/+3
| | * | | | [ticket/16083] Remove type=text/javascriptJakub Senko2019-10-0421-34/+34
| |/ / / /
* | | | | Merge pull request #5702 from marc1706/ticket/14465Marc Alexander2019-10-0711-23/+61
|\ \ \ \ \
| * | | | | [ticket/14465] Remove setting for maximum password lengthMarc Alexander2019-10-0311-23/+61
| | |_|/ / | |/| | |
* | | | | Merge pull request #5701 from marc1706/ticket/15922Marc Alexander2019-10-073-127/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | [ticket/15922] Remove driver for discontinued APC cacheMarc Alexander2019-10-033-127/+0
|/ / / /
* | | | Merge pull request #5652 from marc1706/ticket/11327Marc Alexander2019-10-0317-270/+660
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/11327] Adjust code per review commentsMarc Alexander2019-10-033-19/+20
| * | | [ticket/11327] Use http_exception instead of trigger_errorMarc Alexander2019-09-011-1/+4
| * | | [ticket/11327] Move html output to reset password html fileMarc Alexander2019-08-302-3/+7
| * | | [ticket/11327] Use U_ prefix for reset password URL template variableMarc Alexander2019-08-262-8/+8
| * | | [ticket/11327] Clean up code style a bitMarc Alexander2019-08-222-14/+13
| * | | [ticket/11327] Adjust tests for new reset password changesMarc Alexander2019-08-102-3/+5
| * | | [ticket/11327] Clean up code a bitMarc Alexander2019-08-103-22/+24
| * | | [ticket/11327] Update tests to reflect changesMarc Alexander2019-08-102-35/+62
| * | | [ticket/11327] Finish up initial version of password reset systemMarc Alexander2019-08-104-63/+111
| * | | [ticket/11327] Rename UCP reset password templateMarc Alexander2019-08-101-0/+0