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
Joas Schilling
4db6ded8f0
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2
...
* 'develop' of https://github.com/phpbb/phpbb3 :
[ticket/11198] Remove additional asterix as /** is doc-block only
[ticket/11200] Add a reminder comment.
[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/11194] Service tag data is stored in an array so access it correctly
[ticket/11193] Instantiate a single collection_pass for all collections
[ticket/11190-develop] Functional tests purge cache before running.
[ticket/11190] Functional tests purge cache before running.
2012-11-15 18:21:38 +01:00
Marc Alexander
60b4c907b2
[feature/avatars] Add service containers for avatars
...
PHPBB3-10018
2012-11-15 18:10:54 +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 303fc646ad9c28470ad7
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
Marc Alexander
076785d76a
[feature/avatars] Add support for custom avatar HTML code
...
PHPBB3-10018
2012-11-14 20:04:02 +01:00
Joas Schilling
60d831c392
[ticket/10411] Fix logic error when editing/creating a group
...
PHPBB3-10411
2012-11-14 19:06:42 +01:00
Joas Schilling
59bb498de7
[ticket/10411] Fix docs and remove empty sql array parts
...
PHPBB3-10411
2012-11-14 19:03:24 +01:00
Joas Schilling
e417882af1
[ticket/10411] Use the objects instead of the deprecated wrappers
...
PHPBB3-10411
2012-11-14 19:01:52 +01:00
Nathan Guse
d2187424da
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
...
Conflicts:
phpBB/common.php
phpBB/config/services.yml
2012-11-14 11:33:24 -06: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
Joas Schilling
a9ed479e14
[ticket/10411] Use AJAX to move items up/down and delete them
...
PHPBB3-10411
2012-11-14 15:55:51 +01:00
Joas Schilling
79eea0ccac
[ticket/10411] Use DIC to get the groupposition classes
...
PHPBB3-10411
2012-11-14 15:31:16 +01:00
Igor Wiedler
831d5ad505
[ticket/10875] Add docblocks for phpbb_cache_driver_interface
...
PHPBB3-10875
2012-11-14 14:10:35 +01:00
Joas Schilling
eac1c46588
[ticket/10411] Fix missing functions in unit tests
...
PHPBB3-10411
2012-11-14 02:01:17 +01:00
Joas Schilling
8fc022033a
[ticket/10411] Update schema and fix database update
...
PHPBB3-10411
2012-11-14 02:01:16 +01:00
Joas Schilling
6e286218ec
[ticket/10411] Fix create_group and delete_group functions
...
PHPBB3-10411
2012-11-14 02:01:15 +01:00
Joas Schilling
6a27a95f30
[ticket/10411] Use new teampage and legend class in ACP and memberlist
...
PHPBB3-10411
2012-11-14 02:01:15 +01:00
Joas Schilling
53cb148d70
[ticket/10411] Fix comment in interface and some problems in teampage
...
Category names on the teampage can not be empty.
Also fixing a problem with the delta when moving a category.
PHPBB3-10411
2012-11-14 02:01:14 +01:00
Marc Alexander
b91702665a
[feature/avatars] Add barebone gravatar driver
...
PHPBB3-10018
2012-11-13 23:22:56 +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
Marc Alexander
075e7755c3
[feature/avatars] fix 'user_avatar_type' in database updater
...
PHPBB3-10018
2012-11-13 20:04:33 +01:00
Joas Schilling
8ee908d32e
[ticket/10411] Remove duplicated ids from the template
...
PHPBB3-10411
2012-11-13 12:14:39 +01:00
Joas Schilling
153b99e11c
[ticket/10411] Add new classes for legend and teampage handling
...
PHPBB3-10411
2012-11-13 11:33:22 +01:00
Joas Schilling
df735f4603
[ticket/10411] Add new table for teampage
...
PHPBB3-10411
2012-11-13 11:29:25 +01:00
