1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-13 19:15:20 +02:00

8146 Commits

Author SHA1 Message Date
Joseph Warner
18f6a16101 Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth 2013-09-10 16:19:39 -04: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
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
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
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
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 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
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
Andreas Fischer
ed0d7e9ea0 [prep-release-3.0.12] Bumping version number for 3.0.12-RC3. 2013-09-02 23:38:42 +02: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
51f06f36f1 [feature/oauth] Fix small issues on ucp pages
PHPBB3-11673
2013-09-02 16:31:21 -04:00
David King
9d48ee446b [ticket/11215] Add commented-out URL rewrite capability to .htaccess
PHPBB3-11215
2013-09-02 09:43:41 -07:00
David King
1b1dd01391 Merge remote-tracking branch 'upstream/develop' into ticket/11215 2013-09-02 09:14:19 -07:00
Andreas Fischer
5ddb0ba629 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11769] Allow '0' as username in notification mails
  [ticket/11769] Fix language issues in the doc blocks
  [ticket/11769] Correctly supply the post author's username in posting.php

Conflicts:
	phpBB/includes/functions_posting.php
2013-09-02 12:31:27 +02:00
Andreas Fischer
68555d2d51 Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11769] Allow '0' as username in notification mails
  [ticket/11769] Fix language issues in the doc blocks
  [ticket/11769] Correctly supply the post author's username in posting.php

Conflicts:
	phpBB/language/en/email/forum_notify.txt
	phpBB/language/en/email/newtopic_notify.txt
	phpBB/language/en/email/topic_notify.txt
2013-09-02 12:30:10 +02:00
Joas Schilling
42b9c3c479 [ticket/11769] Allow '0' as username
PHPBB3-11769
2013-09-02 01:11:40 +02:00
David King
ffee476047 [ticket/11215] Everything appears to be working...
PHPBB3-11215
2013-08-31 14:31:50 -07:00
David King
af1eb7466f Merge branch 'develop' into ticket/11215 2013-08-31 13:37:11 -07:00
Nathan Guse
68ed2b6035 Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/11628
# By Bruno Ais (42) and others
# Via Joas Schilling (39) and others
* 'develop' of github.com:phpbb/phpbb3: (157 commits)
  [ticket/11803] Revert POLL_MAX_OPTIONS min value to 0
  [ticket/11799] Send anti abuse headers in "new password" emails.
  [ticket/11792] Add functional test for var lang_set_ext of core.user_setup
  [ticket/11804] Remove </li> from overall_header which was not open
  [ticket/11802] replace $browser with $user->browser
  [ticket/11801] removed some whitespace and added missing semi colon's in css
  [ticket/11792] Add performance remark to core.user_setup event PHPDoc
  [ticket/11792] Add variable 'lang_set_ext' to event core.user_setup
  [ticket/11789] Remove inline color in memberlist_view
  [ticket/11800] Fix scripts variable in subsilver simple_footer
  [ticket/11800] Fix JavaScript in simple_footer.html
  [ticket/11800] Remove forum_fn from memberlist_search.html
  [ticket/11796] Replace pagination with pagination.html
  [ticket/11794] Add missing array element commas to docs/coding-guidelines.html
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11789] Remove colors from HTML code
  [ticket/11784] Remove naming redundancy for event listeners
  [ticket/11775] Split test into multiple steps
  [ticket/11777] Fix new test for loop variables in extension template listeners
  ...

Conflicts:
	phpBB/install/index.php
	phpBB/install/install_update.php
2013-08-28 13:30:48 -05:00
Joas Schilling
44ddcf792f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11799] Send anti abuse headers in "new password" emails.
2013-08-26 16:57:46 +02:00
Joseph Warner
d847df7175 [feature/oauth] A few more minor changes
PHPBB3-11673
2013-08-24 22:10:34 -04:00
Joseph Warner
a8ffbce99f [feature/oauth] Changes due to code review
PHPBB3-11673
2013-08-24 22:04:04 -04:00
Joseph Warner
76d1e7e111 [feature/oauth] Fix issues on ucp_login_link from review
PHPBB3-11673
2013-08-24 21:14:55 -04:00
Joseph Warner
27ba57747a [feature/oauth] Clean up TODOs
PHPBB3-11673
2013-08-24 17:17:31 -04:00
Joas Schilling
d717203af1 [ticket/11769] Fix language issues in the doc blocks
PHPBB3-11769
2013-08-23 23:49:11 +02:00
Joas Schilling
2845b153d8 [ticket/11769] Correctly supply the post author's username in posting.php
Only supply the username, when it is a guest posting or we edit and it was
supplied, otherwise post_data might hold data of the post we quote, in which
case username is the original poster, not the current one.

PHPBB3-11769
2013-08-23 23:17:52 +02:00
Andreas Fischer
5f81d66c2f [ticket/11799] Send anti abuse headers in "new password" emails.
PHPBB3-11799
2013-08-23 03:55:26 +02:00
Andreas Fischer
55d911a2fd Merge remote-tracking branch 'cyberalien/ticket/11754' into develop
* cyberalien/ticket/11754:
  [ticket/11754] Remove styleswitcher leftovers
2013-08-18 01:55:56 +02:00
brunoais
7a02a8bcf2 [ticket/11663] Add the doc block about the parameters.
PHPBB3-11663
2013-08-17 20:11:26 +01:00
Joseph Warner
e2d0a0b7c8 [feature/oauth] Fix template not refreshing issue
PHPBB3-11673
2013-08-14 23:18:10 -04:00
Joseph Warner
43e08e221f [feature/oauth] Fix bug found in testing
PHPBB3-11673
2013-08-14 22:50:49 -04:00
Andreas Fischer
1ac1b9b7ee Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11775] Split test into multiple steps
  [ticket/11775] Add functional test for moving the last post
  [ticket/11775] Backport moving of the posting functions to 3.0
  [ticket/11775] Fix error when moving the last post to another topic

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
2013-08-15 01:40:08 +02:00
Andreas Fischer
d089f9693a Merge branch 'prep-release-3.0.12' into develop-olympus
* prep-release-3.0.12:
  [ticket/11775] Fix doc blocks syntax
  [ticket/11775] Remove spaces at line ends
  [ticket/11775] Split test into multiple steps
  [ticket/11775] Add functional test for moving the last post
  [ticket/11775] Backport moving of the posting functions to 3.0
  [ticket/11775] Fix error when moving the last post to another topic
2013-08-15 01:37:56 +02:00
Joseph Warner
9cd80345ad [feature/oauth] Implement unlinking in OAuth
PHPBB3-11673
2013-08-14 16:33:10 -04:00
Joseph Warner
cd12786e58 [feature/oauth] Fix errors found in testing linking
PHPBB3-11673
2013-08-14 16:02:47 -04:00
Joseph Warner
bb68338861 [feature/oauth] Refactor oauth::link_account for two paths
PHPBB3-11673
2013-08-14 15:55:58 -04:00
Joseph Warner
afebbf231a [feature/oauth] Update link_account to allow for two methods of linking
PHPBB3-11673
2013-08-14 15:36:20 -04:00
Joseph Warner
ce387d9bfc [feature/oauth] Fix errors in ucp_auth_link
PHPBB3-11673
2013-08-14 15:21:24 -04:00
Joseph Warner
67b1ec5bb8 [feature/oauth] Start implementing link/unlink actions
PHPBB3-11673
2013-08-14 15:19:40 -04:00
brunoais
53888ec540 [ticket/11663] Add the doc block about the return value.
generate_text_for_storage does not return anything, all returned values are outputted using the parameters so this uses the returned value with the same idea as many C language functions where the returned value is if all went well or not and if it didn't what went wrong.

PHPBB3-11663
2013-08-14 10:44:45 +01:00