1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

16544 Commits

Author SHA1 Message Date
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
Nathan Guse
5166240d62 [ticket/11833] Prevent Twig errors from invalid template loops using BEGINELSE
PHPBB3-11833
2013-09-09 11:26:40 -05:00
Nathan Guse
0cb4ceabf4 [ticket/11833] Fix bad template loop
PHPBB3-11833
2013-09-09 11:24:12 -05: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
David King
d1c0e93895 [ticket/11824] Correct a comment
PHPBB3-11824
2013-09-06 13:08:35 -07:00
David King
50b24662bd [ticket/11824] Change copyright year in migration file
PHPBB3-11824
2013-09-06 13:07:02 -07:00
David King
ceaf1ba0bc [ticket/11824] Remove unused globals
PHPBB3-11824
2013-09-06 12:59:01 -07:00
David King
bbcd3967ef [ticket/11824] Fix smilies
PHPBB3-11824
2013-09-06 12:53:34 -07:00
David King
2ccc992da1 [ticket/11824] Fix logic
PHPBB3-11824
2013-09-06 12:48:09 -07:00
Nathan
b7eca27f2a [ticket/11831] Update fabpot/goutte to 1.0.*
PHPBB3-11831
2013-09-06 12:28:46 -05:00
Nathan Guse
65f52d7575 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11816
# By David King (16) and others
# Via David King (13) and others
* 'develop' of github.com:phpbb/phpbb3: (67 commits)
  [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [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.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [ticket/11791] Load adm/ events from styles/adm/event/
  [ticket/11215] Fix helper_url_test.php tests
  [ticket/11215] Add newline back to .htaccess, fix wording
  [ticket/11215] Update comment in .htaccess
  [ticket/11215] Uncomment rewrite rules in .htaccess
  [ticket/11215] Make controller helper url() method use correct format
  [ticket/11215] Add commented-out URL rewrite capability to .htaccess
  [ticket/11821] Fix comma usage next to "You are receiving this notification".
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11215] Use new URL structure for controllers
  [ticket/11215] Everything appears to be working...
  ...

Conflicts:
	phpBB/phpbb/template/twig/lexer.php
	tests/template/template_test.php
2013-09-06 09:08:53 -05: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
David King
010da72f64 [ticket/11824] Add option for mod_rewrite
PHPBB3-11824
2013-09-03 16:57:27 -07: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
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
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
ed0d7e9ea0 [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. 2013-09-02 23:38:42 +02: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
David King
a1b4c6f82a [ticket/11215] Fix helper_url_test.php tests
PHPBB3-11215
2013-09-02 12:53:37 -07:00
Nathan Guse
4233575814 [ticket/11822] Use namespace lookup order for asset loading
PHPBB3-11822
2013-09-02 14:01:51 -05:00
David King
5ed5f43afe [ticket/11215] Add newline back to .htaccess, fix wording
PHPBB3-11215
2013-09-02 11:53:52 -07:00
David King
5c50dc721d [ticket/11215] Update comment in .htaccess
PHPBB3-11215
2013-09-02 11:51:52 -07:00
David King
1e64095e17 [ticket/11215] Uncomment rewrite rules in .htaccess
Because we check to see if the rewrite module is available
we don't have to comment the rewrite lines

PHPBB3-11215
2013-09-02 11:49:36 -07:00
David King
913e5a1f2e [ticket/11215] Make controller helper url() method use correct format
PHPBB3-11215
2013-09-02 10:54:55 -07:00
Nathan Guse
5e86f5687b [ticket/11727] Template loader support for safe directories to load files from
PHPBB3-11727
2013-09-02 12:13:20 -05:00