aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11747] ucp_prefs_personal core eventsMatt Friedman2013-07-261-0/+25
* [ticket/11747] Add $phpbb_dispatcher to globalMatt Friedman2013-07-261-1/+1
* Merge branch 'develop-olympus' into developNathaniel Guse2013-07-251-1/+1
|\
| * Merge remote-tracking branch 'remotes/Elsensee/ticket/10917' into develop-oly...Nathaniel Guse2013-07-251-1/+1
| |\
| | * [ticket/10917] Using phpbb wrapperOliver Schramm2013-07-241-1/+1
| | * [ticket/10917] Fixed notice that files are out of date when updating to an un...Oliver Schramm2013-07-241-1/+1
* | | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-251-1/+8
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'remotes/Elsensee/ticket/11062' into develop-oly...Nathaniel Guse2013-07-251-1/+8
| |\ \
| | * | [ticket/11062] If user's language is english there is no further work neededOliver Schramm2013-07-251-1/+1
| | * | [ticket/11062] Load new strings from user's language file if providedOliver Schramm2013-07-251-0/+7
| | |/
* | | Merge remote-tracking branch 'Elsensee/ticket/11741' into developAndreas Fischer2013-07-251-2/+2
|\ \ \
| * | | [ticket/11741] Fix empty brackets and remove bulletOliver Schramm2013-07-241-2/+2
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-251-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'prep-release-3.0.12' into develop-olympusAndreas Fischer2013-07-251-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Merge remote-tracking branch 'unknownbliss/ticket/11740' into prep-release-3....Andreas Fischer2013-07-251-1/+1
| | |\ \
| | | * | [ticket/11740] Update FAQ to include Ideas CentreMichaelC2013-07-251-1/+1
| | |/ /
* | | | Merge remote-tracking branch 'brunoais/ticket/11656' into developJoas Schilling2013-07-241-11/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | [ticket/11656] Made the check for the bitfield just like other PR'sBruno Ais2013-07-241-1/+2
| * | | [ticket/11656] Wrong bitwise ORBruno Ais2013-07-131-1/+1
| * | | [ticket/11656] Remove line break in function callBruno Ais2013-07-131-2/+1
| * | | [ticket/11656] generate_text_for_display on memberlist.phpBruno Ais2013-07-131-11/+2
* | | | Merge remote-tracking branch 'EXreaction/ticket/11667' into developAndreas Fischer2013-07-244-9/+37
|\ \ \ \
| * | | | [ticket/11667] Use @inheritdocNathan Guse2013-07-232-14/+4
| * | | | Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11667Nathan Guse2013-07-23465-2533/+9519
| |\ \ \ \
| | * \ \ \ Merge pull request #1601 from nickvergessen/ticket/11734Nathan Guse2013-07-231-0/+11
| | |\ \ \ \ | |/ / / / / |/| | | | |
| | * | | | [ticket/11734] Readd accidently removed language strings of forum permissionsJoas Schilling2013-07-231-0/+11
* | | | | | Merge remote-tracking branch 'EXreaction/ticket/11718' into developAndreas Fischer2013-07-233-5/+11
|\ \ \ \ \ \
| * | | | | | [ticket/11718] Quick test for fixes in ELSEIFNathaniel Guse2013-07-192-1/+6
| * | | | | | [ticket/11718] Twig lexer only correcting statements in IF, not ELSEIFNathaniel Guse2013-07-191-4/+5
* | | | | | | Merge remote-tracking branch 'asperous/ticket/11620' into developAndreas Fischer2013-07-2320-204/+1014
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | [ticket/11620] Whitespace and combine function into test_caseAndy Chase2013-07-227-39/+30
| * | | | | | [ticket/11620] Move check_ban_test functions to setUp/tearDown for clarityAndy Chase2013-07-221-10/+26
| * | | | | | [ticket/11620] Changed incorrect global variableAndy Chase2013-07-221-2/+2
| * | | | | | [ticket/11620] Minor indentation changes and comment clarityAndy Chase2013-07-222-7/+5
| * | | | | | Merge branch 'develop' into ticket/11620Andy Chase2013-07-225-8/+12
| |\ \ \ \ \ \
| * | | | | | | [ticket/11620] Expected and actual test conditions wrongly swappedAndy Chase2013-07-221-1/+1
| * | | | | | | [ticket/11620] Space between . in directory import concatenationAndy Chase2013-07-229-9/+9
| * | | | | | | [ticket/11620] Changes to match mergeAndy Chase2013-07-222-1/+4
| * | | | | | | Merge branch 'develop' into ticket/11620Andy Chase2013-07-22498-5058/+11718
| |\ \ \ \ \ \ \
| * | | | | | | | [ticket/11620] Changes for code guidelines consistencyAndy Chase2013-07-223-13/+15
| * | | | | | | | [ticket/11620] Fix a static calls to non-static for session captchaasperous2013-07-222-2/+4
| * | | | | | | | [ticket/11620] Cleanup creation_test that was renamed on a cherry-pickasperous2013-07-221-69/+0
| * | | | | | | | [ticket/11620] Update auth_provider for new interfaceasperous2013-07-221-1/+6
| * | | | | | | | [ticket/11620] Added garbage_collection_testasperous2013-07-222-0/+121
| * | | | | | | | [ticket/11620] Fixed check_ban_test errors with cache and ban warning messageasperous2013-07-221-6/+18
| * | | | | | | | [ticket/11620] Fixed a typo on check_ban_testasperous2013-07-221-1/+1
| * | | | | | | | [ticket/11620] Refactored check_isvalid_test to use session_test_caseasperous2013-07-221-20/+6
| * | | | | | | | [ticket/11615] Refactored isvalid test to be more imperativeAndy Chase2013-07-222-85/+63
| * | | | | | | | [ticket/11615] Rename continue -> check_isvalid for clarityAndy Chase2013-07-221-1/+1
| * | | | | | | | [ticket/11620] Added a test for checking if users are bannedasperous2013-07-223-0/+121