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

13209 Commits

Author SHA1 Message Date
Igor Wiedler
ae85d43757 Merge remote-tracking branch 'upstream/develop' into feature/dic
* upstream/develop: (259 commits)
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.
  [feature/php-events] Fix doc of core.viewonline_overwrite_location
  [feature/php-events] Fix doc of core.user_set_default_group
  [feature/php-events] Fix doc of core.generate_smilies_after
  [feature/php-events] Fix doc of core.delete_user_after
  [feature/php-events] Fix doc of core.delete_user_before
  [feature/php-events] Fix doc of core.update_username
  [feature/php-events] Fix doc of core.memberlist_prepare_profile_data
  [feature/php-events] Fix doc and position of viewonline_overwrite_location
  [feature/php-events] Fix doc of core.viewtopic_get_post_data
  [feature/php-events] Fix doc of core.viewtopic_cache_guest_data
  [ticket/11061] Add the --dev flag to the composer instructions in README
  [ticket/11060] Make sure pyrus can install everything on travis
  [ticket/11059] Use https for the README logo
  [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum
  [feature/php-events] Fix core.acp_manage_forums_update_data_after vars
  [ticket/11032] fix language of error displayed
  [ticket/11052] update search backend constructor everywhere
  [ticket/11052] pass parametes to search construct while posting
  [ticket/11054] Fixed $config var description
  ...

Conflicts:
	phpBB/includes/cron/task/core/tidy_cache.php
	phpBB/includes/cron/task/core/tidy_search.php
2012-08-25 17:00:40 +02:00
Igor Wiedler
fd9fd71a88 [feature/dic] Add docblock for cron_manager::wrap_task()
PHPBB3-10739
2012-08-25 16:54:30 +02:00
Igor Wiedler
4f0f63ae8f [feature/dic] Make cron task attributes protected, one per line
PHPBB3-10739
2012-08-25 16:51:19 +02:00
Igor Wiedler
4feb9aa8d7 [feature/dic] Coding style: Braces
PHPBB3-10739
2012-08-25 16:43:41 +02:00
Igor Wiedler
7e44ca4d49 [feature/dic] Re-order services alphabetically
PHPBB3-10739
2012-08-25 16:39:38 +02:00
David King
7ee3eb16ac [feature/add_events] Add more parameters to core.modify_posting_parameters
PHPBB3-9550
2012-08-23 12:49:09 -04:00
Jordan Rogers
73cd044f5c [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php
For some reason, all errors are just flipped on before connecting to the
database, despite the system as a whole having a different setting for
displayable errors. Had to add & ~E_STRICT in PHP 5.4.5 to suppress Strict
Standards messages, but I would assume that the db piece shouldn't be involved
with setting error_reporting at all.

PHPBB3-11066
2012-08-23 15:41:57 +02:00
David King
e67b010846 [feature/add_events] Put globals on one line
PHPBB3-9550
2012-08-22 10:41:59 -04:00
David King
575980cba9 [feature/add_events] Remove $allow_bbcode and $allow_smilies
Upon testing it was discovered that these did not work as originally intended.

PHPBB3-9550
2012-08-22 09:37:47 -04:00
David King
46597be1a3 [feature/add_events] Globalize event dispatcher object in some functions
PHPBB3-9550
2012-08-22 08:37:33 -04:00
David King
4f6f0c0897 [feature/add_events] Event to modify the data array for when a user is added
PHPBB3-9550
2012-08-21 17:04:16 -04:00
David King
0358db2184 [feature/add_events] Before and after events for generate_text_for_* functions
PHPBB3-9550
2012-08-21 16:42:30 -04:00
David King
1e29f064e8 [feature/add_events] Added events for modifying generate_text_for_display()
The events allow you to perform extra functions on the text before nad/or
after it has been parsed for BBCode and Smilies.

PHPBB3-9550
2012-08-21 12:55:16 -04:00
David King
92761e1f2b [ticket/10873] Change language for notice about undelivered, deleted PM.
See the ticket for my reasoning.

PHPBB3-10873
2012-08-21 11:59:44 -04:00
David King
a02bfcc83a [feature/add_events] core.posting_refresh -> core.modify_posting_paramters
The event now lets extensions modify the posting paramters, not just refresh

PHPBB3-9550
2012-08-21 11:50:38 -04:00
David King
05755e1b37 [feature/add_events] Fixed docs, added _profile_cache to event parameters
PHPBB3-9550
2012-08-21 11:31:18 -04:00
David King
c0cd1fcb4f [feature/add_events] Change alter -> modify in event name
PHPBB3-9550
2012-08-21 11:27:28 -04:00
David King
6c6b179dd4 [feature/add_events] Rename override to overwrite, made docs 79 chars/line
PHPBB3-9550
2012-08-21 11:25:52 -04:00
Joas Schilling
c20179db72 [ticket/10876] Update regex to a version which still matches our tests
PHPBB3-10876
2012-08-21 11:41:27 +02:00
David King
0ba755f1bd [feature/add_events] Rename core.append_sid_override to just core.append_sid
Also, I added the hook back in below the event for backwards compatibility.

PHPBB3-9550
2012-08-20 20:45:09 -04:00
Fyorl
e1a4aa3ea2 [feature/attach-dl] Removed the use of some abbreviations
PHPBB3-11042
2012-08-20 21:52:42 +01:00
Fyorl
b1239f1c1a [feature/attach-dl] Changed $files_added checks
PHPBB3-11042
2012-08-20 21:47:29 +01:00
David King
e80e3809b9 [feature/add_events] Add event core.alter_username_string to change username
PHPBB3-9550
2012-08-20 12:21:44 -04:00
David King
808af65819 [feature/add_events] Globalize the event dispatcher object
PHPBB3-9550
2012-08-20 12:01:08 -04:00
David King
abc0ee753d [feature/add_events] Return the correct variable
PHPBB3-9550
2012-08-20 11:57:43 -04:00
David King
fbdc956a1c [feature/add_events] Replaced current append_sid() hook with new event
The new event, core.append_sid_override can either supplement or override
the append_sid() function.

PHPBB3-9550
2012-08-20 11:52:06 -04:00
David King
6613884a60 [feature/add_events] Added core.posting_refresh event
PHPBB3-9550
2012-08-20 11:37:27 -04:00
Andreas Fischer
bfdba90a34 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/install/database_update.php
2012-08-20 16:42:41 +02:00
Andreas Fischer
446607ef53 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2012-08-20 16:40:50 +02:00
Andreas Fischer
6da03913bf [prep-release-3.0.11] Bumping version number for 3.0.11 final. 2012-08-20 16:32:34 +02:00
David King
310c906932 Merge remote-tracking branch 'nickvergessen/feature/php-events-4' into develop 2012-08-20 09:09:53 -04:00
Joas Schilling
b567175c8d [feature/php-events] Fix doc of core.viewonline_overwrite_location
PHPBB3-9550
2012-08-20 10:15:04 +02:00
Joas Schilling
365d95c1fe [feature/php-events] Fix doc of core.user_set_default_group
PHPBB3-9550
2012-08-20 10:11:52 +02:00
Joas Schilling
01db8144d4 [feature/php-events] Fix doc of core.generate_smilies_after
PHPBB3-9550
2012-08-20 10:10:52 +02:00
Joas Schilling
48b54ed1e0 [feature/php-events] Fix doc of core.delete_user_after
PHPBB3-9550
2012-08-20 10:09:29 +02:00
Joas Schilling
74d9ef0bec [feature/php-events] Fix doc of core.delete_user_before
PHPBB3-9550
2012-08-20 10:08:59 +02:00
Joas Schilling
aea60f9323 [feature/php-events] Fix doc of core.update_username
PHPBB3-9550
2012-08-20 10:08:28 +02:00
Joas Schilling
f2c0b55665 [feature/php-events] Fix doc of core.memberlist_prepare_profile_data
PHPBB3-9550
2012-08-20 10:07:05 +02:00
Joas Schilling
7f156c9798 [feature/php-events] Fix doc and position of viewonline_overwrite_location
PHPBB3-9550
2012-08-20 10:04:43 +02:00
Joas Schilling
64bc658c04 [feature/php-events] Fix doc of core.viewtopic_get_post_data
PHPBB3-9550
2012-08-20 09:54:12 +02:00
Joas Schilling
6ad805713d [feature/php-events] Fix doc of core.viewtopic_cache_guest_data
PHPBB3-9550
2012-08-20 09:52:35 +02:00
Oleg Pudeyev
89d334ee6a Merge PR #954 branch 'dhruvgoel92/ticket/11032' into develop
* dhruvgoel92/ticket/11032:
  [ticket/11032] fix language of error displayed
2012-08-18 22:26:58 -04:00
Joas Schilling
90ed6e734d [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum
PHPBB3-9550
2012-08-18 20:32:58 +02:00
Joas Schilling
b32d5a3edf [feature/php-events] Fix core.acp_manage_forums_update_data_after vars
PHPBB3-9550
2012-08-18 20:25:11 +02:00
Fyorl
53aadd60a6 [feature/attach-dl] Renamed $post_id to $post_msg_id
PHPBB3-11042
2012-08-17 16:16:02 +01:00
Dhruv
d4f1e71d5e [ticket/11032] fix language of error displayed
Language of the error displayed is modified.

PHPBB3-11032
2012-08-15 22:57:02 +05:30
David King
d07cb6d778 Merge remote-tracking branch 'dhruvgoel92/ticket/11052' into develop 2012-08-15 12:40:08 -04:00
Dhruv
7c406e1e81 [ticket/11052] update search backend constructor everywhere
PHPBB3-11052
2012-08-15 22:05:26 +05:30
David King
485710e016 Merge remote-tracking branch 'dhruvgoel92/ticket/11052' into develop 2012-08-15 12:32:34 -04:00
Dhruv
938805106c [ticket/11052] pass parametes to search construct while posting
Proper parameters are passed in search backend constructor in
functions_posting.php

PHPBB3-11052
2012-08-15 21:09:42 +05:30