aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | [ticket/13528] Return correct translation instead of is_set()Joas Schilling2015-01-201-1/+1
| |/ / / / / /
* | | | | | | Merge pull request #3293 from Nicofuma/ticket/13489Joas Schilling2015-01-2012-32/+155
|\ \ \ \ \ \ \
| * | | | | | | [ticket/13489] Fix service configurationTristan Darricau2015-01-206-50/+45
| * | | | | | | [ticket/13489] Update migrationsTristan Darricau2015-01-143-20/+57
| * | | | | | | [ticket/13489] Fix testsTristan Darricau2015-01-143-5/+11
| * | | | | | | [ticket/13489] Disable the event dispatcher in the migratorTristan Darricau2015-01-143-6/+91
* | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-200-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Merge pull request #3312 from bantu/ticket/13527Andreas Fischer2015-01-201-4/+1
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/13527] Apply htmlspecialchars() to data from version server.Andreas Fischer2015-01-201-1/+1
| | * | | | | | | [ticket/13527] Remove two unused variables.Andreas Fischer2015-01-201-3/+0
* | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-200-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge pull request #3311 from bantu/ticket/13526Andreas Fischer2015-01-201-1/+5
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/13526] Correctly validate the ucp_pm_options form key.Joas Schilling2015-01-201-1/+5
| | |/ / / / / / /
* | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2015-01-201-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | / / / / / | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Merge pull request #3306 from marc1706/ticket/13519Andreas Fischer2015-01-201-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | [ticket/13519] Correctly validate imagick path as path and not stringMarc Alexander2015-01-191-1/+1
* | | | | | | | Merge pull request #3138 from prototech/ticket/12642Joas Schilling2015-01-201-19/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/12642] Ensure CPF type specific options are set when editing booleans.Cesar G2014-11-111-19/+19
* | | | | | | | | Merge pull request #3226 from prototech/ticket/13420Joas Schilling2015-01-201-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/13420] Correctly filter by lt/gt/equal to 0 posts when pruning users.Cesar G2014-12-091-2/+2
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2015-01-200-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #3310 from bantu/ticket/13523Joas Schilling2015-01-202-2/+24
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/13523] Install PHPUnit manually instead of from PEAR.Andreas Fischer2015-01-202-2/+24
| |/ / / / / / / /
* | | | | | | | | Merge pull request #3278 from rxu/ticket/13492Joas Schilling2015-01-202-1/+73
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/13492] Add the migration to update custom bbcodes with IDN regexpsrxu2015-01-202-1/+71
| * | | | | | | | | [ticket/13492] Add IDN support for custom BBCode URL tokensrxu2015-01-111-1/+3
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #3308 from nickvergessen/ticket/13504Andreas Fischer2015-01-191-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/13504] Fix invalid variable $userJoas Schilling2015-01-191-1/+1
* | | | | | | | | | Merge branch 'develop-olympus' into develop-ascraeusNils Adermann2015-01-190-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | / / / / / / / | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Merge pull request #2990 from Senky/ticket/10985Nils Adermann2015-01-191-0/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | |
| | * | | | | | | [ticket/10985] Add fix to properly inherit style during update processJakub Senko2014-09-231-0/+5
* | | | | | | | | Merge pull request #3296 from PayBas/ticket/13431Joas Schilling2015-01-191-28/+28
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/13431] Fix responsive RTL media queries for <IE11PayBas2015-01-161-28/+28
* | | | | | | | | | Merge pull request #3294 from PayBas/ticket/13507Joas Schilling2015-01-191-0/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | [ticket/13507] Fix horizontal scrollbar for large images in postsPayBas2015-01-161-0/+3
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3055 from marc1706/ticket/13192Tristan Darricau2015-01-193-23/+63
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | [ticket/13192] Add test for app.php in external subfolderMarc Alexander2015-01-191-0/+2
| * | | | | | | | | [ticket/13192] Use ltrim() instead of preg_replace()Marc Alexander2015-01-101-1/+1
| * | | | | | | | | [ticket/13192] Order test cases consistentlyMarc Alexander2015-01-091-2/+2
| * | | | | | | | | [ticket/13192] Remove app.php on mod rewrite even if app.php is outside rootMarc Alexander2015-01-042-4/+9
| * | | | | | | | | [ticket/13192] Pass correct parameters and rename method to get_valid_pageMarc Alexander2014-10-213-16/+16
| * | | | | | | | | [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globalsMarc Alexander2014-10-211-3/+3
| * | | | | | | | | [ticket/13192] Use get_valid_user_page method in build_url functionMarc Alexander2014-10-211-20/+1
| * | | | | | | | | [ticket/13192] Add method for generating valid user page linksMarc Alexander2014-10-212-0/+52
* | | | | | | | | | Merge pull request #3299 from Nicofuma/ticket/13511Andreas Fischer2015-01-171-7/+7
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | [ticket/13511] Call the check() method with the phpcsFile objectTristan Darricau2015-01-171-7/+7
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3234 from brunoais/ticket/13154Joas Schilling2015-01-134-2/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | [ticket/13154] Don't assign dispatcher to a variable. Just the obj param.brunoais2015-01-101-1/+1
| * | | | | | | | | [ticket/13154] Wrong variable name in the comment blockbrunoais2014-12-191-1/+1
| * | | | | | | | | [ticket/13154] space before @varbrunoais2014-12-191-1/+1