1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

14576 Commits

Author SHA1 Message Date
Igor Wiedler
0372ecf141 [ticket/11015] Make phpbb_convert_30_dbms_to_31 more future proof
It should allow any class name in the future, as long as that class
exists. And it should give a useful error message otherwise.

PHPBB3-11015
2012-11-17 01:40:35 +01:00
Igor Wiedler
5bc0f4b3d4 [ticket/11015] Move db driver class name fixing to function
PHPBB3-11015
2012-11-17 00:24:32 +01:00
Igor Wiedler
8f8a7f7637 [ticket/11015] Allow full dbms class name in tests/test_config.php
PHPBB3-11015
2012-11-16 01:50:30 +01:00
Igor Wiedler
fc5385c2a5 [ticket/11015] Allow full dbms class name in config.php
PHPBB3-11015
2012-11-16 01:48:03 +01:00
Igor Wiedler
0d4a289778 [ticket/11015] Remove strange method_exists call
PHPBB3-11015
2012-11-16 01:26:36 +01:00
Igor Wiedler
423c79e106 Merge remote-tracking branch 'upstream/develop' into ticket/11015
* upstream/develop: (22 commits)
  [ticket/11206] Remove includes to non-existent files from download/file.php
  [ticket/11205] Fix merge conflict in readme.html.
  [ticket/11202] Check response success before content assertions.
  [ticket/11204] Reindent.
  [ticket/11198] Remove additional asterix as /** is doc-block only
  [ticket/11200] Add a reminder comment.
  [ticket/11202] Custom message does not make sense here, delete it.
  [ticket/11202] Check response success before content assertions.
  [ticket/11202] Add a heuristic function to check for response success.
  [ticket/11200] Make cache available during container construction
  [ticket/11199] Match cache purge container files against container_*
  [ticket/11199] Purge dumped container correctly on cache purge.
  [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
  [ticket/11199] Cache purge does not remove dumped container
  [ticket/11198] Store the swapping partners in vars and simplify the logic
  [ticket/11198] Correctly set links after an item is moved up/down with AJAX
  [ticket/11197] Prefix the css classes for the small arrow with "arrow"
  [ticket/10879] Remove arrow icon from attachment link in editor
  [ticket/11195] Condense logic, remove improperly formatted if()
  [ticket/11190-develop] Functional tests purge cache before running.
  ...

Conflicts:
	tests/test_framework/phpbb_database_test_connection_manager.php
2012-11-16 01:23:24 +01:00
Igor Wiedler
a23eebdb7b [tracker/11015] Prepend phpbb_db_driver_ for PHPBB_TEST_DBMS
PHPBB3-11015
2012-11-16 01:19:57 +01:00
Oleg Pudeyev
f553635491 Merge PR #1094 branch 'igorw/ticket/11206' into develop
* igorw/ticket/11206:
  [ticket/11206] Remove includes to non-existent files from download/file.php
2012-11-15 18:49:45 -05:00
Igor Wiedler
d061a5abf8 [ticket/11206] Remove includes to non-existent files from download/file.php
This makes avatars work again.

PHPBB3-11206
2012-11-16 00:34:08 +01:00
Igor Wiedler
c27e8f0dd3 Merge remote-tracking branch 'p/ticket/11205' into develop
* p/ticket/11205:
  [ticket/11205] Fix merge conflict in readme.html.
2012-11-15 23:54:59 +01:00
Igor Wiedler
bf1325b1b4 [ticket/11015] Re-introduce accidentally removed require in install_convert
PHPBB3-11015
2012-11-15 23:48:49 +01:00
Oleg Pudeyev
5d0796624f [ticket/11205] Fix merge conflict in readme.html.
PHPBB3-11205
2012-11-15 17:45:00 -05:00
Oleg Pudeyev
109a86520f Merge PR #1060 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11186] Database unit tests fail on windows using sqlite2
2012-11-15 16:31:03 -05:00
Oleg Pudeyev
17a7c4821a Merge PR #1060 branch 'nickvergessen/ticket/11186' into develop-olympus
* nickvergessen/ticket/11186:
  [ticket/11186] Database unit tests fail on windows using sqlite2
2012-11-15 16:00:39 -05:00
Andreas Fischer
3408662e16 Merge remote-tracking branch 'p/ticket/11202' into develop
* p/ticket/11202:
  [ticket/11202] Check response success before content assertions.
2012-11-15 21:43:33 +01:00
Igor Wiedler
51b07364c4 Merge remote-tracking branch 'p/ticket/11204' into develop
* p/ticket/11204:
  [ticket/11204] Reindent.
2012-11-15 20:56:57 +01:00
Oleg Pudeyev
8917b31e31 [ticket/11202] Check response success before content assertions.
This does not change tests that perform requests which are either
clearly not supposed to succeed or are a gray area.

PHPBB3-11202
2012-11-15 14:54:13 -05:00
Oleg Pudeyev
ec06d5c5d9 [ticket/11204] Reindent.
PHPBB3-11204
2012-11-15 14:52:53 -05:00
Andreas Fischer
b9e1caa81a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11202] Custom message does not make sense here, delete it.
  [ticket/11202] Check response success before content assertions.
  [ticket/11202] Add a heuristic function to check for response success.

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2012-11-15 20:24:37 +01:00
Andreas Fischer
14a42a97a8 Merge remote-tracking branch 'p/ticket/11202-olympus' into develop-olympus
* p/ticket/11202-olympus:
  [ticket/11202] Custom message does not make sense here, delete it.
  [ticket/11202] Check response success before content assertions.
  [ticket/11202] Add a heuristic function to check for response success.
2012-11-15 19:48:46 +01:00
Oleg Pudeyev
ceae276cd6 Merge PR #1085 branch 'nickvergessen/ticket/11198' into develop
* nickvergessen/ticket/11198:
  [ticket/11198] Remove additional asterix as /** is doc-block only
  [ticket/11198] Store the swapping partners in vars and simplify the logic
  [ticket/11198] Correctly set links after an item is moved up/down with AJAX
2012-11-15 11:20:27 -05:00
Joas Schilling
132163d4ec [ticket/11198] Remove additional asterix as /** is doc-block only
PHPBB3-11198
2012-11-15 16:26:36 +01:00
Oleg Pudeyev
7402520d2f Merge PR #1070 branch 'Fyorl/ticket/11190-develop' into develop
* Fyorl/ticket/11190-develop:
  [ticket/11190-develop] Functional tests purge cache before running.
2012-11-15 09:47:51 -05:00
Oleg Pudeyev
dd2c89fb8d Merge PR #1069 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11190] Functional tests purge cache before running.

develop fix needs no code from develop-olympus.
2012-11-15 09:42:47 -05:00
Oleg Pudeyev
27594130b0 Merge PR #1069 branch 'Fyorl/ticket/11190' into develop-olympus
* Fyorl/ticket/11190:
  [ticket/11190] Functional tests purge cache before running.
2012-11-15 09:42:21 -05:00
Oleg Pudeyev
c30b38ba10 Merge PR #1088 branch 'igorw/ticket/11199' into develop
* igorw/ticket/11199:
  [ticket/11199] Match cache purge container files against container_*
  [ticket/11199] Purge dumped container correctly on cache purge.
2012-11-15 09:07:41 -05:00
Oleg Pudeyev
f16f33c5ed Merge PR #1089 branch 'igorw/ticket/11200' into develop
* igorw/ticket/11200:
  [ticket/11200] Add a reminder comment.
  [ticket/11200] Make cache available during container construction
2012-11-15 09:01:19 -05:00
Oleg Pudeyev
f2cffd6a6c [ticket/11200] Add a reminder comment.
PHPBB3-11200
2012-11-15 08:50:04 -05:00
Oleg Pudeyev
af7ab2d3ac [ticket/11202] Custom message does not make sense here, delete it.
PHPBB3-11202
2012-11-15 08:40:29 -05:00
Oleg Pudeyev
dc61fd1091 [ticket/11202] Check response success before content assertions.
This does not change tests that perform requests which are either
clearly not supposed to succeed or are a gray area.

PHPBB3-11202
2012-11-15 08:25:14 -05:00
Oleg Pudeyev
4ab178f3ef [ticket/11202] Add a heuristic function to check for response success.
This tries to account for php sending fatal errors with 200 status code.

PHPBB3-11202
2012-11-15 08:24:27 -05:00
Igor Wiedler
31843ecd8c [ticket/11200] Make cache available during container construction
Fixes fatal errors in the dbal.

PHPBB3-11200
2012-11-15 05:00:24 +01:00
Igor Wiedler
9cc7680965 [ticket/11015] Fix some more whitespace in the driver
PHPBB3-11015
2012-11-15 03:24:08 +01:00
Igor Wiedler
f8841b7f52 [ticket/11015] Fix line endings of phpbb_db_driver to LF
PHPBB3-11015
2012-11-15 03:09:57 +01:00
Igor Wiedler
a0cc2878a3 [ticket/11199] Match cache purge container files against container_*
Previously it was matching against only container*, checking for the
underscore is consistent with the other checks.

PHPBB3-11199
2012-11-15 02:30:43 +01:00
Igor Wiedler
73ce1a5a97 [ticket/11199] Purge dumped container correctly on cache purge.
This patch changes the dumped container suffix to a prefix instead which
makes the existing code for purging 'cache/container_*' files work
as intended.

PHPBB3-11199
2012-11-15 01:56:33 +01:00
Igor Wiedler
56b7ba2085 Merge remote-tracking branch 'p/ticket/11199' into develop
* p/ticket/11199:
  [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
2012-11-15 01:13:30 +01:00
Oleg Pudeyev
30e9d2d600 [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
This reverts commit 303fc646adf9104d7c82cf8bcebbc8fc0d328624, reversing
changes made to 9c28470ad7b45c10ce3a32065650e4b17f9f27ea.

The correct fix should be to alter the container file name to start with
container_ prefix.

PHPBB3-11199
2012-11-14 19:07:28 -05:00
David King
303fc646ad Merge remote-tracking branch 'marc1706/ticket/11199' into develop
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/11199:
  [ticket/11199] Cache purge does not remove dumped container
2012-11-14 18:54:06 -05:00
Marc Alexander
d982d432eb [ticket/11199] Cache purge does not remove dumped container
PHPBB3-11199
2012-11-14 23:34:28 +01:00
Joas Schilling
e39947e57e [ticket/11198] Store the swapping partners in vars and simplify the logic
PHPBB3-11198
2012-11-14 23:30:29 +01:00
Joas Schilling
857298e748 [ticket/11198] Correctly set links after an item is moved up/down with AJAX
PHPBB3-11198
2012-11-14 16:31:46 +01:00
Andreas Fischer
9c28470ad7 Merge remote-tracking branch 'marc1706/ticket/11197' into develop
* marc1706/ticket/11197:
  [ticket/11197] Prefix the css classes for the small arrow with "arrow"
2012-11-13 21:35:33 +01:00
Marc Alexander
5f15c98c1d [ticket/11197] Prefix the css classes for the small arrow with "arrow"
It does not make sense to have classes named "right" and "left" produce a
small arrow next to text. It should be made clear that an arrow will
appear.

PHPBB3-11197
2012-11-13 20:57:34 +01:00
Andreas Fischer
607865d97a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10879] Remove arrow icon from attachment link in editor
2012-11-13 20:36:18 +01:00
Andreas Fischer
8b156c3d83 Merge remote-tracking branch 'marc1706/ticket/10879' into develop-olympus
* marc1706/ticket/10879:
  [ticket/10879] Remove arrow icon from attachment link in editor
2012-11-13 20:35:50 +01:00
Marc Alexander
170967c48a [ticket/10879] Remove arrow icon from attachment link in editor
If you upload a file with a long filename the filename will partially
cover the arrow icon background image. Remove the icon as it's not needed
anyways.

PHPBB3-10879
2012-11-13 20:26:49 +01:00
Igor Wiedler
904b2f5d7f Merge remote-tracking branch 'imkingdavid/ticket/11195' into develop
* imkingdavid/ticket/11195:
  [ticket/11195] Condense logic, remove improperly formatted if()
2012-11-12 22:26:36 +01:00
David King
d33aaac199 [ticket/11195] Condense logic, remove improperly formatted if()
PHPBB3-11195
2012-11-12 16:16:40 -05:00
Igor Wiedler
0fd3bb170b [ticket/11015] Fixup some things from the big merge
PHPBB3-11015
2012-11-12 11:16:39 +01:00