aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-12-091-1/+10
|\
| * Merge branch 'prep-release-3.0.10' into develop-olympusNils Adermann2011-12-091-1/+10
| |\
| | * [ticket/10319] Missing hidden fields in search formVjacheslav Trushkin2011-12-091-1/+10
| | * [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.Andreas Fischer2011-12-041-1/+1
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-12-032-46/+8
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympusOleg Pudeyev2011-12-032-46/+8
| |\ \
| | * | [ticket/10349] Removed duplicated functions from schema loading in testsPatrick Webster2011-10-291-1/+0
| | * | [ticket/10349] Use new schema comment function in installerPatrick Webster2011-09-282-46/+9
* | | | Merge remote-tracking branch 'nickvergessen/ticket/develop/10345' into developOleg Pudeyev2011-12-0331-197/+371
|\ \ \ \
| * | | | [ticket/10345] Check directly whether the key to use existsJoas Schilling2011-11-301-8/+16
| * | | | [ticket/10345] Return the language key when the key has an empty arrayJoas Schilling2011-11-301-0/+5
| * | | | [ticket/10345] Document behaviour for floating numbers on phpbb_get_plural_formJoas Schilling2011-11-302-2/+2
| * | | | [ticket/10345] Remove doubled check for valid plural ruleJoas Schilling2011-11-301-4/+0
| * | | | [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functionsJoas Schilling2011-11-305-14/+26
| * | | | [ticket/10345] Move rule determination code into a new functionJoas Schilling2011-11-252-153/+173
| * | | | [ticket/10345] Make the use of the 0-case optionalJoas Schilling2011-11-251-34/+40
| * | | | [ticket/10345] Fix some last use cases of sprintf() to use $user->lang()Joas Schilling2011-11-253-6/+6
| * | | | [ticket/10345] Fix some documentation issues.Joas Schilling2011-11-251-5/+5
| * | | | [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-271-5/+5
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge branch 'prep-release-3.0.10' into develop-olympusAndreas Fischer2011-11-271-5/+5
| |\ \ \ | | | |/ | | |/|
| | * | Merge remote-tracking branch 'rxu/ticket/10497' into prep-release-3.0.10Andreas Fischer2011-11-271-5/+5
| | |\ \
| | | * | [ticket/10497] Fix SQL error when guest visits forum with unread topicrxu2011-11-271-5/+5
| | * | | [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.Andreas Fischer2011-11-261-1/+1
| | |/ /
* | | | 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
|\ \ \ \ \ \ | | |/ / / / | |/| | | |