makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-17 08:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
25313 commits 18 branches 192 tags 207 MiB
Commit graph

9555 commits

Author SHA1 Message Date
Marc Alexander
ce8c09f51f [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals 
The $request global existed twice and the $phpEx global is not being used
in confirm_box().

PHPBB3-13192
 2014-10-21 22:17:48 -05:00
Marc Alexander
c381ad2002 [ticket/13192] Use get_valid_user_page method in build_url function 
PHPBB3-13192
 2014-10-21 22:17:24 -05:00
Marc Alexander
7c4b7f63fc Merge branch 'develop-ascraeus' into develop 2014-10-21 18:58:06 -05:00
Marc Alexander
faec26b873 Merge pull request #3053 from Senky/ticket/13194 
[ticket/13194] BBCode isn't parsed when issuing a warning for a post
 2014-10-21 18:57:43 -05:00
Jakub Senko
0dcfcf5854 [ticket/13193] Add load_search config check 
PHPBB3-13193
 2014-10-21 22:53:59 +02:00
Jakub Senko
92f077a4e9 [ticket/13193] Add link to post count in PMs 
PHPBB3-13193
 2014-10-21 22:32:57 +02:00
Jakub Senko
defeb1a56f [ticket/13194] Use correct array to access bbcode_bitfield 
PHPBB3-13194
 2014-10-21 22:21:48 +02:00
Nils Adermann
b7386c0c82 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13189] Do not use confirm box for marking all notifications read
 2014-10-21 09:49:42 -04:00
Marc Alexander
293d64e122 [ticket/13189] Do not use confirm box for marking all notifications read 
We already use a token for preventing CSRF when marking notifications read.
Making a user confirm the marking read action serves no real purpose. No
information will be lost by just marking the notifications read but it will
prevent users from always having to confirm this action.

PHPBB3-13189
 2014-10-20 21:55:36 -05:00
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
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
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
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
Oliver Schramm
30213816ae [ticket/13100] Display only confirmation buttons when deleting shadow topic 
PHPBB3-13100
 2014-10-20 00:24:16 +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
Oliver Schramm
f049fcd604 [ticket/11863] Display warning to user because of activation method 
PHPBB3-11863
 2014-10-17 15:42:11 +02:00
Oliver Schramm
01df1d3301 [ticket/11863] Grey out unavailable activation methods when emails disabled 
Further fall back to USER_ACTIVATION_DISABLE when emails are disabled
but evaluate it at runtime.

PHPBB3-11863
 2014-10-17 15:40:03 +02: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