18208 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Nathan Guse	a7ea874c0d	Merge pull request #1640 from brunoais/ticket/11637 ... [ticket/11637] generate_text_for_display on search.php	2013-09-12 19:30:43 -07:00
Nathan Guse	94b3d38392	Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop ... * remotes/upstream/develop-olympus: [ticket/11829] Use report_closed to determine status in MCP report_details Conflicts: phpBB/styles/prosilver/template/mcp_post.html	2013-09-12 14:57:26 -05:00
Nathan Guse	4d14bdbf13	Merge pull request #1698 from rechosen/ticket/11829 ... [ticket/11829] Use report_closed to determine status in MCP report_details	2013-09-12 12:53:06 -07:00
Nathan Guse	e3dfe4f046	Merge pull request #1699 from rechosen/ticket/9550 ... [ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php	2013-09-12 12:50:15 -07:00
David King	f74a04c976	Merge pull request #1707 from EXreaction/ticket/11835 ... [ticket/11835] Fix ucp_auth_link adding in migration	2013-09-10 19:44:41 -07:00
Nathan Guse	7435c40b5c	[ticket/11835] Fix ucp_auth_link adding in migration ... PHPBB3-11835	2013-09-10 21:31:19 -05:00
David King	fc1dfd779d	Merge remote-tracking branch 'Hardolaf/feature/oauth' into develop	2013-09-10 15:48:29 -07:00
Joseph Warner	18f6a16101	Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth	2013-09-10 16:19:39 -04:00
Andreas Fischer	71aeec40f6	Merge branch 'develop-olympus' into develop ... * develop-olympus: [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.	2013-09-10 02:53:33 +02:00
Andreas Fischer	c1557cf78d	Merge branch 'prep-release-3.0.12' into develop-olympus ... * prep-release-3.0.12: [prep-release-3.0.12] Remove changelog entry for ticket that was not resolved.	2013-09-10 02:53:19 +02:00
Andreas Fischer	38afdd792f	[prep-release-3.0.12] Remove changelog entry for ticket that was not resolved. ... A wrong fix version was assigned to PHPBB3-11288.	2013-09-10 02:17:41 +02:00
Nathan Guse	2146d0c36b	Merge pull request #1703 from cyberalien/ticket/develop/11832 ... Fix path detection	2013-09-09 11:19:52 -07:00
Vjacheslav Trushkin	07632d46fc	[ticket/develop/11832] Fix path detection ... Clean up path, do not count first / PHPBB3-11832	2013-09-09 20:52:29 +03:00
Joseph Warner	3f81057f96	[feature/oauth] Fix tabindex ... PHPBB3-11673	2013-09-09 11:40:29 -04:00
Joseph Warner	3a6b3d7c2b	[feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth ... Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673	2013-09-06 20:35:54 -04:00
rechosen	3dfad1f01e	[ticket/9550] Add the core.viewtopic_post_rowset_data event to viewtopic.php ... To allow extra fields added to the query retrieving post data to be used for setting template variables, they need to be added to the post rowset. This commit adds the core.viewtopic_post_rowset_data event that enables extension developers to modify the post rowset when the database row is still available. PHPBB3-9550	2013-09-06 15:04:52 +02:00
Nathan Guse	dd86e8d0ae	Merge pull request #1618 from VSEphpbb/ticket/11747 ... [ticket/11747] UCP Prefs Core and Template Events	2013-09-05 11:36:25 -07:00
Nathan Guse	9d5ab7615f	Merge pull request #1435 from cyberalien/ticket/11562 ... forum_fn.js cleanup	2013-09-05 11:27:42 -07:00
Nathan Guse	f71b6c8ea5	Merge pull request #1695 from dhruvgoel92/ticket/11825 ... [ticket/11825] Move schema_data.php into includes/ instead of phpbb/	2013-09-05 11:17:31 -07:00
Nathan Guse	ab0af38629	Merge pull request #1651 from cyberalien/ticket/11782 ... Fix layout of notices in posts	2013-09-05 08:26:29 -07:00
Andreas Fischer	462355d654	Merge branch 'develop-olympus' into develop ... * develop-olympus: [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. Conflicts: build/build.xml phpBB/install/database_update.php	2013-09-05 00:40:59 +02:00
Andreas Fischer	fcb9476615	Merge branch 'prep-release-3.0.12' into develop-olympus ... * prep-release-3.0.12: [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release. [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. Conflicts: phpBB/includes/constants.php phpBB/install/database_update.php phpBB/install/schemas/schema_data.sql	2013-09-05 00:37:40 +02:00
rechosen	77845e366e	[ticket/11829] Use report_closed to determine status in MCP report_details ... Instead of using post_reported of the post or message_reported of the pm, use report_closed of the report itself to reliably determine whether this particular report is closed or not in the report_details view of the MCP. This fixes a bug where the report_details view would not show that the report shown was closed and display a "Close report" button that had no effect. PHPBB3-11829	2013-09-04 13:37:39 +02:00
Dhruv	19074a3420	[ticket/11825] Move schema_data.php into includes/ instead of phpbb/ ... PHPBB3-11825	2013-09-03 19:44:07 +05:30
David King	8d6b03c438	Merge remote-tracking branch 'EXreaction/ticket/11791' into develop	2013-09-02 16:45:12 -07:00
David King	cc2302b537	Merge remote-tracking branch 'EXreaction/ticket/11818' into develop	2013-09-02 16:36:28 -07:00
David King	6e028a5ecc	Merge remote-tracking branch 'EXreaction/ticket/11755' into develop	2013-09-02 16:12:30 -07:00
Nathan Guse	4fd99a7b2e	Merge pull request #1102 from imkingdavid/ticket/11215 ... [ticket/11215] Correct paths when path info is used for controller access	2013-09-02 15:55:22 -07:00
David King	918ffc10e1	[ticket/11215] Remove unnecessary comment ... PHPBB3-11215	2013-09-02 15:34:14 -07:00
Andreas Fischer	67f89cc319	Merge remote-tracking branch 'EXreaction/ticket/11812' into develop ... * EXreaction/ticket/11812: [ticket/11812] Fix empty define	2013-09-03 00:15:37 +02:00
Nathan Guse	536eeb7afa	[ticket/11755] MySQL upgrader out of date ... De-duplicating code from create_schema_files, mysql_upgrader. New file phpbb/db/schema_data which contains all the current schema data. New function in db_tools public static function get_dbms_type_map() to make the type map available everywhere (without requiring $db be setup already) PHPBB3-11755	2013-09-02 16:58:34 -05:00
David King	a057349e40	Merge branch 'develop' into ticket/11215	2013-09-02 14:43:05 -07:00
Andreas Fischer	50818a342b	[prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.	2013-09-02 23:42:45 +02:00
Andreas Fischer	f9c3d78e8c	Merge branch 'develop-olympus' into develop ... * develop-olympus: [ticket/11823] Set up nginx server to match PHP files with characters after .php	2013-09-02 23:40:11 +02:00
Andreas Fischer	f446afa06b	Merge remote-tracking branch 'imkingdavid/ticket/11823' into develop-olympus ... * imkingdavid/ticket/11823: [ticket/11823] Set up nginx server to match PHP files with characters after .php	2013-09-02 23:39:45 +02:00
Andreas Fischer	ed0d7e9ea0	[prep-release-3.0.12] Bumping version number for 3.0.12-RC3.	2013-09-02 23:38:42 +02:00
David King	f317d6d8c5	[ticket/11823] Set up nginx server to match PHP files with characters after .php ... PHPBB3-11823	2013-09-02 14:36:40 -07:00
Nathan Guse	c8d5ec8927	[ticket/11812] Fix empty define ... PHPBB3-11812	2013-09-02 16:35:42 -05:00
Nathan Guse	fe6688ff49	[ticket/11818] Update Symfony dependencies to 2.3.* ... PHPBB3-11818	2013-09-02 16:23:05 -05:00
Joseph Warner	d5808f13e5	[feature/oauth] Fix bug on ucp_auth_link related to error display ... PHPBB3-11673	2013-09-02 16:54:30 -04:00
Joseph Warner	ae18f921ea	[feature/oauth] More small fixes ... PHPBB3-11673	2013-09-02 16:52:41 -04:00
Nathan Guse	8ee86b7590	[ticket/11791] Load adm/ events from styles/adm/event/ ... PHPBB3-11791	2013-09-02 15:51:20 -05:00
Joseph Warner	29e3768ecc	[feature/oauth] More minor changes from review ... PHPBB3-11673	2013-09-02 16:47:53 -04:00
Joseph Warner	63ba064065	[feature/oauth] Fix small bug introduced by update in OAuth library ... PHPBB3-11673	2013-09-02 16:32:40 -04:00
Joseph Warner	51f06f36f1	[feature/oauth] Fix small issues on ucp pages ... PHPBB3-11673	2013-09-02 16:31:21 -04:00
Joseph Warner	6420fdcc05	[feature/oauth] Fix typo in OAuth logout method ... PHPBB3-11673	2013-09-02 16:04:46 -04:00
Joseph Warner	4348fd8350	[feature/oauth] Make token storage service ignorant ... PHPBB3-11673	2013-09-02 16:04:35 -04:00
Joseph Warner	a2be0aab5f	[feature/oauth] Update oauth::logout() to use clearAllTokens() ... PHPBB3-11673	2013-09-02 16:04:24 -04:00
Joseph Warner	6df2bd4fd3	[feature/oauth] Update storage implementation due to inteface change ... PHPBB3-11673	2013-09-02 16:04:15 -04:00
Joseph Warner	d04def0558	[feature/oauth] Update lusitanian/oauth to stable branch ... PHPBB3-11673	2013-09-02 16:03:59 -04:00