aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* [ticket/10345] Allow float as array key and add some testsJoas Schilling2011-11-251-2/+4
* [ticket/10345] Use the plural function in some more places.Joas Schilling2011-11-2514-59/+73
* [ticket/10345] Make use of the plural function in some basic placesJoas Schilling2011-11-2520-122/+54
* [ticket/10345] Remove '1 hour ago' string which conflicted with plural rulesJoas Schilling2011-11-251-2/+2
* [ticket/10345] Fix documentation on the new function and the switchJoas Schilling2011-11-251-2/+13
* [ticket/10345] Add a system to allow multiple plural formsJoas Schilling2011-11-251-1/+169
* Merge branch 'develop-olympus' into developAndreas Fischer2011-11-251-11/+15
|\
| * [ticket/10280] Change the display of user activation settings in the ACP.RMcGirr832011-11-251-11/+15
* | Merge remote-tracking branch 'nickvergessen/ticket/10484' into developOleg Pudeyev2011-11-244-26/+32
|\ \
| * | [ticket/10484] Use variables for sql_build_query() callsJoas Schilling2011-11-214-26/+32
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-231-1/+5
|\ \ \ | | |/ | |/|
| * | Merge branch 'prep-release-3.0.10' into develop-olympusOleg Pudeyev2011-11-231-1/+5
| |\ \
| | * | [ticket/10461] Add a comment explaining the logic here.Oleg Pudeyev2011-11-231-0/+4
| | * | [ticket/10461] Correct $log_count check in view_log() so we show logs again.Andreas Fischer2011-11-231-1/+1
| * | | [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.Andreas Fischer2011-11-211-1/+1
| |/ /
| * | [develop-olympus] Bump version numbers for 3.0.10-RC1 release.Andreas Fischer2011-11-201-1/+1
* | | Merge remote-tracking branch 'igorw/ticket/10323' into developOleg Pudeyev2011-11-201-4/+9
|\ \ \
| * | | [ticket/10323] slight potential performance improvementIgor Wiedler2011-11-201-4/+4
| * | | [ticket/10323] make finder work with PHP 5.2Igor Wiedler2011-11-191-1/+6
* | | | Merge branch 'develop-olympus' into developIgor Wiedler2011-11-208-40/+26
|\ \ \ \ | | |/ / | |/| |
| * | | [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().Andreas Fischer2011-11-208-13/+16
| * | | [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().Andreas Fischer2011-11-201-1/+2
| * | | [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.Oleg Pudeyev2011-11-201-2/+2
| * | | [ticket/10446] DRY X-AntiAbuse header addition.Oleg Pudeyev2011-11-208-42/+24
* | | | Merge remote-tracking branch 'nickvergessen/ticket/10344' into developOleg Pudeyev2011-11-204-12/+18
|\ \ \ \
| * | | | [ticket/10344] Add attachment icons to list of reported and queued posts/topicsJoas Schilling2011-08-274-12/+18
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-201-0/+1
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge remote-tracking branch 'callumacrae/ticket/10402' into develop-olympusOleg Pudeyev2011-11-201-0/+1
| |\ \ \ \
| | * | | | [ticket/10402] Fixed a formatting issue with report details.Callum Macrae2011-10-221-0/+1
* | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-11-191-3/+6
|\ \ \ \ \ \ | |/ / / / / | | | | / / | |_|_|/ / |/| | | |
| * | | | Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympusOleg Pudeyev2011-11-191-3/+6
| |\ \ \ \
| | * | | | [ticket/10239] Correct undefined variable error.Chris Smith2011-11-181-2/+1
| | * | | | [ticket/10239] Add confirm box to backup restore.Chris Smith2011-09-211-1/+5
* | | | | | Merge remote-tracking branch 'naderman/feature/extension-manager' into developIgor Wiedler2011-11-1927-432/+1769
|\ \ \ \ \ \
| * | | | | | [feature/extension-manager] Removing now unused acp_search codeNils Adermann2011-11-181-22/+0
| * | | | | | Merge branch 'develop' into feature/extension-managerNils Adermann2011-11-1827-264/+418
| |\ \ \ \ \ \
| * | | | | | | [feature/extension-manager] Split disabling extensions up into steps as wellNils Adermann2011-11-183-11/+52
| * | | | | | | [feature/extension-manager] Add documentation on caching in ext finderNils Adermann2011-11-181-0/+7
| * | | | | | | [feature/extension-manager] Rename default methods to core methods on finder.Nils Adermann2011-11-186-92/+112
| * | | | | | | [feature/extension-manager] Document what the class loader stores in cacheNils Adermann2011-11-181-0/+2
| * | | | | | | [feature/extension-manager] Add docblock to cached paths map in class loaderNils Adermann2011-11-181-0/+5
| * | | | | | | [feature/extension-manager] Clear up docs of extension related template changesNils Adermann2011-11-183-15/+35
| * | | | | | | [feature/extension-manager] Use "core files" instead of "global files" in docsNils Adermann2011-11-181-2/+2
| * | | | | | | [feature/extension-manager] Add docblocks to new search backend methodsNils Adermann2011-11-182-2/+12
| * | | | | | | [feature/extension-manager] Add docblocks to new methods in functions_moduleNils Adermann2011-11-181-2/+15
| * | | | | | | [feature/extension-manager] Clarify comment on ext meta class instantiatorNils Adermann2011-11-181-1/+1
| * | | | | | | [feature/extension-manager] Add more info on suffixes in extension finderNils Adermann2011-11-181-1/+9
| * | | | | | | [feature/extension-manager] Clarify is_dir parameter descriptionNils Adermann2011-11-181-2/+4
| * | | | | | | [feature/extension-manager] Clarify class finding method docblockNils Adermann2011-11-181-1/+4
| * | | | | | | [feature/extension-manager] Correct default path comment & remove double strlenNils Adermann2011-11-181-2/+3