mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity
23,610 Commits 17 Branches 190 Tags
Commit Graph

20311 Commits

Author SHA1 Message Date
Nils Adermann
4ffdb12938 Merge remote-tracking branch 'github-nicofuma/ticket/13280' into develop-ascraeus 
* github-nicofuma/ticket/13280:
  [ticket/13280] Output escaping for the symfony request object
  [ticket/13280] Add new tests
  [ticket/13280] Make the tests failing
  [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280"
 2014-11-16 16:50:15 +01:00
Tristan Darricau
0dfe1d0d8b [ticket/13280] Output escaping for the symfony request object 
PHPBB3-13280
 2014-11-16 16:45:19 +01:00
Tristan Darricau
e27b69f42a Merge pull request #3136 from marc1706/ticket/13332 
[ticket/13332] Pass user row to passwords manager check method

* marc1706/ticket/13332:
  [ticket/13332] Fix auth provider tests
  [ticket/13332] Remove useless $result assignment
  [ticket/13332] Pass user row to passwords manager check method
 2014-11-16 12:22:51 +01:00
Marc Alexander
9f9ce10f2f Merge pull request #3125 from lavigor/ticket/13318 
[ticket/13318] login_username needs to have the multibyte parameter set to true
 2014-11-13 01:02:49 +01:00
Marc Alexander
2f54ab0a24 Merge pull request #3137 from prototech/ticket/13209 
[ticket/13209] Fix loss of CPF language field values when switching steps
 2014-11-13 00:14:54 +01:00
Tristan Darricau
6d533d2f86 [ticket/13280] Revert "Merge pull request #3107 from marc1706/ticket/13280" 
This reverts commit a1b58d05d158ff7afd789c1b27821e17198f8d58, reversing
changes made to 0e772afb9db640e54e84cfccaddcf74f3edbb3fb.

PHPBB3-13280
 2014-11-12 15:42:23 +01:00
Marc Alexander
09ad1d529e Merge pull request #3139 from prototech/ticket/13239 
[ticket/13239] Ensure "Add files" button position is correctly calculated.
 2014-11-12 13:04:46 +01:00
Cesar G
430c6aa32f [ticket/13239] Ensure "Add files" button position is correctly calculated. 
PHPBB3-13239
 2014-11-11 17:30:34 -08:00
Cesar G
ec220d6494 [ticket/13209] Gather language field values for boolean CPF's in all steps. 
The user can move back and forth between all three steps and as such the lang
field data should be expected in all steps.

PHPBB3-13209
 2014-11-11 16:32:04 -08:00
Cesar G
3108d0b060 [ticket/13209] Fix expected request value of CPF language fields. 
Multiple languages can be edited, thus the expected value is an array.

PHPBB3-13209
 2014-11-11 16:28:06 -08:00
Marc Alexander
91f7d53d8e [ticket/13332] Remove useless $result assignment 
PHPBB3-13332
 2014-11-11 19:02:20 +01:00
Marc Alexander
040fc6dd0f [ticket/13332] Pass user row to passwords manager check method 
PHPBB3-13332
 2014-11-11 19:02:01 +01:00
Tristan Darricau
cd6085ebdc Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location.
 2014-11-11 15:29:58 +01:00
Andreas Fischer
9bd24e2efb [ticket/13324] Update sami/sami and fabpot/goutte for new zipball location. 
PHPBB3-13324
 2014-11-11 12:23:02 +01:00
Tristan Darricau
4dfd4e4cd3 Merge pull request #3112 from Elsensee/ticket/13083 
[ticket/13083] Fix language string NO_ENTRIES for logs

* Elsensee/ticket/13083:
  [ticket/13083] Fix language string NO_ENTRIES for logs
 2014-11-11 11:56:23 +01: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
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
Joas Schilling
7ab774bc8d Merge pull request #3121 from Elsensee/ticket/13300 
[ticket/13300] Don't show jabber in profile if jabber is disabled
 2014-11-09 14:50:06 +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
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
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
Cesar G
92c509bc48 Merge remote-tracking branch 'Elsensee/ticket/13265' into develop-ascraeus 
* Elsensee/ticket/13265:
  [ticket/13265] Don't show link to edit own profile to those without permission
 2014-11-08 13:53:11 -08: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
Marc Alexander
f432193e07 [ticket/13280] Remove unneeded str_replace in build_url() 
PHPBB3-13280
 2014-11-06 13:45:09 +01:00
Oliver Schramm
25a7c6e829 [ticket/13083] Fix language string NO_ENTRIES for logs 
The string was misleading because there does not
always have to be a period when viewing log entries.

PHPBB3-13083
 2014-11-05 21:16:04 +01:00
Oliver Schramm
307fa831d6 [ticket/13265] Don't show link to edit own profile to those without permission 
PHPBB3-13265
 2014-11-05 21:06:32 +01: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
6fd092b5df [ticket/13280] Correctly format user page for build_url() 
PHPBB3-13280
 2014-11-03 16:24:09 +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
aede89d408 [prep-release-3.1.1] Add 3.1.1 CHANGELOG 2014-11-02 00:20:44 +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