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

1588 Commits

Author SHA1 Message Date
omniError
efd4b43c1b [ticket/13306] constructor sets error types 
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
 2014-11-11 20:20:52 -06:00
omniError
a143a19b8b [ticket/13306] add error level to collector 
https://tracker.phpbb.com/browse/PHPBB3-13306

PHPBB3-13306
 2014-11-10 18:05:18 -06:00
Marc Alexander
6a4cb42565 Merge pull request #3113 from prototech/ticket/13251 
[ticket/13251] Escape container parameters defined from config.php.
 2014-11-09 20:01:20 +01:00
Marc Alexander
10b628a20a Merge pull request #3120 from Elsensee/ticket/13301 
[ticket/13301] Fix called function in apche auth module
 2014-11-09 10:42:30 +01:00
Oliver Schramm
c4628bd92a [ticket/13301] Fix called function in apche auth module 
PHPBB3-13301
 2014-11-09 01:37:28 +01:00
Oliver Schramm
3fba5e317a [ticket/13243] Validate announcement entry for existence in version_helper 
PHPBB3-13243
 2014-11-09 01:21:40 +01:00
Joas Schilling
101945acf9 Merge pull request #3110 from Elsensee/ticket/13242 
[ticket/13242] Fix HTML validity
 2014-11-09 00:39:19 +01:00
Tristan Darricau
778e0e06f3 Merge pull request #3118 from prototech/ticket/13270 
[ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.

* prototech/ticket/13270:
  [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12.
 2014-11-07 15:19:35 +01:00
Cesar G
757e1eac7a [ticket/13270] Make m_softdelete perm global for boards updated from 3.0.12. 
PHPBB3-13270
 2014-11-07 02:31:11 -08:00
Cesar G
95140bb724 [ticket/13303] Speed up migration dependency calculation. 
PHPBB3-13303
 2014-11-07 02:30:44 -08:00
Cesar G
d60534d52c [ticket/13251] Escape container parameters defined from config.php. 
PHPBB3-13251
 2014-11-07 02:30:03 -08:00
Oliver Schramm
85031a66cc [ticket/13242] Fix HTML validity 
PHPBB3-13242
 2014-11-05 20:59:38 +01:00
Marc Alexander
32881dbe31 [ticket/13280] Only run sanitizer for server superglobal and modify tests 
PHPBB3-13280
 2014-11-04 16:54:45 +01:00
Marc Alexander
3986470b3c [ticket/13280] Seperate server sanitizer call and add comment 
PHPBB3-13280
 2014-11-04 16:14:11 +01:00
Marc Alexander
13b59af1ff [ticket/13280] Add additional sanitizer for ampersands in server superglobal 
PHPBB3-13280
 2014-11-03 17:27:01 +01:00
Marc Alexander
6cc7da0c9c [ticket/13280] Properly format the current page and add sanitizer to tests 
PHPBB3-13280
 2014-11-03 16:07:32 +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
Nils Adermann
b6a4f83c41 Merge remote-tracking branch 'github-security/ticket/security-164-alt' into prep-release-3.1.1 
* github-security/ticket/security-164-alt:
  [ticket/security-164] Correctly format page_name
  [ticket/security-164] Sanitize all global variables in symfony_request class
 2014-11-02 00:24:02 +01:00
Nils Adermann
c980402a4c Merge branch 'ticket/13271' into prep-release-3.1.1 
* ticket/13271:
  [ticket/13271] Disable CC sender feature for anonymous users
 2014-11-02 00:22:58 +01:00
Nils Adermann
27be69e3b3 [ticket/13271] Disable CC sender feature for anonymous users 
PHPBB3-13271
 2014-11-02 00:21:23 +01:00
Nils Adermann
4ae9e8cf6e [prep-release-3.1.1] Add 3.1.1 migration file 2014-11-02 00:08:21 +01:00
Nils Adermann
0843fd4b77 Merge remote-tracking branch 'github-marc1706/ticket/13263' into prep-release-3.1.1 
* github-marc1706/ticket/13263:
  [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
 2014-11-01 23:57:12 +01:00
Marc Alexander
7461536459 [ticket/13263] Make sure default style exists and clean up code 
PHPBB3-13263
 2014-11-01 23:53:58 +01:00
Marc Alexander
d1f85f0de3 [ticket/13263] Only install/set prosilver if no style available 
Users that have a nonexistent style selectd will revert back to the default
style.

PHPBB3-13263
 2014-11-01 23:53:53 +01:00
Marc Alexander
be8b5a41c8 [ticket/13263] Use prosilver as default style if user's style doesn't exist 
If prosilver is not installed for whatever reason, it will be installed by
the newly added migration.

PHPBB3-13263
 2014-11-01 23:53:48 +01:00
Marc Alexander
f534503a66 [ticket/security-164] Correctly format page_name 
SECURITY-164
 2014-11-01 22:43:28 +01:00
Marc Alexander
28ef238a5c [ticket/security-164] Sanitize all global variables in symfony_request class 
SECURITY-164
 2014-11-01 22:43:18 +01:00
Marc Alexander
d9c868d0f5 [ticket/13248] Correctly pass provider name 
PHPBB3-13248
 2014-11-01 21:54:27 +01:00
Marc Alexander
c3f5dc75be [ticket/13248] Allow specifying different auth provider in provider collection 
PHPBB3-13248
 2014-11-01 21:54:14 +01:00
Marc Alexander
6b057e026c [ticket/13248] Use auth provider collection for getting provider 
PHPBB3-13248
 2014-11-01 21:54:06 +01:00
Patrick Webster
c3aca59cfb [ticket/13268] Properly append ternary result in get_existing_indexes() 
PHPBB3-13268
 2014-11-01 19:12:28 +01:00
Andreas Fischer
bb4f65d743 Merge pull request #3076 from marc1706/ticket/12703 
[ticket/12703] Only query database for subscription types once

* marc1706/ticket/12703:
  [ticket/12703] Only query database for subscription types once
 2014-10-29 15:09:55 +01:00
Joas Schilling
71c19f6eb7 Merge pull request #3091 from Nicofuma/ticket/13234-2 
Ticket/13234 2
 2014-10-28 12:56:47 +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
087a5363bb [ticket/13234-2] Correctly verify that user_id is set in user data array 
PHPBB3-13234-2
 2014-10-27 23:56:20 -07:00
Nils Adermann
3472b6c5bc [ticket/13234-2] Never allow autologin/remember me to modify the userid 
Ascraeus version of 64d97d0787 commit

PHPBB3-13234
 2014-10-27 19:58:32 -07:00
Nils Adermann
efe3aaaf0b Merge pull request #3085 from naderman/ticket/13227 
[ticket/13227] Properly handle curlwrapper headers in remote avatars
 2014-10-27 18:58:11 -07:00
Nils Adermann
df1212ce27 Merge pull request #3083 from Nicofuma/ticket/13231 
[ticket/13231] Update the dependencies of the migration contact_admin_form
 2014-10-27 18:51:47 -07:00
Nils Adermann
4e4c3de103 [ticket/13227] Properly handle curlwrapper headers in remote avatars 
Read a bit of the file to ensure header values are populated and then
handle headers in the nested array structure too.

PHPBB3-13227
 2014-10-27 16:49:30 -07:00
Joas Schilling
6380aea647 [ticket/13232] Fix more issues with TTL and global cache file 
PHPBB3-13232
 2014-10-28 00:34:51 +01:00
Tristan Darricau
47663a4ad3 [ticket/13231] Update the dependencies of the migration contact_admin_form 
PHPBB3-13231
 2014-10-27 23:45:24 +01:00
Nils Adermann
0cdd071230 [ticket/13232] Fix indentation 
PHPBB3-13232
 2014-10-27 15:45:24 -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
Marc Alexander
b295fa4f4f [ticket/13225] Prefix converted passwords with $CP$ in phpBB 3.0.5-RC1 
PHPBB3-13225
 2014-10-27 20:57:31 +01:00
Marc Alexander
6cc5160d60 [ticket/13225] Use passwords manager instead of phpbb_hash in migration 
PHPBB3-13225
 2014-10-26 17:14:34 -07:00
Marc Alexander
cb65cd363a [ticket/12703] Only query database for subscription types once 
PHPBB3-12703
 2014-10-26 13:56:34 -07:00
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
f2e9c62a97 [prep-release-3.1.0] Add 3.1.0 gold release migration 2014-10-25 17:03:50 -07:00