1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00

14193 Commits

Author SHA1 Message Date
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
David King
008cf967ab [feature/add_events] Re-fix broken test
PHPBB3-9550
2012-08-21 11:18:53 -04:00
David King
efe9b1010a [feature/add_events] Fix append_sid() test
PHPBB3-9550
2012-08-20 21:22:29 -04: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
Andreas Fischer
8c62c33f2a Merge remote-tracking branch 'igorw/ticket/11061' into develop
* igorw/ticket/11061:
  [ticket/11061] Add the --dev flag to the composer instructions in README
2012-08-19 23:50:56 +02:00
Andreas Fischer
964f5225ce Merge remote-tracking branch 'igorw/ticket/11060' into develop
* igorw/ticket/11060:
  [ticket/11060] Make sure pyrus can install everything on travis
2012-08-19 23:48:15 +02:00
Andreas Fischer
5accd5c88c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11059] Use https for the README logo
2012-08-19 23:45:45 +02:00
Andreas Fischer
ac81611b90 Merge remote-tracking branch 'igorw/ticket/11059' into develop-olympus
* igorw/ticket/11059:
  [ticket/11059] Use https for the README logo
2012-08-19 23:44:31 +02:00
Igor Wiedler
c7363712ce [ticket/11061] Add the --dev flag to the composer instructions in README
It is needed to install dev dependencies, such as goutte, which are
needed to run the tests.

PHPBB3-11061
2012-08-19 05:18:52 +02:00
Oleg Pudeyev
3b068566db Merge PR #950 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10943] displays searched query in search result
  [ticket/10943] use keywords variable to display in search box
2012-08-18 22:38:34 -04:00
Oleg Pudeyev
97020399fa Merge PR #950 branch 'dhruvgoel92/ticket/10943' into develop-olympus
* dhruvgoel92/ticket/10943:
  [ticket/10943] displays searched query in search result
  [ticket/10943] use keywords variable to display in search box
2012-08-18 22:38:25 -04: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
Igor Wiedler
ca4cee86af [ticket/11060] Make sure pyrus can install everything on travis
This is needed so it can install symfony/yaml from a new channel.

PHPBB3-11060
2012-08-19 02:28:11 +02:00
Igor Wiedler
0ae4b20160 [ticket/11059] Use https for the README logo
It's causing troubles since we moved the site to HTTPS

PHPBB3-11059
2012-08-19 02:20:58 +02: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
Andreas Fischer
ff8757ce65 Merge remote-tracking branch 'imkingdavid/ticket/11054' into develop
* imkingdavid/ticket/11054:
  [ticket/11054] Fixed $config var description
  [ticket/11054] The user class is phpbb_user
  [ticket/11054] Fixed documentation syntax for @var in extension/controller.php
2012-08-15 16:44:45 +02:00
David King
b729609fb2 [ticket/11054] Fixed $config var description
PHPBB3-11054
2012-08-15 09:15:18 -04:00
Dhruv
484c0bec11 [ticket/11052] constructor updated in installer and convertor
PHPBB3-11052
2012-08-15 15:44:01 +05:30
Fyorl
884a213d55 [feature/attach-dl] Fixed a comment
PHPBB3-11042
2012-08-15 06:11:30 +08:00
Fyorl
227ae48255 [feature/attach-dl] Optimised an sql query
PHPBB3-11042
2012-08-15 06:10:53 +08:00
Fyorl
5827250a94 [feature/attach-dl] Fixed the logic in an sql statement
PHPBB3-11042
2012-08-15 06:08:18 +08:00
Fyorl
f6e8d938cb [feature/attch-dl] $forum_id cast to int
PHPBB3-11042
2012-08-15 06:06:28 +08:00