aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2Joas Schilling2012-11-1531-118/+144
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '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.
| * Merge PR #1085 branch 'nickvergessen/ticket/11198' into developOleg Pudeyev2012-11-152-35/+57
| |\ | | | | | | | | | | | | | | | | | | * 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
| | * [ticket/11198] Remove additional asterix as /** is doc-block onlyJoas Schilling2012-11-151-4/+4
| | | | | | | | | | | | PHPBB3-11198
| | * [ticket/11198] Store the swapping partners in vars and simplify the logicJoas Schilling2012-11-141-39/+47
| | | | | | | | | | | | PHPBB3-11198
| | * [ticket/11198] Correctly set links after an item is moved up/down with AJAXJoas Schilling2012-11-142-15/+29
| | | | | | | | | | | | PHPBB3-11198
| * | Merge PR #1070 branch 'Fyorl/ticket/11190-develop' into developOleg Pudeyev2012-11-151-0/+1
| |\ \ | | | | | | | | | | | | | | | | * Fyorl/ticket/11190-develop: [ticket/11190-develop] Functional tests purge cache before running.
| | * | [ticket/11190-develop] Functional tests purge cache before running.Fyorl2012-11-111-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11190
| * | | Merge PR #1069 branch 'develop-olympus' into developOleg Pudeyev2012-11-150-0/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11190] Functional tests purge cache before running. develop fix needs no code from develop-olympus.
| | * \ \ Merge PR #1069 branch 'Fyorl/ticket/11190' into develop-olympusOleg Pudeyev2012-11-151-0/+23
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/11190: [ticket/11190] Functional tests purge cache before running.
| | | * | | [ticket/11190] Functional tests purge cache before running.Fyorl2012-11-111-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added functions to get and purge cache to functional framework also. PHPBB3-11190
| * | | | | Merge PR #1088 branch 'igorw/ticket/11199' into developOleg Pudeyev2012-11-153-3/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/11199: [ticket/11199] Match cache purge container files against container_* [ticket/11199] Purge dumped container correctly on cache purge.
| | * | | | | [ticket/11199] Match cache purge container files against container_*Igor Wiedler2012-11-152-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was matching against only container*, checking for the underscore is consistent with the other checks. PHPBB3-11199
| | * | | | | [ticket/11199] Purge dumped container correctly on cache purge.Igor Wiedler2012-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | Merge PR #1089 branch 'igorw/ticket/11200' into developOleg Pudeyev2012-11-151-1/+6
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * igorw/ticket/11200: [ticket/11200] Add a reminder comment. [ticket/11200] Make cache available during container construction
| | * | | | | [ticket/11200] Add a reminder comment.Oleg Pudeyev2012-11-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11200
| | * | | | | [ticket/11200] Make cache available during container constructionIgor Wiedler2012-11-151-1/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes fatal errors in the dbal. PHPBB3-11200
| * | | | | Merge remote-tracking branch 'p/ticket/11199' into developIgor Wiedler2012-11-152-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11199: [ticket/11199] Revert merge of 'marc1706/ticket/11199' into develop
| | * | | | | [ticket/11199] Revert merge of 'marc1706/ticket/11199' into developOleg Pudeyev2012-11-142-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge remote-tracking branch 'marc1706/ticket/11199' into developDavid King2012-11-142-2/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * marc1706/ticket/11199: [ticket/11199] Cache purge does not remove dumped container
| | * | | | | [ticket/11199] Cache purge does not remove dumped containerMarc Alexander2012-11-142-2/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-11199
| * | | | | Merge remote-tracking branch 'marc1706/ticket/11197' into developAndreas Fischer2012-11-1319-57/+57
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11197: [ticket/11197] Prefix the css classes for the small arrow with "arrow"
| | * | | | | [ticket/11197] Prefix the css classes for the small arrow with "arrow"Marc Alexander2012-11-1319-57/+57
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-11-131-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10879] Remove arrow icon from attachment link in editor
| | * | | | Merge remote-tracking branch 'marc1706/ticket/10879' into develop-olympusAndreas Fischer2012-11-131-1/+1
| | |\ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | * marc1706/ticket/10879: [ticket/10879] Remove arrow icon from attachment link in editor
| | | * | | [ticket/10879] Remove arrow icon from attachment link in editorMarc Alexander2012-11-131-1/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Merge remote-tracking branch 'imkingdavid/ticket/11195' into developIgor Wiedler2012-11-121-5/+2
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * imkingdavid/ticket/11195: [ticket/11195] Condense logic, remove improperly formatted if()
| | * | | | [ticket/11195] Condense logic, remove improperly formatted if()David King2012-11-121-5/+2
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11195
| * | | | Merge remote-tracking branch 'naderman/ticket/11194' into developDavid King2012-11-111-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Nils Adermann # Via Nils Adermann * naderman/ticket/11194: [ticket/11194] Service tag data is stored in an array so access it correctly
| | * | | | [ticket/11194] Service tag data is stored in an array so access it correctlyNils Adermann2012-11-121-1/+1
| |/ / / / | | | | | | | | | | | | | | | PHPBB3-11194
| * | | | Merge pull request #1076 from naderman/ticket/11193Igor Wiedler2012-11-115-16/+17
| |\ \ \ \ | | |_|_|/ | |/| | | [ticket/11193] Instantiate a single collection_pass for all collections
| | * | | [ticket/11193] Instantiate a single collection_pass for all collectionsNils Adermann2012-11-115-16/+17
| |/ / / | | | | | | | | | | | | PHPBB3-11193
* | | | [ticket/10411] Fix logic error when editing/creating a groupJoas Schilling2012-11-141-3/+13
| | | | | | | | | | | | | | | | PHPBB3-10411
* | | | [ticket/10411] Fix docs and remove empty sql array partsJoas Schilling2012-11-142-6/+3
| | | | | | | | | | | | | | | | PHPBB3-10411
* | | | [ticket/10411] Use the objects instead of the deprecated wrappersJoas Schilling2012-11-141-8/+8
| | | | | | | | | | | | | | | | PHPBB3-10411
* | | | [ticket/10411] Use AJAX to move items up/down and delete themJoas Schilling2012-11-142-26/+40
| | | | | | | | | | | | | | | | PHPBB3-10411
* | | | [ticket/10411] Use DIC to get the groupposition classesJoas Schilling2012-11-148-53/+97
| | | | | | | | | | | | | | | | PHPBB3-10411
* | | | [ticket/10411] Fix missing functions in unit testsJoas Schilling2012-11-141-0/+2
| | | | | | | | | | | | | | | | PHPBB3-10411
* | | | [ticket/10411] Update schema and fix database updateJoas Schilling2012-11-149-27/+39
| | | | | | | | | | | | | | | | PHPBB3-10411
* | | | [ticket/10411] Fix create_group and delete_group functionsJoas Schilling2012-11-142-39/+34
| | | | | | | | | | | | | | | | PHPBB3-10411
* | | | [ticket/10411] Use new teampage and legend class in ACP and memberlistJoas Schilling2012-11-144-52/+180
| | | | | | | | | | | | | | | | PHPBB3-10411
* | | | [ticket/10411] Fix comment in interface and some problems in teampageJoas Schilling2012-11-142-15/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Category names on the teampage can not be empty. Also fixing a problem with the delta when moving a category. PHPBB3-10411
* | | | [ticket/10411] Remove duplicated ids from the templateJoas Schilling2012-11-131-7/+7
| | | | | | | | | | | | | | | | PHPBB3-10411
* | | | [ticket/10411] Add new classes for legend and teampage handlingJoas Schilling2012-11-132-60/+598
| | | | | | | | | | | | | | | | PHPBB3-10411
* | | | [ticket/10411] Add new table for teampageJoas Schilling2012-11-139-10/+142
| | | | | | | | | | | | | | | | PHPBB3-10411
* | | | [ticket/10411] New class interface and unit tests for legend and teampageJoas Schilling2012-11-136-291/+973
|/ / / | | | | | | | | | PHPBB3-10411
* | | Merge pull request #1056 from igorw/feature/compiled-dicNils Adermann2012-11-1127-451/+1464
|\ \ \ | | | | | | | | [feature/compiled-dic] Compile the DI Container into a cached class
| * | | [ticket/11152] Basic tests for the container functionsIgor Wiedler2012-11-112-0/+83
| | | | | | | | | | | | | | | | PHPBB3-11152
| * | | [ticket/11152] Compile the install containerIgor Wiedler2012-11-111-4/+7
| | | | | | | | | | | | | | | | PHPBB3-11152
| * | | [ticket/11152] Throw error if services.yml is missingIgor Wiedler2012-11-111-5/+2
| | | | | | | | | | | | | | | | PHPBB3-11152
| * | | [ticket/11152] Remove old container processor callsIgor Wiedler2012-11-112-14/+0
| | | | | | | | | | | | | | | | PHPBB3-11152