0e772afb9d
Merge branch 'prep-release-3.1.1' into develop-ascraeus
...
* prep-release-3.1.1:
[ticket/13271] Disable CC sender feature for anonymous users
[prep-release-3.1.1] Add 3.1.1 CHANGELOG
[prep-release-3.1.1] Add 3.1.1 migration file
[ticket/13263] Make sure default style exists and clean up code
[ticket/13263] Only install/set prosilver if no style available
[ticket/13263] Use prosilver as default style if user's style doesn't exist
[ticket/security-164] Correctly format page_name
[ticket/security-164] Sanitize all global variables in symfony_request class
[ticket/13248] Use functional framework login method in tests
[ticket/13248] Correctly pass provider name
[ticket/13248] Always use provider collection for getting provider
[ticket/13248] Allow specifying different auth provider in provider collection
[ticket/13248] Use auth provider collection for getting provider
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
[ticket/13267] Update Automatic Update instructions to include vendor directory
[ticket/13268] Properly append ternary result in get_existing_indexes()
[prep-release-3.1.1] Update version number to 3.1.1
Conflicts:
build/build.xml
phpBB/includes/constants.php
phpBB/install/schemas/schema_data.sql
2014-11-02 01:25:51 +01:00
a9249bce5e
[ticket/13248] Always use provider collection for getting provider
...
PHPBB3-13248
2014-11-01 21:54:21 +01:00
3f3c8d74e8
[prep-release-3.1.1] Update version number to 3.1.1
2014-11-01 18:47:56 +01:00
0682e5719d
Merge branch 'prep-release-3.1.0' into develop-ascraeus
2014-10-28 10:02:53 +01:00
679559ce18
Merge branch 'naderman-ticket/13232' into prep-release-3.1.0
2014-10-28 10:02:33 +01:00
4c75f013de
Merge branch 'prep-release-3.1.0' into develop-ascraeus
...
* prep-release-3.1.0:
[ticket/13229] Fix overloading memberlist with redundant SQL queries
2014-10-27 17:01:57 -07:00
16d78407db
[ticket/13229] Fix overloading memberlist with redundant SQL queries
...
PHPBB3-13229
2014-10-27 17:01:29 -07:00
df5366a5ca
[ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasks
...
PHPBB3-13232
2014-10-27 15:42:26 -07:00
b1d7386075
Merge branch 'prep-release-3.1.0' into develop-ascraeus
...
* prep-release-3.1.0:
[ticket/13230] Add missing globals and missing request object for path helper
[ticket/13226] Add functional test for group ranks
[ticket/13226] Fix the usage of $rank_img
2014-10-27 12:25:41 -07:00
47759eb096
[ticket/13230] Add missing globals and missing request object for path helper
...
PHPBB3-13230
2014-10-27 14:54:17 +01:00
69cf5782d4
Merge pull request #3054 from Senky/ticket/13193
...
[ticket/13193] Post count in PMs not a link
* Senky/ticket/13193:
[ticket/13193] Swap ternary condition members
[ticket/13193] Make template more readable
[ticket/13193] Add load_search config check
[ticket/13193] Add link to post count in PMs
2014-10-26 14:20:33 +01:00
79274e904c
[ticket/13193] Swap ternary condition members
...
PHPBB3-13193
2014-10-26 08:44:21 +01:00
7a4b404af7
[develop-ascraeus] Update version number to 3.1.1-RC1-dev
2014-10-25 20:28:46 -07:00
81ad381263
[ticket/13207] Move default user notifications settings to user_add()
...
PHPBB3-13207
2014-10-25 14:57:01 -07:00
18f24a2270
[ticket/13207] Add default subscription options for newly registered users
...
PHPBB3-13207
2014-10-25 14:50:01 -07:00
80a9c24b6b
[prep-release-3.1.0] Update version to 3.1.0
2014-10-23 12:22:02 +02:00
7a90184421
[prep-release-3.1.0-RC6] Update phpBB Version for RC7 development
2014-10-23 02:44:18 +02:00
d640a37984
[prep-release-3.1.0-RC6] Update version to 3.1.0-RC6
2014-10-23 01:48:38 +02:00
e4c8e4905c
Merge pull request #3 from phpbb/ticket/security-161
...
[ticket/security-161] Add form token to styles management form.
2014-10-23 01:38:12 +02:00
4d30633cd4
[ticket/security-161] Add form token to styles management form.
...
SECURITY-161
2014-10-22 15:46:00 -07:00
6a0727acdc
Merge pull request #3058 from naderman/ticket/13205
...
[ticket/13205] Add a mark all messages read link to PM folders
2014-10-22 17:39:13 -05:00
df72846b89
[ticket/13205] Explicitly cast ids to integers and reformat SQL
...
PHPBB3-13205
2014-10-22 18:35:07 -04:00
b5594371ab
[ticket/13205] Remove superfluous newline
...
PHPBB3-13205
2014-10-22 18:31:29 -04:00
48dc4c02ae
[ticket/13205] Add a mark all messages read link to PM folders
...
PHPBB3-13205
2014-10-22 18:02:43 -04:00
f796f92058
[ticket/security-159] Only show first 8 characters of login keys in UCP
...
SECURITY-159
2014-10-22 16:21:16 -05:00
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
0dcfcf5854
[ticket/13193] Add load_search config check
...
PHPBB3-13193
2014-10-21 22:53:59 +02:00
92f077a4e9
[ticket/13193] Add link to post count in PMs
...
PHPBB3-13193
2014-10-21 22:32:57 +02:00
defeb1a56f
[ticket/13194] Use correct array to access bbcode_bitfield
...
PHPBB3-13194
2014-10-21 22:21:48 +02:00
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
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
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
53f166274a
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
...
PHPBB3-13168
2014-10-20 16:47:52 +02:00
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
66342f5b89
[ticket/13171] Check the correct (soft)delete permission when deleting in MCP
...
PHPBB3-13171
2014-10-17 15:39:20 +02:00
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
9bc9e42c94
[ticket/13164] Fix syntax error
...
PHPBB3-13164
2014-10-11 17:58:41 +02:00
eb7152436c
[ticket/13164] Add post_visibility to core.submit_post_end event
...
PHPBB3-13164
2014-10-11 16:56:03 +02:00
699c642128
[ticket/13164] Update post_visibility before event is triggered
...
PHPBB3-13164
2014-10-10 14:24:46 +02:00
eed4d0d30f
[prep-release-3.1.0-RC5] Update phpBB Version for RC6 development
2014-10-07 22:10:45 +02:00
7137dc387a
[prep-release-3.1.0-RC5] Update version to 3.1.0-RC5
2014-10-07 21:10:14 +02:00
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
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
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
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
1e8735eac1
[ticket/13134] Add core event to the root of the function display_forums()
...
PHPBB3-13134
2014-10-07 01:47:01 +08:00
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
9d9685eec9
[ticket/12929] BUMP to RC5
...
PHPBB3-12929
2014-10-02 14:44:43 +01:00
cf2ac56950
[ticket/12930] BUMP to RC5
...
PHPBB3-12930
2014-10-02 14:43:50 +01:00
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
