| Commit message (Expand) | Author | Age | Files | Lines |
* | [ticket/11747] ucp_prefs_personal core events | Matt Friedman | 2013-07-26 | 1 | -0/+25 |
* | [ticket/11747] Add $phpbb_dispatcher to global | Matt Friedman | 2013-07-26 | 1 | -1/+1 |
* | Merge branch 'develop-olympus' into develop | Nathaniel Guse | 2013-07-25 | 1 | -1/+1 |
|\ |
|
| * | Merge remote-tracking branch 'remotes/Elsensee/ticket/10917' into develop-oly... | Nathaniel Guse | 2013-07-25 | 1 | -1/+1 |
| |\ |
|
| | * | [ticket/10917] Using phpbb wrapper | Oliver Schramm | 2013-07-24 | 1 | -1/+1 |
| | * | [ticket/10917] Fixed notice that files are out of date when updating to an un... | Oliver Schramm | 2013-07-24 | 1 | -1/+1 |
* | | | Merge branch 'develop-olympus' into develop | Nathaniel Guse | 2013-07-25 | 1 | -1/+8 |
|\ \ \
| |/ / |
|
| * | | Merge remote-tracking branch 'remotes/Elsensee/ticket/11062' into develop-oly... | Nathaniel Guse | 2013-07-25 | 1 | -1/+8 |
| |\ \ |
|
| | * | | [ticket/11062] If user's language is english there is no further work needed | Oliver Schramm | 2013-07-25 | 1 | -1/+1 |
| | * | | [ticket/11062] Load new strings from user's language file if provided | Oliver Schramm | 2013-07-25 | 1 | -0/+7 |
| | |/ |
|
* | | | Merge remote-tracking branch 'Elsensee/ticket/11741' into develop | Andreas Fischer | 2013-07-25 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | [ticket/11741] Fix empty brackets and remove bullet | Oliver Schramm | 2013-07-24 | 1 | -2/+2 |
* | | | | Merge branch 'develop-olympus' into develop | Andreas Fischer | 2013-07-25 | 1 | -1/+1 |
|\ \ \ \
| | |/ /
| |/| | |
|
| * | | | Merge branch 'prep-release-3.0.12' into develop-olympus | Andreas Fischer | 2013-07-25 | 1 | -1/+1 |
| |\ \ \
| | |_|/
| |/| | |
|
| | * | | Merge remote-tracking branch 'unknownbliss/ticket/11740' into prep-release-3.... | Andreas Fischer | 2013-07-25 | 1 | -1/+1 |
| | |\ \ |
|
| | | * | | [ticket/11740] Update FAQ to include Ideas Centre | MichaelC | 2013-07-25 | 1 | -1/+1 |
| | |/ / |
|
* | | | | Merge remote-tracking branch 'brunoais/ticket/11656' into develop | Joas Schilling | 2013-07-24 | 1 | -11/+2 |
|\ \ \ \
| |_|_|/
|/| | | |
|
| * | | | [ticket/11656] Made the check for the bitfield just like other PR's | Bruno Ais | 2013-07-24 | 1 | -1/+2 |
| * | | | [ticket/11656] Wrong bitwise OR | Bruno Ais | 2013-07-13 | 1 | -1/+1 |
| * | | | [ticket/11656] Remove line break in function call | Bruno Ais | 2013-07-13 | 1 | -2/+1 |
| * | | | [ticket/11656] generate_text_for_display on memberlist.php | Bruno Ais | 2013-07-13 | 1 | -11/+2 |
* | | | | Merge remote-tracking branch 'EXreaction/ticket/11667' into develop | Andreas Fischer | 2013-07-24 | 4 | -9/+37 |
|\ \ \ \ |
|
| * | | | | [ticket/11667] Use @inheritdoc | Nathan Guse | 2013-07-23 | 2 | -14/+4 |
| * | | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667 | Nathan Guse | 2013-07-23 | 465 | -2533/+9519 |
| |\ \ \ \ |
|
| | * \ \ \ | Merge pull request #1601 from nickvergessen/ticket/11734 | Nathan Guse | 2013-07-23 | 1 | -0/+11 |
| | |\ \ \ \
| |/ / / / /
|/| | | | | |
|
| | * | | | | [ticket/11734] Readd accidently removed language strings of forum permissions | Joas Schilling | 2013-07-23 | 1 | -0/+11 |
* | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11718' into develop | Andreas Fischer | 2013-07-23 | 3 | -5/+11 |
|\ \ \ \ \ \ |
|
| * | | | | | | [ticket/11718] Quick test for fixes in ELSEIF | Nathaniel Guse | 2013-07-19 | 2 | -1/+6 |
| * | | | | | | [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIF | Nathaniel Guse | 2013-07-19 | 1 | -4/+5 |
* | | | | | | | Merge remote-tracking branch 'asperous/ticket/11620' into develop | Andreas Fischer | 2013-07-23 | 20 | -204/+1014 |
|\ \ \ \ \ \ \
| |_|_|/ / / /
|/| | | | | | |
|
| * | | | | | | [ticket/11620] Whitespace and combine function into test_case | Andy Chase | 2013-07-22 | 7 | -39/+30 |
| * | | | | | | [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarity | Andy Chase | 2013-07-22 | 1 | -10/+26 |
| * | | | | | | [ticket/11620] Changed incorrect global variable | Andy Chase | 2013-07-22 | 1 | -2/+2 |
| * | | | | | | [ticket/11620] Minor indentation changes and comment clarity | Andy Chase | 2013-07-22 | 2 | -7/+5 |
| * | | | | | | Merge branch 'develop' into ticket/11620 | Andy Chase | 2013-07-22 | 5 | -8/+12 |
| |\ \ \ \ \ \ |
|
| * | | | | | | | [ticket/11620] Expected and actual test conditions wrongly swapped | Andy Chase | 2013-07-22 | 1 | -1/+1 |
| * | | | | | | | [ticket/11620] Space between . in directory import concatenation | Andy Chase | 2013-07-22 | 9 | -9/+9 |
| * | | | | | | | [ticket/11620] Changes to match merge | Andy Chase | 2013-07-22 | 2 | -1/+4 |
| * | | | | | | | Merge branch 'develop' into ticket/11620 | Andy Chase | 2013-07-22 | 498 | -5058/+11718 |
| |\ \ \ \ \ \ \ |
|
| * | | | | | | | | [ticket/11620] Changes for code guidelines consistency | Andy Chase | 2013-07-22 | 3 | -13/+15 |
| * | | | | | | | | [ticket/11620] Fix a static calls to non-static for session captcha | asperous | 2013-07-22 | 2 | -2/+4 |
| * | | | | | | | | [ticket/11620] Cleanup creation_test that was renamed on a cherry-pick | asperous | 2013-07-22 | 1 | -69/+0 |
| * | | | | | | | | [ticket/11620] Update auth_provider for new interface | asperous | 2013-07-22 | 1 | -1/+6 |
| * | | | | | | | | [ticket/11620] Added garbage_collection_test | asperous | 2013-07-22 | 2 | -0/+121 |
| * | | | | | | | | [ticket/11620] Fixed check_ban_test errors with cache and ban warning message | asperous | 2013-07-22 | 1 | -6/+18 |
| * | | | | | | | | [ticket/11620] Fixed a typo on check_ban_test | asperous | 2013-07-22 | 1 | -1/+1 |
| * | | | | | | | | [ticket/11620] Refactored check_isvalid_test to use session_test_case | asperous | 2013-07-22 | 1 | -20/+6 |
| * | | | | | | | | [ticket/11615] Refactored isvalid test to be more imperative | Andy Chase | 2013-07-22 | 2 | -85/+63 |
| * | | | | | | | | [ticket/11615] Rename continue -> check_isvalid for clarity | Andy Chase | 2013-07-22 | 1 | -1/+1 |
| * | | | | | | | | [ticket/11620] Added a test for checking if users are banned | asperous | 2013-07-22 | 3 | -0/+121 |