mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-02 22:02:07 +02:00
Code Issues Releases Wiki Activity
23,431 Commits 18 Branches 192 Tags
Commit Graph

20205 Commits

Author SHA1 Message Date
rxu
5431aa6391 [ticket/13223] Fix USERNAME email template variable in notification 
admin_activate_user.php notification type is assigning usernames to email
template variables using user_loader->get_username() in 'no_profile' mode,
which in its turn calls get_username_string() function in 'no_profile' mode.
This causes HTML markup in emails for username colour.

PHPBB3-13223
 2014-10-26 12:47:57 -07:00
Joas Schilling
0d1d836a89 [ticket/13221] Add bot_update as a dependency to gold 
PHPBB3-13221
 2014-10-26 20:03:46 +01:00
Joas Schilling
79d782c1d5 [ticket/13221] Perform bot updates after user table changes 
PHPBB3-13221
 2014-10-26 19:57:08 +01:00
Nils Adermann
5cee745fc5 [prep-release-3.1.0] Add missing CHANGELOG entries for RC6 2014-10-25 18:10:30 -07:00
Nils Adermann
c789acc091 [prep-release-3.1.0] Add CHANGELOG for 3.1.0 2014-10-25 17:12:14 -07:00
Nils Adermann
f2e9c62a97 [prep-release-3.1.0] Add 3.1.0 gold release migration 2014-10-25 17:03:50 -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
Andreas Fischer
ad06f6dd71 [ticket/13215] Update Symfony components to v2.3.21. 
PHPBB3-13215
 2014-10-25 21:29:45 +02:00
Nils Adermann
4e952ad443 Merge commit '078e0c1e440f7f906b670348e8da00141e245876' into prep-release-3.1.0 
* commit '078e0c1e440f7f906b670348e8da00141e245876':
  [ticket/13211] Move console migrator output handler back to console folder
  [ticket/13211] Also use log wrapper output handler for console migrations
  [ticket/13211] Move console migrator output handler to db folder
  [ticket/13211] Add log wrapper for writing database updater to log file
  [ticket/13126] Add missing use statement
  [ticket/13126] Fix tests
  [ticket/13126] Change messages verbosity levels
  [ticket/13126] Move migrator_output_handler to an interface
  [ticket/13126] Extends migrator_output_handler instead of using a closure
  [ticket/13126] Improve the feedback when running the migrations
 2014-10-25 12:09:20 -07:00
Marc Alexander
078e0c1e44 [ticket/13211] Move console migrator output handler back to console folder 
PHPBB3-13211
 2014-10-25 12:03:13 -07:00
Marc Alexander
8443463006 [ticket/13211] Also use log wrapper output handler for console migrations 
PHPBB3-13211
 2014-10-25 11:55:15 -07:00
Andreas Fischer
a43879fe91 Merge pull request #3061 from Elsensee/ticket/13210 
[ticket/13210] Use the correct config value

* Elsensee/ticket/13210:
  [ticket/13210] Use the correct config value
 2014-10-25 19:48:33 +02:00
Oliver Schramm
a9a67b08a5 [ticket/13210] Use the correct config value 
PHPBB3-13210
 2014-10-25 14:28:56 +02:00
Marc Alexander
b27b9a6984 [ticket/13211] Move console migrator output handler to db folder 
PHPBB3-13211
 2014-10-24 13:33:26 -07:00
Marc Alexander
516bd9ea51 [ticket/13211] Add log wrapper for writing database updater to log file 
PHPBB3-13211
 2014-10-24 13:22:56 -07:00
Marc Alexander
14300a1475 Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211 2014-10-24 13:22:39 -07:00
Joas Schilling
1cd09a03e6 [prep-release-3.1.0] Prepare Changelog 2014-10-23 12:25:52 +02: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
5847a50334 [prep-release-3.1.0-RC6] Add changelog for 3.1.0-RC6 2014-10-23 01:57:59 +02:00
Joas Schilling
1ade9b39e4 [prep-release-3.1.0-RC6] Prepare Changelog 2014-10-23 01:55:48 +02:00
Joas Schilling
4c94e44710 [prep-release-3.1.0-RC6] Add migration for 3.1.0-RC6 2014-10-23 01:50:12 +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
0bc04a4df0 [ticket/13203] Use string_compare method in passwords drivers 
PHPBB3-13203
 2014-10-22 14:54:55 -05:00
Marc Alexander
2b47ef1266 [ticket/13203] Add method for byte by byte comparison to drivers helper 
PHPBB3-13203
 2014-10-22 14:54:22 -05:00
Tristan Darricau
fdece6cdf3 [ticket/13126] Add missing use statement 
PHPBB3-13126
 2014-10-22 15:25:50 +02:00
Marc Alexander
e43d1781bf Merge branch 'develop-olympus' into develop-ascraeus 
Conflicts:
	phpBB/docs/AUTHORS
 2014-10-21 19:24:48 -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
Marc Alexander
0de7adfa37 Merge pull request #3052 from VSEphpbb/ticket/13041 
[ticket/13041] Help_faq.php language file needs to be revised
 2014-10-21 18:53:51 -05:00
Jakub Senko
defeb1a56f [ticket/13194] Use correct array to access bbcode_bitfield 
PHPBB3-13194
 2014-10-21 22:21:48 +02:00
Matt Friedman
4b99ab7066 [ticket/13041] Final grammar and language changes to help_faq 
PHPBB3-13041
 2014-10-21 09:54:25 -07:00
Joas Schilling
9cf81ac7f5 [ticket/12120] Remove EXreaction from active authors 
PHPBB3-12120
 2014-10-21 18:17:59 +02:00
Nils Adermann
1358acfd7c Merge pull request #3049 from marc1706/ticket/13189 
[ticket/13189] Do not use confirm box for marking all notifications read
 2014-10-21 09:49:16 -04:00
Cesar G
b9b15b7007 [ticket/13070] Adjust template hook name to match that provided in the class. 
PHPBB3-13070
 2014-10-20 19:59:56 -07: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
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
Joas Schilling
75b6545bc2 Merge pull request #3040 from nickvergessen/ticket/13138-asc 
[3.1] Ticket/13138 Only use cookie data when we do not force a user_id

Conflicts:
	phpBB/phpbb/session.php
 2014-10-20 22:19:25 +02:00
Nils Adermann
973dfbf868 Merge pull request #3048 from naderman/ticket/13188 
[ticket/13188] Add missing where clause to post_id query in sphinx index
 2014-10-20 15:30:08 -04:00
Nils Adermann
99f63f39eb Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13138] Do not use cookie data and autologin while forcing a user_id

Conflicts:
	phpBB/phpbb/session.php
 2014-10-20 14:53:38 -04:00
Tristan Darricau
981d3005f3 [ticket/13126] Fix tests 
PHPBB3-13126
 2014-10-20 20:46:11 +02:00
Tristan Darricau
faf4b03c43 [ticket/13126] Change messages verbosity levels 
PHPBB3-13126
 2014-10-20 19:42:54 +02:00