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

9342 Commits

Author SHA1 Message Date
Andreas Fischer
a16f185413 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
2014-10-20 23:20:43 +02:00
Andreas Fischer
afada9ed40 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
2014-10-20 23:20:42 +02:00
Andreas Fischer
b71cf56bda Merge pull request #3047 from Elsensee/ticket/13168
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility

* Elsensee/ticket/13168:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
2014-10-20 23:20:42 +02:00
Oliver Schramm
53f166274a [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
PHPBB3-13168
2014-10-20 16:47:52 +02:00
Marc Alexander
c6d65b051c Merge branch 'develop-ascraeus' into develop 2014-10-18 21:47:36 -04:00
Marc Alexander
c939f1b2c7 Merge pull request #3030 from Senky/ticket/13164
[ticket/13164] data sent to core.submit_post_end event does not include fresh post_visibility
2014-10-18 21:47:15 -04:00
Marc Alexander
6216771ac0 Merge branch 'develop-ascraeus' into develop 2014-10-18 18:00:38 -04:00
Joas Schilling
66342f5b89 [ticket/13171] Check the correct (soft)delete permission when deleting in MCP
PHPBB3-13171
2014-10-17 15:39:20 +02:00
Joas Schilling
e7e016637b [ticket/13138] Do not use cookie data and autologin while forcing a user_id
PHPBB3-13138
2014-10-16 12:32:48 +02:00
Jakub Senko
9bc9e42c94 [ticket/13164] Fix syntax error
PHPBB3-13164
2014-10-11 17:58:41 +02:00
Jakub Senko
eb7152436c [ticket/13164] Add post_visibility to core.submit_post_end event
PHPBB3-13164
2014-10-11 16:56:03 +02:00
Jakub Senko
699c642128 [ticket/13164] Update post_visibility before event is triggered
PHPBB3-13164
2014-10-10 14:24:46 +02:00
Joas Schilling
eed4d0d30f [prep-release-3.1.0-RC5] Update phpBB Version for RC6 development 2014-10-07 22:10:45 +02:00
Joas Schilling
7137dc387a [prep-release-3.1.0-RC5] Update version to 3.1.0-RC5 2014-10-07 21:10:14 +02:00
Joas Schilling
1fa0c861b7 Merge branch 'develop-ascraeus' into develop 2014-10-06 23:45:18 +02:00
Joas Schilling
4b90357d79 Merge pull request #2307 from PayBas/ticket/12408
[ticket/12408] Add quick setting for "default guest style" to ACP
2014-10-06 23:43:27 +02:00
Joas Schilling
a12a7d0b90 Merge pull request #2460 from Nicofuma/ticket/11224
[ticket/11224] SQL cache destroy does not destroy queries to tables joined
2014-10-06 23:20:50 +02:00
Joas Schilling
af530b65ce Merge branch 'develop-ascraeus' into develop 2014-10-06 22:38:12 +02:00
Joas Schilling
7479c61d05 Merge pull request #2828 from brunoais/ticket/12930
[ticket/12930] core.ucp_pm_compose_compose_pm_quotepost_query_after
2014-10-06 22:37:48 +02:00
Joas Schilling
a3221e21bf Merge branch 'develop-ascraeus' into develop 2014-10-06 22:25:57 +02:00
Joas Schilling
3c91fbeaa6 Merge pull request #2827 from brunoais/ticket/12929
[ticket/12929] core.ucp_pm_compose_compose_pm_basic_info_query_before
2014-10-06 22:25:08 +02:00
Joas Schilling
084adc61bc Merge branch 'develop-ascraeus' into develop 2014-10-06 22:12:38 +02:00
rxu
1e8735eac1 [ticket/13134] Add core event to the root of the function display_forums()
PHPBB3-13134
2014-10-07 01:47:01 +08:00
Andreas Fischer
c8a1826823 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13125] $user->browser to $browser
2014-10-04 00:41:25 +02:00
Andreas Fischer
682527f509 Merge pull request #3018 from Senky/ticket/13125
[ticket/13125] Uploaded avatars are not displayed

* Senky/ticket/13125:
  [ticket/13125] $user->browser to $browser
2014-10-04 00:41:25 +02:00
brunoais
9d9685eec9 [ticket/12929] BUMP to RC5
PHPBB3-12929
2014-10-02 14:44:43 +01:00
brunoais
cf2ac56950 [ticket/12930] BUMP to RC5
PHPBB3-12930
2014-10-02 14:43:50 +01:00
Joas Schilling
6cb5e6c3b4 Merge branch 'develop-ascraeus' into develop 2014-10-02 15:38:27 +02:00
Joas Schilling
240ff27707 Merge pull request #3000 from rxu/ticket/13110
[ticket/13110] Add core event to the page_footer() function
2014-10-02 15:38:22 +02:00
Jakub Senko
6400902a01 [ticket/13125] $user->browser to $browser
PHPBB3-13125
2014-10-02 15:34:56 +02:00
Joas Schilling
a3456c90c9 Merge branch 'develop-ascraeus' into develop 2014-10-02 15:33:40 +02:00
Joas Schilling
ee758e22a6 Merge pull request #2999 from rxu/ticket/13108
[ticket/13108] Add core event to the parse_attachments() function
2014-10-02 15:33:32 +02:00
Joas Schilling
b7610b444a Merge branch 'develop-ascraeus' into develop 2014-10-02 15:18:44 +02:00
Joas Schilling
2ee13bbc24 Merge pull request #3004 from Senky/ticket/13116
[ticket/13116] Topic and post approval notifications got interchanged
2014-10-02 15:18:23 +02:00
Marc Alexander
ec34fb85ca Merge branch 'develop-ascraeus' into develop 2014-10-01 15:59:15 +02:00
rxu
a876cc8c26 [ticket/13108] Add core event to the parse_attachments() function
Add core event to the parse_attachments() function in functions_content.php
to allow modifying/adding attachment template data.

PHPBB3-13108
2014-10-01 21:00:37 +08:00
Joas Schilling
95c0d81ba1 [ticket/13119] Add another event which is triggered independent from actions
PHPBB3-13119
2014-10-01 14:54:26 +02:00
Joas Schilling
dceb334a0c Merge branch 'develop-ascraeus' into develop 2014-10-01 10:34:42 +02:00
Joas Schilling
b003019958 Merge pull request #3013 from VSEphpbb/ticket/13121
[ticket/13121] Remove cache mode from style management module
2014-10-01 10:34:08 +02:00
Joas Schilling
d73194a415 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:19:39 +02:00
Joas Schilling
170b75d0c9 Merge pull request #2888 from Nicofuma/ticket/12993
[ticket/12993] Improve get_user_ranks
2014-10-01 10:19:24 +02:00
Joas Schilling
9ad7eddc25 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:09:39 +02:00
Joas Schilling
994a0dcd4c Merge branch 'ticket/12985' into develop-ascraeus 2014-10-01 10:09:29 +02:00
david63
5314c2bddf [ticket/12985] Add core.login_box_redirect
Add core.login_box_redirect core event to allow extensions to redirect a
user to a specific page when logging in.

PHPBB3-12985
2014-10-01 10:09:10 +02:00
Cesar G
d644de5217 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13119] Remove unused globals and use the request class
  [ticket/13119] Add events to ACP's ban module
  [ticket/13119] Add events to MCP's ban module
2014-10-01 00:44:16 -07:00
Cesar G
8ab7f6b595 Merge remote-tracking branch 'nickvergessen/ticket/13119' into develop-ascraeus
* nickvergessen/ticket/13119:
  [ticket/13119] Remove unused globals and use the request class
  [ticket/13119] Add events to ACP's ban module
  [ticket/13119] Add events to MCP's ban module
2014-10-01 00:43:41 -07:00
Matt Friedman
65539df39a [ticket/13121] Remove cache mode from style management module
https://tracker.phpbb.com/browse/PHPBB3-13121

PHPBB3-13121
2014-10-01 00:03:54 -07:00
Andreas Fischer
236f75c6cb Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
2014-10-01 00:26:39 +02:00
Tristan Darricau
3a413cbf30 [ticket/13120] Follows the symlinks in phpbb_load_extensions_autoloaders
PHPBB3-13120
2014-09-30 21:20:42 +02:00
Joas Schilling
6f66423de9 [ticket/13119] Remove unused globals and use the request class
PHPBB3-13119
2014-09-30 18:22:06 +02:00