aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | [ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entrySenky2012-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10835
| | * | | [ticket/10835] fixing misleading message in UCPSenky2012-05-013-4/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10835
* | | | | Merge PR #725 branch 'develop-olympus' into developOleg Pudeyev2012-05-101-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-olympus: [ticket/9896] Links changed
| * | | | Merge PR #725 branch 'Senky/ticket/9896' into develop-olympusOleg Pudeyev2012-05-101-4/+4
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/9896: [ticket/9896] Links changed
| | * | | | [ticket/9896] Links changedSenky2012-05-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Link to languaged updated to http://www.phpbb.com/languages/ Link to styles updated to http://www.phpbb.com/customise/db/styles-2/ Link to MODs updated to http://www.phpbb.com/customise/db/modifications-1/ Link to Community Forums updated to http://www.phpbb.com/community/ PHPBB3-9896
* | | | | | Merge PR #799 branch 'develop-olympus' into developOleg Pudeyev2012-05-109-94/+53
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10881] Replace old (and unify) file headers in develop files.
| * | | | | Merge PR #799 branch 'bantu/ticket/10881' into develop-olympusOleg Pudeyev2012-05-109-94/+53
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/10881: [ticket/10881] Replace old (and unify) file headers in develop files.
| | * | | | | [ticket/10881] Replace old (and unify) file headers in develop files.Andreas Fischer2012-05-109-94/+53
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This especially also fixes the problem of the copyright symbol being represented using 0xA9, which is neither ASCII nor the appropriate UTF8 byte sequence for the copyright symbol. PHPBB3-10881
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-090-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10843] Backport changes to install language. [ticket/10834] Backport general development language changes to 3.0. Conflicts: phpBB/docs/INSTALL.html phpBB/docs/README.html
| * | | | | Merge remote-tracking branch 'p/ticket/10834' into develop-olympusAndreas Fischer2012-05-092-16/+21
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10834: [ticket/10843] Backport changes to install language. [ticket/10834] Backport general development language changes to 3.0.
| | * | | | | [ticket/10843] Backport changes to install language.Oleg Pudeyev2012-05-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10688 PHPBB3-10843
| | * | | | | [ticket/10834] Backport general development language changes to 3.0.Oleg Pudeyev2012-05-051-12/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10688 PHPBB3-10834
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-095-105/+70
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10858] Move generic row seeking to DBAL [ticket/10858] Tests for row seeking with fetchfield() [ticket/10858] Fix MSSQL Native's row seeking behavior Conflicts: tests/dbal/select_test.php
| * | | | | | Merge remote-tracking branch 'Noxwizard/ticket/10858' into develop-olympusAndreas Fischer2012-05-095-104/+69
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10858: [ticket/10858] Move generic row seeking to DBAL [ticket/10858] Tests for row seeking with fetchfield() [ticket/10858] Fix MSSQL Native's row seeking behavior
| | * | | | | | [ticket/10858] Move generic row seeking to DBALPatrick Webster2012-05-084-129/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed from: firebird, mssql_odbc, and mssqlnative PHPBB3-10858
| | * | | | | | [ticket/10858] Tests for row seeking with fetchfield()Patrick Webster2012-05-081-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10858
| | * | | | | | [ticket/10858] Fix MSSQL Native's row seeking behaviorPatrick Webster2012-05-081-3/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The result_mssqlnative class remains in case someone wants to use it PHPBB3-10858
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-061-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10860] Fixing js error in updater
| * | | | | | Merge remote-tracking branch 'cyberalien/ticket/10860' into develop-olympusAndreas Fischer2012-05-061-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * cyberalien/ticket/10860: [ticket/10860] Fixing js error in updater
| | * | | | | | [ticket/10860] Fixing js error in updaterVjacheslav Trushkin2012-05-061-2/+2
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing javascript error in side-by-side diff styling in updater: resizing inner block instead of outer block and increasing height by inner/outer block difference. PHPBB3-10860
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-061-13/+9
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10819] Remove support for older browsers [ticket/10819] Forgot this causes vertical scrollbars on IE [ticket/10819] Improve side-by-side diff styling
| * | | | | | Merge remote-tracking branch 'Noxwizard/ticket/10819' into develop-olympusAndreas Fischer2012-05-061-13/+9
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10819: [ticket/10819] Remove support for older browsers [ticket/10819] Forgot this causes vertical scrollbars on IE [ticket/10819] Improve side-by-side diff styling
| | * | | | | | [ticket/10819] Remove support for older browsersPatrick Webster2012-04-171-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10819
| | * | | | | | [ticket/10819] Forgot this causes vertical scrollbars on IEPatrick Webster2012-04-151-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10819
| | * | | | | | [ticket/10819] Improve side-by-side diff stylingPatrick Webster2012-04-151-13/+14
| | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used transparent background for unchanged lines Shortened the table headers and make the background grey Added a border between the columns Increased the font size on pre blocks Added Consolas as the first pre font, for Windows users Added wordwrapping for pre blocks PHPBB3-10819
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-051-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10849] Added missing helptext for listitem
| * | | | | | Merge remote-tracking branch 'galaxyAbstractor/ticket/10849' into ↵Andreas Fischer2012-05-051-0/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * galaxyAbstractor/ticket/10849: [ticket/10849] Added missing helptext for listitem
| | * | | | | [ticket/10849] Added missing helptext for listitemgalaxyAbstractor2012-04-271-0/+1
| | | |_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Added the missing helptext for list item in subsilver2. PHPBB3-10849
* | | | | | Merge remote-tracking branch 'brunoais/ticket/10871' into developAndreas Fischer2012-05-041-2/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * brunoais/ticket/10871: [ticket/10871] Delete the unwanted implode
| * | | | | | [ticket/10871] Delete the unwanted implodeBruno Ais2012-05-041-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deleted the implode that had no reason to be there PHPBB3-10871
* | | | | | | Merge pull request #791 from erikfrerejean/task/10869Nils Adermann2012-05-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [task/10869] Remove PHP 5.2 check from .travis.yml
| * | | | | | | [task/10869] Remove PHP 5.2 check from .travis.ymlErik Frèrejean2012-05-041-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The travis configuration file contains a statement that checks whether the test is ran against PHP 5.2 but as that version isn't tested at all the check can be removed. PHPBB3-10869
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10818' into developAndreas Fischer2012-05-031-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10818: [ticket/10818] Global Announcements Update Dialog should call exit_handler()
| * | | | | | | [ticket/10818] Global Announcements Update Dialog should call exit_handler()Joas Schilling2012-05-021-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10818
* | | | | | | Merge remote-tracking branch 'mvinny/ticket/10778' into developAndreas Fischer2012-05-011-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * mvinny/ticket/10778: [ticket/10778] Remove extra space from close link in prosilver smilies window
| * | | | | | | [ticket/10778] Remove extra space from close link in prosilver smilies windowVinny2012-05-011-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10778
* | | | | | | Merge remote-tracking branch 'Senky/ticket/10847' into developAndreas Fischer2012-05-016-6/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/10847: [ticket/10847] fixing all misspelled "dependant" to "dependent"
| * | | | | | | [ticket/10847] fixing all misspelled "dependant" to "dependent"Senky2012-04-306-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10847
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-011-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | / / / / / | | |/ / / / / | |/| | | | | * develop-olympus: [ticket/10846] fixing SQL query bug in acp_main.php
| * | | | | | Merge remote-tracking branch 'Senky/ticket/10846' into develop-olympusAndreas Fischer2012-05-011-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * Senky/ticket/10846: [ticket/10846] fixing SQL query bug in acp_main.php
| | * | | | | [ticket/10846] fixing SQL query bug in acp_main.phpSenky2012-04-301-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-10846
* | | | | | Merge PR #753 branch 'Senky/ticket/10161' into developOleg Pudeyev2012-04-2630-144/+144
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Senky/ticket/10161: [ticket/10161] added fullstop to the end of sentence [ticket/10161] coding-guidelines.html updated [ticket/10161] all "e-mail" strings in language files changed to "email"
| * | | | | | [ticket/10161] added fullstop to the end of sentenceSenky2012-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10161
| * | | | | | [ticket/10161] coding-guidelines.html updatedSenky2012-04-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10161
| * | | | | | [ticket/10161] all "e-mail" strings in language files changed to "email"Senky2012-04-1529-143/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | according to Oleg's comment: email is preferred by RFCs and probably the way of the future PHPBB3-10161
* | | | | | | Merge PR #771 branch 'develop-olympus' into developOleg Pudeyev2012-04-262-2/+18
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10836] Check if avatar directory is writable after install [ticket/10836] Enable avatars by default at install
| * | | | | | Merge PR #771 branch 'galaxyAbstractor/ticket/10836' into develop-olympusOleg Pudeyev2012-04-262-2/+18
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * galaxyAbstractor/ticket/10836: [ticket/10836] Check if avatar directory is writable after install [ticket/10836] Enable avatars by default at install
| | * | | | | | [ticket/10836] Check if avatar directory is writable after installgalaxyAbstractor2012-04-251-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if the avatar directory is writeable after the installation is complete. If it isn't, disable avatars and avatar uploading by default. PHPBB3-10836
| | * | | | | | [ticket/10836] Enable avatars by default at installgalaxyAbstractor2012-04-211-2/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enables avatars and local avatar upload by default. PHPBB3-10836
* | | | | | | Merge PR #731 branch 'VSEphpbb/ticket/10779' into developOleg Pudeyev2012-04-251-2/+2
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | * VSEphpbb/ticket/10779: [ticket/10779] Move jQuery CDN option to Load Settings