| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-13 | 2 | -2/+14 |
| |\ | |||||
| | * | Merge pull request #3137 from prototech/ticket/13209 | Marc Alexander | 2014-11-13 | 2 | -2/+14 |
| | |\ | | | | | | | | | | [ticket/13209] Fix loss of CPF language field values when switching steps | ||||
| | | * | [ticket/13209] Gather language field values for boolean CPF's in all steps. | Cesar G | 2014-11-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | The user can move back and forth between all three steps and as such the lang field data should be expected in all steps. PHPBB3-13209 | ||||
| | | * | [ticket/13209] Fix expected request value of CPF language fields. | Cesar G | 2014-11-11 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | | | | Multiple languages can be edited, thus the expected value is an array. PHPBB3-13209 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-12 | 1 | -0/+8 |
| |\ \ \ | |/ / | |||||
| | * | | Merge pull request #3139 from prototech/ticket/13239 | Marc Alexander | 2014-11-12 | 1 | -0/+8 |
| | |\ \ | | | | | | | | | | | | | [ticket/13239] Ensure "Add files" button position is correctly calculated. | ||||
| | | * | | [ticket/13239] Ensure "Add files" button position is correctly calculated. | Cesar G | 2014-11-11 | 1 | -0/+8 |
| | | |/ | | | | | | | | | | PHPBB3-13239 | ||||
| * | | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2014-11-11 | 1 | -22/+18 |
| |\ \ \ | |/ / | | | | | | | | | | * develop-ascraeus: [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location. | ||||
| | * | | Merge branch 'develop-olympus' into develop-ascraeus | Tristan Darricau | 2014-11-11 | 1 | -22/+18 |
| | |\ \ | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location. | ||||
| | | * | | [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location. | Andreas Fischer | 2014-11-11 | 1 | -22/+18 |
| | | | | | | | | | | | | | | | | | PHPBB3-13324 | ||||
| | | * | | Merge pull request #3090 from Nicofuma/ticket/13234 | Joas Schilling | 2014-10-28 | 1 | -30/+39 |
| | | |\ \ | | | | | | | | | | | | | | | | Ticket/13234 | ||||
| | | | * | | [ticket/13234] Fix conditions and CS | Tristan Darricau | 2014-10-28 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | PHPBB3-13234 | ||||
| | | | * | | [ticket/13234] Never allow autologin/remember me to modify the userid | Nils Adermann | 2014-10-27 | 1 | -31/+40 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | This prevents admin relogin with forced user id from overwriting remember me cookies PHPBB3-13234 | ||||
| * | | | | [develop] Update / Fix composer.lock hash. | Andreas Fischer | 2014-11-11 | 1 | -4/+10 |
| | | | | | |||||
| * | | | | Merge pull request #1880 from nicolas-grekas/develop | Tristan Darricau | 2014-11-11 | 19 | -3121/+175 |
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [3.2] Rely on Intl and mbstring, use patchwork/utf8 as fallback * nicolas-grekas/develop: [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback [feature/patchwork-utf8] Remove utf8_str_replace [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback | ||||
| | * | | | | [feature/patchwork-utf8] Rely on mbstring, use patchwork/utf8 as fallback | Nicolas Grekas | 2014-11-08 | 1 | -516/+64 |
| | | | | | | |||||
| | * | | | | [feature/patchwork-utf8] Remove utf8_str_replace | Nicolas Grekas | 2014-11-08 | 2 | -51/+4 |
| | | | | | | |||||
| | * | | | | [feature/patchwork-utf8] Normalize with intl, use patchwork/utf8 as fallback | Nicolas Grekas | 2014-11-08 | 18 | -2554/+107 |
| | | | | | | |||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2014-11-11 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | * develop-ascraeus: [ticket/13083] Fix language string NO_ENTRIES for logs | ||||
| | * | | | | Merge pull request #3112 from Elsensee/ticket/13083 | Tristan Darricau | 2014-11-11 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13083] Fix language string NO_ENTRIES for logs * Elsensee/ticket/13083: [ticket/13083] Fix language string NO_ENTRIES for logs | ||||
| | | * | | | | [ticket/13083] Fix language string NO_ENTRIES for logs | Oliver Schramm | 2014-11-05 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The string was misleading because there does not always have to be a period when viewing log entries. PHPBB3-13083 | ||||
| * | | | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-09 | 1 | -10/+18 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge pull request #3113 from prototech/ticket/13251 | Marc Alexander | 2014-11-09 | 1 | -10/+18 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/13251] Escape container parameters defined from config.php. | ||||
| | | * | | | | | [ticket/13251] Escape container parameters defined from config.php. | Cesar G | 2014-11-07 | 1 | -10/+18 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13251 | ||||
| * | | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-09 | 3 | -4/+4 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge pull request #3121 from Elsensee/ticket/13300 | Joas Schilling | 2014-11-09 | 3 | -4/+4 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13300] Don't show jabber in profile if jabber is disabled | ||||
| | | * | | | | | | [ticket/13300] Don't show jabber in profile if jabber is disabled | Oliver Schramm | 2014-11-09 | 3 | -4/+4 |
| | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | PHPBB3-13300 | ||||
| * | | | | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-09 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Merge pull request #3120 from Elsensee/ticket/13301 | Marc Alexander | 2014-11-09 | 1 | -2/+2 |
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13301] Fix called function in apche auth module | ||||
| | | * | | | | | | [ticket/13301] Fix called function in apche auth module | Oliver Schramm | 2014-11-09 | 1 | -2/+2 |
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13301 | ||||
| * | | | | | | | Merge branch 'develop-ascraeus' into develop | Marc Alexander | 2014-11-09 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | [ticket/13243] Validate announcement entry for existence in version_helper | Oliver Schramm | 2014-11-09 | 1 | -1/+1 |
| | |/ / / / / | | | | | | | | | | | | | | | | | | | PHPBB3-13243 | ||||
| * | | | | | | Merge branch 'develop-ascraeus' into develop | Joas Schilling | 2014-11-09 | 1 | -0/+1 |
| |\ \ \ \ \ \ | |/ / / / / | |||||
| | * | | | | | Merge pull request #3110 from Elsensee/ticket/13242 | Joas Schilling | 2014-11-09 | 1 | -0/+1 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | [ticket/13242] Fix HTML validity | ||||
| | | * | | | | | [ticket/13242] Fix HTML validity | Oliver Schramm | 2014-11-05 | 1 | -0/+1 |
| | | | |/ / / | | |/| | | | | | | | | | | | | | | | PHPBB3-13242 | ||||
| * | | | | | | Merge branch 'develop-ascraeus' into develop | Cesar G | 2014-11-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | | | * develop-ascraeus: [ticket/13265] Don't show link to edit own profile to those without permission | ||||
| | * | | | | Merge remote-tracking branch 'Elsensee/ticket/13265' into develop-ascraeus | Cesar G | 2014-11-08 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | * Elsensee/ticket/13265: [ticket/13265] Don't show link to edit own profile to those without permission | ||||
| | | * | | | | [ticket/13265] Don't show link to edit own profile to those without permission | Oliver Schramm | 2014-11-05 | 1 | -1/+1 |
| | | |/ / / | | | | | | | | | | | | | | | | PHPBB3-13265 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2014-11-07 | 1 | -0/+31 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12. | ||||
| | * | | | | Merge pull request #3118 from prototech/ticket/13270 | Tristan Darricau | 2014-11-07 | 1 | -0/+31 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12. * prototech/ticket/13270: [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12. | ||||
| | | * | | | | [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12. | Cesar G | 2014-11-07 | 1 | -0/+31 |
| | | | |/ / | | |/| | | | | | | | | | | | | PHPBB3-13270 | ||||
| * | | | | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2014-11-07 | 1 | -1/+9 |
| |\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13303] Speed up migration dependency calculation. | ||||
| | * | | | | [ticket/13303] Speed up migration dependency calculation. | Cesar G | 2014-11-07 | 1 | -1/+9 |
| | |/ / / | | | | | | | | | | | | | PHPBB3-13303 | ||||
| * | | | | Merge branch 'develop-ascraeus' into develop | Tristan Darricau | 2014-11-07 | 2 | -4/+12 |
| |\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13280] Remove unneeded str_replace in build_url() [ticket/13280] Only run sanitizer for server superglobal and modify tests [ticket/13280] Seperate server sanitizer call and add comment [ticket/13280] Add additional sanitizer for ampersands in server superglobal [ticket/13280] Correctly format user page for build_url() [ticket/13280] Properly format the current page and add sanitizer to tests | ||||
| | * | | | [ticket/13280] Remove unneeded str_replace in build_url() | Marc Alexander | 2014-11-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | PHPBB3-13280 | ||||
| | * | | | [ticket/13280] Only run sanitizer for server superglobal and modify tests | Marc Alexander | 2014-11-04 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | PHPBB3-13280 | ||||
| | * | | | [ticket/13280] Seperate server sanitizer call and add comment | Marc Alexander | 2014-11-04 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-13280 | ||||
| | * | | | [ticket/13280] Add additional sanitizer for ampersands in server superglobal | Marc Alexander | 2014-11-03 | 2 | -2/+7 |
| | | | | | | | | | | | | | | | | | PHPBB3-13280 | ||||
| | * | | | [ticket/13280] Correctly format user page for build_url() | Marc Alexander | 2014-11-03 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | PHPBB3-13280 | ||||
| | * | | | [ticket/13280] Properly format the current page and add sanitizer to tests | Marc Alexander | 2014-11-03 | 1 | -3/+3 |
| | |/ / | | | | | | | | | | PHPBB3-13280 | ||||
