makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 12:58:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
23657 commits 18 branches 192 tags 206 MiB
Commit graph

9175 commits

Author SHA1 Message Date
Joas Schilling
d56da0d68f Merge pull request #3044 from Elsensee/ticket/13100 
[ticket/13100] Display only confirmation buttons when deleting shadow topic
 2014-11-21 20:59:22 +01:00
Joas Schilling
973c2a9a3a Merge pull request #2765 from Elsensee/ticket/11863 
[ticket/11863] Set require_activation to none if emails are disabled
 2014-11-21 20:18:15 +01:00
Joas Schilling
bc52a84998 Merge pull request #3131 from omniError/ticket/13328 
[ticket/13328] add core.mcp_view_forum_modify_sql
 2014-11-21 20:05:19 +01:00
Joas Schilling
4bf3dcbebd Merge pull request #3114 from rxu/ticket/13294 
[ticket/13294] Add function parse() core event for additional message checks
 2014-11-21 19:28:07 +01:00
rxu
1e867ce52b [ticket/13294] Add function parse() core event for additional message checks 
Add core event to the function parse() in includes/message_parser.php to allow
additional handling message before parsing (i.e. perform custom message
checks, cleanup etc.).

PHPBB3-13294
 2014-11-20 00:47:51 +07:00
Joas Schilling
31c59cad83 [ticket/13298] Add missing $db->freeresult(); calls in functions_admin.php 
PHPBB3-13298
 2014-11-17 23:56:33 +01:00
omniError
b648d3eb4c [ticket/13328] fix CS 
https://tracker.phpbb.com/browse/PHPBB3-13328

PHPBB3-13328
 2014-11-11 10:47:39 -06:00
omniError
71e0de5588 [ticket/13328] add core.mcp_view_forum_modify_sql 
https://tracker.phpbb.com/browse/PHPBB3-13328

PHPBB3-13328
 2014-11-10 22:57:54 -06:00
lavigor
8171087cfb [ticket/13318] login_username needs to have the multibyte parameter set to true 
This is needed for usernames with UTF-8 characters.

PHPBB3-13318
 2014-11-10 20:12:10 +03:00
Oliver Schramm
ced316d88c [ticket/13300] Don't show jabber in profile if jabber is disabled 
PHPBB3-13300
 2014-11-09 02:22:39 +01:00
Oliver Schramm
e502c8db86 [ticket/13100] Remove pointless variable 
PHPBB3-13100
 2014-11-04 00:46:06 +01:00
Nils Adermann
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
Marc Alexander
a9249bce5e [ticket/13248] Always use provider collection for getting provider 
PHPBB3-13248
 2014-11-01 21:54:21 +01:00
Nils Adermann
3f3c8d74e8 [prep-release-3.1.1] Update version number to 3.1.1 2014-11-01 18:47:56 +01:00
Joas Schilling
0682e5719d Merge branch 'prep-release-3.1.0' into develop-ascraeus 2014-10-28 10:02:53 +01:00
Joas Schilling
679559ce18 Merge branch 'naderman-ticket/13232' into prep-release-3.1.0 2014-10-28 10:02:33 +01:00
Nils Adermann
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
rxu
16d78407db [ticket/13229] Fix overloading memberlist with redundant SQL queries 
PHPBB3-13229
 2014-10-27 17:01:29 -07:00
Nils Adermann
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
Nils Adermann
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
Joas Schilling
47759eb096 [ticket/13230] Add missing globals and missing request object for path helper 
PHPBB3-13230
 2014-10-27 14:54:17 +01:00
Andreas Fischer
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
Jakub Senko
79274e904c [ticket/13193] Swap ternary condition members 
PHPBB3-13193
 2014-10-26 08:44:21 +01:00
Nils Adermann
7a4b404af7 [develop-ascraeus] Update version number to 3.1.1-RC1-dev 2014-10-25 20:28:46 -07:00
Marc Alexander
81ad381263 [ticket/13207] Move default user notifications settings to user_add() 
PHPBB3-13207
 2014-10-25 14:57:01 -07:00
Marc Alexander
18f24a2270 [ticket/13207] Add default subscription options for newly registered users 
PHPBB3-13207
 2014-10-25 14:50:01 -07:00
Joas Schilling
80a9c24b6b [prep-release-3.1.0] Update version to 3.1.0 2014-10-23 12:22:02 +02:00
Joas Schilling
7a90184421 [prep-release-3.1.0-RC6] Update phpBB Version for RC7 development 2014-10-23 02:44:18 +02:00
Joas Schilling
d640a37984 [prep-release-3.1.0-RC6] Update version to 3.1.0-RC6 2014-10-23 01:48:38 +02:00
Joas Schilling
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
Cesar G
4d30633cd4 [ticket/security-161] Add form token to styles management form. 
SECURITY-161
 2014-10-22 15:46:00 -07:00
Marc Alexander
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
Nils Adermann
df72846b89 [ticket/13205] Explicitly cast ids to integers and reformat SQL 
PHPBB3-13205
 2014-10-22 18:35:07 -04:00
Nils Adermann
b5594371ab [ticket/13205] Remove superfluous newline 
PHPBB3-13205
 2014-10-22 18:31:29 -04:00
Nils Adermann
48dc4c02ae [ticket/13205] Add a mark all messages read link to PM folders 
PHPBB3-13205
 2014-10-22 18:02:43 -04:00
Marc Alexander
f796f92058 [ticket/security-159] Only show first 8 characters of login keys in UCP 
SECURITY-159
 2014-10-22 16:21:16 -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
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
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
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
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
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