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

18458 Commits

Author SHA1 Message Date
Nathan Guse
3a4efa7959 [ticket/11832] More extensive testing
PHPBB3-11832
2013-09-10 11:15:24 -05:00
Nathan Guse
c46637990e [ticket/11832] Use dirname(__FILE__)
PHPBB3-11832
2013-09-10 10:14:57 -05:00
Nathan Guse
3684d8e971 [ticket/11832] Use $phpbb_filesystem instead of the container in append_sid
PHPBB3-11832
2013-09-10 10:13:26 -05:00
Nathan Guse
d5f93f5ce4 Revert "[ticket/11832] Make $phpbb_container a global initiated by the framework"
This reverts commit 5e09afa0bc3ff9014812282fd4454f0df54b9dfd.
2013-09-10 10:06:13 -05: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
5e09afa0bc [ticket/11832] Make $phpbb_container a global initiated by the framework
Setup common items needed from the container (e.g. filesystem)

PHPBB3-11832
2013-09-09 18:47:25 -05:00
Nathan Guse
289bc2a411 [ticket/11832] Fix log tests
PHPBB3-11832
2013-09-09 18:27:12 -05:00
Nathan Guse
6692db892f [ticket/11832] update_web_root_path helper and tests
PHPBB3-11832
2013-09-09 18:19:50 -05:00
Nathan Guse
f30b87519e [ticket/11832] Inject dependencies for phpbb_get_web_root_path (also moving)
Function moved from phpbb_get_web_root_path to filesystem::get_web_root_path

PHPBB3-11832
2013-09-09 17:28:56 -05: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
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
4eab9a8c53 [ticket/11824] Add tests for urls with mod_rewrite enabled
PHPBB3-11824
2013-09-06 13:14:07 -07: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
b17d15276f [ticket/11831] getAttribute was replaced with attr
PHPBB3-11831
2013-09-06 12:36:40 -05: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
Nathan Guse
11317ef261 [ticket/11816] !$DOESNT_EXIST test
PHPBB3-11816
2013-09-06 09:04:40 -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
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. release-3.0.12-RC3 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