aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into developNathan Guse2013-01-151-0/+16
|\
| * [ticket/10854] sql server drop default constraint when dropping columnSajaki2012-04-281-0/+16
* | Merge remote-tracking branch 'remotes/nickv/ticket/11201' into developNathan Guse2013-01-153-9/+0
|\ \
| * | [ticket/11201] Remove MSN/WLM fieldsJoas Schilling2013-01-113-9/+0
* | | Merge remote-tracking branch 'remotes/brunoais/ticket/11171' into developNathan Guse2013-01-141-14/+7
|\ \ \ | |/ / |/| |
| * | [ticket/11171] Cleanup of leftoversBruno Ais2012-12-071-12/+1
| * | [ticket/11171] Use the options stored to decide how to show itBruno Ais2012-12-071-2/+6
* | | Merge PR #1182 branch 'develop-olympus' into developOleg Pudeyev2013-01-091-1/+1
|\ \ \
| * | | [ticket/11301] Guidelines: Add spaces in front and after the / operator.Andreas Fischer2013-01-081-1/+1
| * | | [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.Andreas Fischer2013-01-081-1/+1
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-061-0/+1
|\ \ \ \ | |/ / /
| * | | Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympusAndreas Fischer2013-01-061-0/+1
| |\ \ \
| | * | | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
* | | | | [ticket/11309] phpbb_extension_interface::disable_step correct docblock.Erik Frèrejean2013-01-041-1/+3
* | | | | Merge remote-tracking branch 'erikfrerejean/ticket/11283' into developAndreas Fischer2013-01-031-1/+1
|\ \ \ \ \
| * | | | | [ticket/11283] Extension manager follow symlinks.Erik Frèrejean2012-12-231-1/+1
* | | | | | [ticket/11305] Check for $cache being null before using it in db drivers.Oleg Pudeyev2013-01-0210-41/+41
* | | | | | [ticket/11305] Retrieve cache driver from container rather than cache service.Oleg Pudeyev2013-01-022-5/+5
* | | | | | [ticket/11305] Extract hook finder from cache service.Oleg Pudeyev2013-01-022-30/+84
* | | | | | [ticket/11306] Add docblocks to all container related functionsIgor Wiedler2013-01-021-0/+41
* | | | | | [ticket/11306] Introduce phpbb_create_default_containerIgor Wiedler2013-01-021-0/+16
* | | | | | Merge remote-tracking branch 'p/ticket/11037' into developAndreas Fischer2012-12-311-42/+67
|\ \ \ \ \ \
| * | | | | | [ticket/11037] Add/update docblocks.Oleg Pudeyev2012-12-261-0/+33
| * | | | | | [ticket/11037] Eliminate globals from cache service.Oleg Pudeyev2012-12-241-42/+34
* | | | | | | Merge remote-tracking branch 'p/ticket/11188' into developAndreas Fischer2012-12-311-5/+48
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11188] Reduce waste.Oleg Pudeyev2012-12-301-6/+8
| * | | | | | | [ticket/11188] add result count query for author searchDhruv2012-12-301-1/+33
| * | | | | | | [ticket/11188] add count query to postgres searchDhruv2012-12-301-1/+10
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-311-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| * | | | | | [ticket/11293] Add a note that mysqli should be in front of mysql.Oleg Pudeyev2012-12-251-0/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge PR #1130 branch 'EXreaction/ticket/11259' into developOleg Pudeyev2012-12-297-24/+28
|\ \ \ \ \ \
| * | | | | | [ticket/11259] htmlspecialchars($phpbb_admin_path)Nathan Guse2012-12-103-18/+18
| * | | | | | [ticket/11259] adm_relative_path -> phpbb_adm_relative_pathNathan Guse2012-12-091-1/+1
| * | | | | | [ticket/11259] Also make adm_relative_path available in the containerNathan Guse2012-12-091-0/+1
| * | | | | | [ticket/11259] Make phpbb_admin_path available everywhereNathan Guse2012-12-094-7/+10
* | | | | | | Merge remote-tracking branch 'p/ticket/10758' into developAndreas Fischer2012-12-257-47/+100
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | [ticket/10758] Add return to the other compat function.Oleg Pudeyev2012-12-241-1/+1
| * | | | | | [ticket/10758] Add periods.Oleg Pudeyev2012-12-221-2/+2
| * | | | | | [ticket/10758] Yes, only one empty line.Oleg Pudeyev2012-12-221-1/+0
| * | | | | | [ticket/10758] Add deprecated tags.Oleg Pudeyev2012-12-201-0/+2
| * | | | | | [ticket/10758] Add compat functions.Oleg Pudeyev2012-12-201-0/+27
| * | | | | | [ticket/10758] Extract obtain_user_data for the benefit of tests.Oleg Pudeyev2012-12-192-6/+21
| * | | | | | [ticket/10758] Spelling fix.Oleg Pudeyev2012-12-151-1/+1
| * | | | | | [ticket/10758] Dependency inject parameters into update_foes.Oleg Pudeyev2012-12-153-8/+12
| * | | | | | [ticket/10758] Dependency inject parameters into cache_moderators.Oleg Pudeyev2012-12-156-32/+38
* | | | | | | Merge remote-tracking branch 'p/ticket/11248' into developAndreas Fischer2012-12-221-1712/+1712
|\ \ \ \ \ \ \
| * | | | | | | [ticket/11248] Convert line endings to LF - develop edition.Oleg Pudeyev2012-12-071-1712/+1712
* | | | | | | | Merge remote-tracking branch 'p/ticket/11037' into developAndreas Fischer2012-12-2213-20/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11037] Eliminate global $db usage in cache drivers.Oleg Pudeyev2012-12-2013-20/+17
| | |_|_|_|/ / / | |/| | | | | |
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-201-2/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | |