Andreas Fischer
1d0607cbb3
Merge branch 'develop-olympus' into develop
...
* 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
2012-05-09 13:30:09 +02:00
Andreas Fischer
0488d70062
Merge remote-tracking branch 'p/ticket/10834' into develop-olympus
...
* p/ticket/10834:
[ticket/10843] Backport changes to install language.
[ticket/10834] Backport general development language changes to 3.0.
2012-05-09 13:25:07 +02:00
Andreas Fischer
1a9b30b871
Merge branch 'develop-olympus' into develop
...
* 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
2012-05-09 12:55:58 +02:00
Andreas Fischer
12dbcc7f1e
Merge remote-tracking branch 'Noxwizard/ticket/10858' into develop-olympus
...
* 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
2012-05-09 12:50:13 +02:00
Patrick Webster
09d49fb7b2
[ticket/10858] Move generic row seeking to DBAL
...
Removed from: firebird, mssql_odbc, and mssqlnative
PHPBB3-10858
2012-05-08 19:41:22 -05:00
Patrick Webster
afbaa6979b
[ticket/10858] Tests for row seeking with fetchfield()
...
PHPBB3-10858
2012-05-08 18:45:51 -05:00
Patrick Webster
e52d23848a
[ticket/10858] Fix MSSQL Native's row seeking behavior
...
The result_mssqlnative class remains in case someone wants to use it
PHPBB3-10858
2012-05-08 18:44:43 -05:00
Patrick Webster
1496a4198a
[ticket/10678] Add port handling for MSSQL tests
...
PHPBB3-10678
2012-05-08 04:35:47 -05:00
Patrick Webster
711d09633a
[ticket/10678] Move config changes to new location
...
PHPBB3-10678
2012-05-08 04:34:19 -05:00
Patrick Webster
3cdcd44c4b
[ticket/10678] Rename helper class file
...
PHPBB3-10678
2012-05-08 04:31:32 -05:00
Patrick Webster
ceacb63abf
[ticket/10678] Lowercase class name, adjust comment width
...
PHPBB3-10678
2012-05-08 04:31:32 -05:00
Patrick Webster
9bb2785da0
[ticket/10678] More formatting and docblocks
...
PHPBB3-10678
2012-05-08 04:31:31 -05:00
Patrick Webster
0a596c4b8c
[ticket/10678] More formatting requests
...
PHPBB3-10678
2012-05-08 04:31:30 -05:00
Patrick Webster
5cbe919256
[ticket/10678] Fix formatting
...
PHPBB3-10678
2012-05-08 04:31:29 -05:00
Patrick Webster
d578eff712
[ticket/10678] Add better support for Firebird, Oracle, and MSSQL
...
Allow ODBC connections for Firebird
Capitalize fixture tables and columns for Firebird
On database drop failure, drop all tables
Provide cleanup utilities for databases that cannot be dropped
PHPBB3-10678
2012-05-08 04:31:29 -05:00
David King
5b96b5fce7
[ticket/10837] Removed tearDownAfterClass() from extension_controller_test.php
...
PHPBB3-10837
2012-05-07 10:39:49 -04:00
Senky
8d15f1b02e
[ticket/10835] changing CURRENT_CHANGE_PASSWORD_EXPLAIN language entry
...
PHPBB3-10835
2012-05-07 08:18:50 +02:00
Andreas Fischer
30579ecb09
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10860] Fixing js error in updater
2012-05-06 18:39:32 +02:00
Andreas Fischer
c0718fae96
Merge remote-tracking branch 'cyberalien/ticket/10860' into develop-olympus
...
* cyberalien/ticket/10860:
[ticket/10860] Fixing js error in updater
2012-05-06 18:39:23 +02:00
Vjacheslav Trushkin
a960bd6790
[ticket/10860] Fixing js error in updater
...
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
2012-05-06 19:37:49 +03:00
Andreas Fischer
1264e39aa9
Merge branch 'develop-olympus' into develop
...
* 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
2012-05-06 00:43:12 +02:00
Andreas Fischer
9d542aec1e
Merge remote-tracking branch 'Noxwizard/ticket/10819' into develop-olympus
...
* 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
2012-05-06 00:43:01 +02:00
Andreas Fischer
9d827f491f
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10849] Added missing helptext for listitem
2012-05-05 22:50:08 +02:00
Andreas Fischer
5ccbe06911
Merge remote-tracking branch 'galaxyAbstractor/ticket/10849' into develop-olympus
...
* galaxyAbstractor/ticket/10849:
[ticket/10849] Added missing helptext for listitem
2012-05-05 22:47:58 +02:00
Oleg Pudeyev
c34ee343ba
[ticket/10843] Backport changes to install language.
...
PHPBB3-10688
PHPBB3-10843
2012-05-05 16:08:37 -04:00
Oleg Pudeyev
58842b5ca8
[ticket/10834] Backport general development language changes to 3.0.
...
PHPBB3-10688
PHPBB3-10834
2012-05-05 16:05:55 -04:00
Andreas Fischer
cb02dfda96
Merge remote-tracking branch 'brunoais/ticket/10871' into develop
...
* brunoais/ticket/10871:
[ticket/10871] Delete the unwanted implode
2012-05-04 21:28:16 +02:00
Bruno Ais
fce0c5d436
[ticket/10871] Delete the unwanted implode
...
Deleted the implode that had no reason to be there
PHPBB3-10871
2012-05-04 20:08:42 +01:00
Nils Adermann
859c3ca7d5
Merge pull request #791 from erikfrerejean/task/10869
...
[task/10869] Remove PHP 5.2 check from .travis.yml
2012-05-03 16:22:04 -07:00
Erik Frèrejean
0e906f2575
[task/10869] Remove PHP 5.2 check from .travis.yml
...
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
2012-05-04 00:13:27 +02:00
Callum Macrae
06efa6c0be
[ticket/10855] Added JS camelCaps info to guidelines.
...
PHPBB3-10855
2012-05-03 22:34:35 +01:00
Callum Macrae
ee2e2cb2c3
[ticket/10855] Added array trailing commas info in js to guidelines.
...
PHPBB3-10855
2012-05-03 22:30:22 +01:00
Andreas Fischer
7426c7a97f
Merge remote-tracking branch 'nickvergessen/ticket/10818' into develop
...
* nickvergessen/ticket/10818:
[ticket/10818] Global Announcements Update Dialog should call exit_handler()
2012-05-03 01:22:31 +02:00
Joas Schilling
ed67dcf3d8
[ticket/10818] Global Announcements Update Dialog should call exit_handler()
...
PHPBB3-10818
2012-05-02 21:12:18 +02:00
Andreas Fischer
beda22c0b1
Merge remote-tracking branch 'mvinny/ticket/10778' into develop
...
* mvinny/ticket/10778:
[ticket/10778] Remove extra space from close link in prosilver smilies window
2012-05-01 19:57:11 +02:00
Vinny
7294c71431
[ticket/10778] Remove extra space from close link in prosilver smilies window
...
PHPBB3-10778
2012-05-01 14:41:02 -03:00
Vjacheslav Trushkin
63b41913a4
[ticket/10799] Removing global variable from includejs
...
Removing global $phpbb_root_path from includejs implementation
PHPBB3-10799
2012-05-01 18:25:11 +03:00
Vjacheslav Trushkin
5114edcafe
[ticket/10800] Changing html to js for includejs tests
...
Changing .html to .js files for includejs tests
PHPBB3-10800
2012-05-01 17:41:46 +03:00
Andreas Fischer
81af5c95ed
Merge remote-tracking branch 'Senky/ticket/10847' into develop
...
* Senky/ticket/10847:
[ticket/10847] fixing all misspelled "dependant" to "dependent"
2012-05-01 13:47:31 +02:00
Andreas Fischer
52c7193ad0
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10846] fixing SQL query bug in acp_main.php
2012-05-01 13:38:25 +02:00
Andreas Fischer
8cb0e30afc
Merge remote-tracking branch 'Senky/ticket/10846' into develop-olympus
...
* Senky/ticket/10846:
[ticket/10846] fixing SQL query bug in acp_main.php
2012-05-01 13:38:11 +02:00
Senky
2dd71f6520
[ticket/10835] fixing misleading message in UCP
...
PHPBB3-10835
2012-05-01 09:52:48 +02:00
Senky
665f38d42f
[ticket/10846] fixing SQL query bug in acp_main.php
...
PHPBB3-10846
2012-04-30 22:01:53 +02:00
Senky
b83fa0349a
[ticket/10847] fixing all misspelled "dependant" to "dependent"
...
PHPBB3-10847
2012-04-30 21:55:24 +02:00
Callum Macrae
3978e2620e
[ticket/10855] Modified coding guidelines to reflect JS brace changes.
...
Braces always go on the same line in JavaScript.
PHPBB3-10855
2012-04-29 19:07:48 +01:00
Joas Schilling
53a47fdcc3
[ticket/10811] Make subscribe/unsubscribe repeatable with AJAX
...
PHPBB3-10811
2012-04-29 12:33:55 +02:00
Vjacheslav Trushkin
51347ebc09
[ticket/10800] Changing template paths in tests
...
Changing template paths in tests from absolute to relative
PHPBB3-10800
2012-04-29 00:30:08 +03:00
galaxyAbstractor
8d45901657
[ticket/10849] Added missing helptext for listitem
...
Added the missing helptext for list item in subsilver2.
PHPBB3-10849
2012-04-27 22:19:41 +02:00
Oleg Pudeyev
2a92fee06d
Merge PR #753 branch 'Senky/ticket/10161' into develop
...
* 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"
2012-04-26 22:57:30 -04:00
Oleg Pudeyev
cd6f6d2813
Merge PR #771 branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10836] Check if avatar directory is writable after install
[ticket/10836] Enable avatars by default at install
2012-04-26 22:25:26 -04:00
