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
24,444 Commits 17 Branches 190 Tags
Commit Graph

24444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
29d2a7bc9f Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/memberlist_email.html
 2014-11-02 01:29:04 +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
release-3.1.1 		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
Nils Adermann
dde1c7424f Merge pull request #3104 from marc1706/ticket/13248-alt 
[ticket/13248] Login functions need to use provider collection for retrieving provider
 2014-11-01 22:41:27 +01:00
Marc Alexander
8aec6b58e0 [ticket/13248] Use functional framework login method in tests 
PHPBB3-13248
 2014-11-01 21:54:34 +01:00
Marc Alexander
d9c868d0f5 [ticket/13248] Correctly pass provider name 
PHPBB3-13248
 2014-11-01 21:54:27 +01:00
Marc Alexander
a9249bce5e [ticket/13248] Always use provider collection for getting provider 
PHPBB3-13248
 2014-11-01 21:54:21 +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
Nils Adermann
f3588c66ec Merge branch 'ticket/13262' into prep-release-3.1.1 
* ticket/13262:
  [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
 2014-11-01 19:14:11 +01:00
Matt Friedman
a269929f0e [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 
PHPBB3-13262
 2014-11-01 19:14:00 +01:00
Nils Adermann
45d054d295 Merge branch 'ticket/13267' into prep-release-3.1.1 
* ticket/13267:
  [ticket/13267] Update Automatic Update instructions to include vendor directory
 2014-11-01 19:13:21 +01:00
Patrick Webster
8bdbadabb2 [ticket/13267] Update Automatic Update instructions to include vendor directory 
PHPBB3-13267
 2014-11-01 19:13:09 +01:00
Nils Adermann
2cc9fe5267 Merge branch 'ticket/13268' into prep-release-3.1.1 
* ticket/13268:
  [ticket/13268] Properly append ternary result in get_existing_indexes()
 2014-11-01 19:12:43 +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
Nils Adermann
3f3c8d74e8 [prep-release-3.1.1] Update version number to 3.1.1 2014-11-01 18:47:56 +01:00
Marc Alexander
9908f8e3ea Merge branch 'develop-ascraeus' into develop 2014-11-01 09:10:48 +01:00
Marc Alexander
a61299a940 Merge pull request #3098 from VSEphpbb/ticket/13262 
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
 2014-11-01 09:10:34 +01:00
Marc Alexander
03537e1b94 Merge branch 'develop-ascraeus' into develop 2014-11-01 09:08:47 +01:00
Marc Alexander
af77106a2f Merge pull request #3097 from prototech/ticket/13253 
[ticket/13253] Fix MCP queue link in active topics search.
 2014-11-01 09:08:11 +01:00
Matt Friedman
416577f3dc [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 
PHPBB3-13262
 2014-10-31 13:08:36 -07:00
Cesar G
65c3f2a8f1 [ticket/13253] Fix MCP queue link in active topics search. 
PHPBB3-13253
 2014-10-30 22:47:51 -07:00
Andreas Fischer
57afbbb48a Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13241] Remove sleep() and change flood interval instead
  [ticket/13241] Remove sleep() since the method takes care of this now
  [ticket/13241] Sleep for 1 second when posting twice in the same second
  [ticket/13241] Fix pagination with global announcements
  [ticket/13241] Correctly ignore announcements from topics list
  [ticket/13241] Add a functional test for viewforum with global announcement
 2014-10-29 15:10:40 +01:00
Andreas Fischer
17928563a2 Merge pull request #3093 from nickvergessen/ticket/13241 
[ticket/13241] Fix pagination of viewforum with global announcements

* nickvergessen/ticket/13241:
  [ticket/13241] Remove sleep() and change flood interval instead
  [ticket/13241] Remove sleep() since the method takes care of this now
  [ticket/13241] Sleep for 1 second when posting twice in the same second
  [ticket/13241] Fix pagination with global announcements
  [ticket/13241] Correctly ignore announcements from topics list
  [ticket/13241] Add a functional test for viewforum with global announcement
 2014-10-29 15:10:39 +01:00
Andreas Fischer
ae55db6da4 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12703] Only query database for subscription types once
 2014-10-29 15:09:55 +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
Andreas Fischer
c755aa91e8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12962] Rename setup-phpbb-test
  [ticket/12962] Use phpVersion in phpunit.xml
  [ticket/12962] Functional tests run for php <5.3.19
  [ticket/12962] Clean up composer.json
  [ticket/12962] Fix Line Endings in bootstrap
  [ticket/12962] Load composer test dependencies for php >= 5.3.19
  [ticket/12962] bootstrap functional and ui test when php >5.3.19
  [ticket/12962] Install test dependencies on travis
  [ticket/12962] Add facebook/webdriver dependency
  [ticket/12962] Fix whitespace characters
  [ticket/12962] Run tests for all databases on Travis
  [ticket/12962] Force language=en for UI tests installation
  [ticket/12962] Dump server output to /dev/null
  [ticket/12962] Start phantomjs on travis in background
  [ticket/12962] Mark test skipped when phantom server not running
  [ticket/12962] Add setup-phantomjs-server.sh
  [ticket/12962] Run UI tests on Travis-mysql
  [ticket/12962] Add UI tests to phpunit.xml.dist
  [ticket/12962] Add quick-links JS test
  [ticket/12962] Add initial class for ui_testing
 2014-10-29 15:09:22 +01:00
Andreas Fischer
932b75c166 Merge pull request #3065 from dhruvgoel92/feature/phantom 
[feature/phantom]

* dhruvgoel92/feature/phantom:
  [ticket/12962] Rename setup-phpbb-test
  [ticket/12962] Use phpVersion in phpunit.xml
  [ticket/12962] Functional tests run for php <5.3.19
  [ticket/12962] Clean up composer.json
  [ticket/12962] Fix Line Endings in bootstrap
  [ticket/12962] Load composer test dependencies for php >= 5.3.19
  [ticket/12962] bootstrap functional and ui test when php >5.3.19
  [ticket/12962] Install test dependencies on travis
  [ticket/12962] Add facebook/webdriver dependency
  [ticket/12962] Fix whitespace characters
  [ticket/12962] Run tests for all databases on Travis
  [ticket/12962] Force language=en for UI tests installation
  [ticket/12962] Dump server output to /dev/null
  [ticket/12962] Start phantomjs on travis in background
  [ticket/12962] Mark test skipped when phantom server not running
  [ticket/12962] Add setup-phantomjs-server.sh
  [ticket/12962] Run UI tests on Travis-mysql
  [ticket/12962] Add UI tests to phpunit.xml.dist
  [ticket/12962] Add quick-links JS test
  [ticket/12962] Add initial class for ui_testing
 2014-10-29 15:09:22 +01:00
Joas Schilling
1787ccb585 [ticket/13241] Remove sleep() and change flood interval instead 
PHPBB3-13241
 2014-10-29 14:17:15 +01:00
Joas Schilling
b868886b25 [ticket/13241] Remove sleep() since the method takes care of this now 
PHPBB3-13241
 2014-10-29 13:42:44 +01:00
Joas Schilling
e42202e794 [ticket/13241] Sleep for 1 second when posting twice in the same second 
PHPBB3-13241
 2014-10-29 13:42:43 +01:00