14810 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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 303fc646ad, reversing changes made to 9c28470ad7. 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	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
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
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
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
Joas Schilling	ff7465e75f	[ticket/10411] New class interface and unit tests for legend and teampage ... PHPBB3-10411	2012-11-13 11:22:30 +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
David King	5a5e507a14	Merge remote-tracking branch 'naderman/ticket/11194' into develop ... # By Nils Adermann # Via Nils Adermann * naderman/ticket/11194: [ticket/11194] Service tag data is stored in an array so access it correctly	2012-11-11 19:25:05 -05:00
Nils Adermann	09ec65cb9b	[ticket/11194] Service tag data is stored in an array so access it correctly ... PHPBB3-11194	2012-11-12 01:01:02 +01:00
Igor Wiedler	05380c8d0e	Merge pull request #1076 from naderman/ticket/11193 ... [ticket/11193] Instantiate a single collection_pass for all collections	2012-11-11 10:05:06 -08:00
Nils Adermann	d2a051cdd4	[ticket/11193] Instantiate a single collection_pass for all collections ... PHPBB3-11193	2012-11-11 18:39:24 +01:00
Nils Adermann	69845585a2	Merge pull request #1056 from igorw/feature/compiled-dic ... [feature/compiled-dic] Compile the DI Container into a cached class	2012-11-11 09:05:15 -08:00
Igor Wiedler	1bf7f0bde7	[ticket/11152] Basic tests for the container functions ... PHPBB3-11152	2012-11-11 17:56:09 +01:00
Igor Wiedler	00417fc723	[ticket/11152] Compile the install container ... PHPBB3-11152	2012-11-11 17:54:54 +01:00
Igor Wiedler	5616972195	[ticket/11152] Throw error if services.yml is missing ... PHPBB3-11152	2012-11-11 17:53:24 +01:00
Igor Wiedler	844770d223	[ticket/11152] Remove old container processor calls ... PHPBB3-11152	2012-11-11 17:43:12 +01:00
Igor Wiedler	09781a96bc	[ticket/11152] Use realpath in container extensions consistently ... PHPBB-11152	2012-11-11 16:34:41 +01:00
Andreas Fischer	c699b88bc5	[ticket/11192] Add Tebibyte to get_formatted_filesize(). ... PHPBB3-11192	2012-11-11 14:35:31 +01:00
Igor Wiedler	3e4d3761fd	[ticket/11152] Rename collection to collection_pass ... PHPBB3-11152	2012-11-11 14:18:11 +01:00
Andreas Fischer	504158ceab	Merge remote-tracking branch 'nickvergessen/ticket/11077' into develop ... * nickvergessen/ticket/11077: [ticket/11077] Remove code from old global announcements system	2012-11-11 13:59:11 +01:00
Joas Schilling	f2cb4e1911	[ticket/11077] Remove code from old global announcements system ... PHPBB3-11077	2012-11-11 13:04:14 +01:00
Fyorl	db0cc74af0	[ticket/11190-develop] Functional tests purge cache before running. ... PHPBB3-11190	2012-11-11 10:53:44 +00:00
Fyorl	e3b0e1a8a2	[ticket/11190] Functional tests purge cache before running. ... Added functions to get and purge cache to functional framework also. PHPBB3-11190	2012-11-11 10:44:47 +00:00
Vjacheslav Trushkin	f72eaa0d95	[ticket/11175] Add microdata to prosilver ... Add breadcrumb microdata to prosilver PHPBB3-11175	2012-11-11 11:15:48 +01:00
Vjacheslav Trushkin	9b2024a48e	[ticket/11175] Add microdata to subsilver2 ... Add breadcrumb data to subsilver2 PHPBB3-11175	2012-11-11 11:11:47 +01:00
Andreas Fischer	e86ecc0f3b	Merge remote-tracking branch 'Fyorl/ticket/10939' into develop ... * Fyorl/ticket/10939: [ticket/10939] Added documentation for phpbb_request::file [ticket/10939] Added tests for phpbb_request::file [ticket/10939] Modified the default return for $request->file [ticket/10939] Modified fileupload tests to deal with new behaviour [ticket/10939] Modified mock request class to handle deactivated $_FILES [ticket/10939] Modified acp_groups.php to not use $_FILES [ticket/10939] Modified ucp_groups.php to not use $_FILES [ticket/10939] Modified functions_user.php to not use $_FILES [ticket/10939] Modified message_parser.php to not use $_FILES [ticket/10939] Modified functions_upload to not use $_FILES [ticket/10939] Modified request test slightly to include $_FILES [ticket/10939] Added $_FILES handling to phpbb_request	2012-11-10 23:49:29 +01:00
Andreas Fischer	847feb07e7	Merge remote-tracking branch 'EXreaction/ticket/11189' into develop ... * EXreaction/ticket/11189: [ticket/11189] Replace DEBUG_EXTRA with DEBUG [ticket/11189] Always log critical errors when in cron or in image output	2012-11-10 23:39:00 +01:00
Igor Wiedler	bdbf7d5de6	[ticket/11152] Remove @api docblocks ... PHPBB3-11152	2012-11-10 23:36:13 +01:00
Igor Wiedler	8851b797fb	[ticket/11152] Create separate function for debug-dependent container ... PHPBB3-11152	2012-11-10 23:35:52 +01:00