aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1361 from MGaetan89/ticket/11471Nils Adermann2013-04-2520-54/+10
|\
| * [ticket/11471] Unrelated text in e-mail templatesGaëtan Muller2013-04-2420-54/+10
* | Merge pull request #1368 from EXreaction/ticket/11479Nils Adermann2013-04-251-1/+7
|\ \
| * | [ticket/11479] Use phpbb_create_default_containerNathan Guse2013-04-241-12/+1
| * | [ticket/11479] Fix install/update (rebuild container)Nathaniel Guse2013-04-241-1/+18
| |/
* | Merge pull request #1369 from EXreaction/ticket/11335Nils Adermann2013-04-2517-40/+40
|\ \
| * | [ticket/11335] Replace "$phpEx" with $phpExNathaniel Guse2013-04-245-8/+8
| * | [ticket/11335] (more) Make php_ext 'php' not '.php'Nathan Guse2013-04-241-1/+1
| * | [ticket/11335] (more class loader) Make php_ext 'php' not '.php'Nathan Guse2013-04-244-7/+7
| * | [ticket/11335] (avatars) Make php_ext 'php' not '.php'Nathan Guse2013-04-244-9/+9
| * | [ticket/11335] (kernel request subscriber) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-4/+4
| * | [ticket/11335] (hook finder) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-2/+2
| * | [ticket/11335] (extension manager/finder) Make php_ext 'php' not '.php'Nathan Guse2013-04-244-9/+9
| * | [ticket/11335] (controller/helper.php) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-2/+2
| * | [ticket/11335] (class loader) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-6/+6
* | | Merge pull request #1367 from EXreaction/ticket/11454Nils Adermann2013-04-2513-22/+39
|\ \ \ | |/ / |/| |
| * | [ticket/11454] Check if the fields are setNathaniel Guse2013-04-241-4/+4
| * | [ticket/11454] Use set_addresses in other applicable areasNathan Guse2013-04-2410-20/+13
| * | [ticket/11454] Add messenger function set_addressesNathaniel Guse2013-04-242-1/+19
| * | [ticket/11454] Correct jabber global available checkNathaniel Guse2013-04-241-1/+7
| |/
* | Merge pull request #1366 from asperous/ticket/11129Nils Adermann2013-04-241-2/+17
|\ \
| * | [ticket/11129] Added headers to empty subscription stateasperous2013-04-231-0/+1
| * | [ticket/11129] Added headers to empty subscription stateasperous2013-04-231-2/+16
| |/
* | Merge remote-tracking branch 'github-asperous/ticket/9975' into developNils Adermann2013-04-246-5/+9
|\ \
| * | [ticket/9975] Moved a few E_USER_ERROR errors to /languageasperous2013-04-237-6/+11
| |/
* | Merge branch 'develop-olympus' into developNils Adermann2013-04-242-1/+2
|\ \
| * | [ticket/9975] Translate missing style error messageGaëtan Muller2013-04-212-1/+2
* | | Merge pull request #1326 from dhruvgoel92/ticket/11485Nils Adermann2013-04-241-0/+28
|\ \ \
| * | | [ticket/11485] add revert_schema for the updated columnsDhruv2013-04-091-0/+14
| * | | [ticket/11485] add columns to styles table during updating schema beforeDhruv2013-04-091-0/+14
* | | | Merge pull request #1324 from nickvergessen/ticket/10844-2Nils Adermann2013-04-244-3/+22
|\ \ \ \
| * | | | [ticket/10844] Make sure ext_path has no trailing slashJoas Schilling2013-04-121-0/+5
| * | | | [ticket/10844] Add phpbb_root_path to phpbb_style_extension_path_providerJoas Schilling2013-04-124-3/+17
* | | | | Merge pull request #1290 from nickvergessen/ticket/11362Nils Adermann2013-04-246-21/+88
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | [ticket/11362] Use container when available instead of creating a new instanceJoas Schilling2013-04-221-1/+1
| * | | | [ticket/11362] Add compatibility function phpbb_clean_path() againJoas Schilling2013-04-181-0/+32
| * | | | [ticket/11362] Fix service description of finderJoas Schilling2013-04-171-1/+1
| * | | | [ticket/11362] Extension manager depends on filesystemJoas Schilling2013-04-172-2/+5
| * | | | [ticket/11362] Replace other calls to phpbb_clean_pathJoas Schilling2013-04-171-1/+4
| * | | | [ticket/11362] Use new filesystem class in finderJoas Schilling2013-04-171-2/+5
| * | | | [ticket/11362] Move phpbb_clean_path into a simple filesystem serviceJoas Schilling2013-04-173-30/+56
| * | | | [ticket/11362] Correctly sanitise the directory pathJoas Schilling2013-03-121-1/+1
* | | | | [ticket/10966] Introduce MSSQL base class for native and ODBCJoas Schilling2013-04-193-86/+67
* | | | | [ticket/10966] Introduce MySQL base classJoas Schilling2013-04-173-246/+148
* | | | | [ticket/11488] Use correct base class in email notification methodMarc Alexander2013-04-152-2/+2
* | | | | Merge remote-tracking branch 'hjpotter92/ticket/11225' into developAndreas Fischer2013-04-131-19/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | [ticket/11225] Deletion of unused mcp_jumpbox.html filehjpotter922013-04-111-19/+0
| | |/ / | |/| |
* | | | Merge pull request #1184 from marc1706/ticket/11314Nils Adermann2013-04-1212-866/+511
|\ \ \ \
| * \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-03-26179-2512/+12719
| |\ \ \ \
| * | | | | [ticket/11314] Modify files to comply with coding standardsMarc Alexander2013-03-268-734/+352