makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-20 02:08:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
18678 commits 18 branches 192 tags 207 MiB
Commit graph

18678 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marc Alexander
adff2fb254 [ticket/11548] Check upload avatar URL the same way as in phpBB 3.0 
The upload avatar URL was checked for its length in phpBB 3.0. Additionally,
starting with the new avatar system in phpBB 3.1, the URL was checked to
prevent improper URLs being submitted. This minor change is needed for proper
testing of the ucp and acp groups pages.

PHPBB3-11548
 2013-07-12 14:35:17 -04:00
Nathaniel Guse
41d8bfa974 [ticket/11667] Make functions abstract in includeasset 
Also comment properly

PHPBB3-11667
 2013-07-12 13:32:40 -05:00
Andreas Fischer
0d0338a55c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11548] Fix incorrect usage of array_map on acp groups page

Conflicts:
	tests/functional/common_groups_test.php
	tests/functional/ucp_groups_test.php
 2013-07-12 20:09:22 +02:00
Nathaniel Guse
1d55709e13 [ticket/11667] includeasset should be abstract 
PHPBB3-11667
 2013-07-12 12:56:00 -05:00
Andreas Fischer
67c10ca622 Merge remote-tracking branch 'marc1706/ticket/11548-develop-olympus' into develop-olympus 
* marc1706/ticket/11548-develop-olympus:
  [ticket/11548] Fix incorrect usage of array_map on acp groups page
 2013-07-12 19:53:45 +02:00
Marc Alexander
da8e35ac77 [ticket/11548] Fix incorrect usage of array_map on acp groups page 
The array_map was only ran on small parts of the actual error array instead
of the whole one. This resulted in the output of the language variables' names
rather than their actual value.

PHPBB3-11548
 2013-07-12 13:40:30 -04:00
Andreas Fischer
ac9dfd023c Merge remote-tracking branch 'EXreaction/ticket/11665' into develop 
* EXreaction/ticket/11665:
  [ticket/11665] Fix test class name
  [ticket/11665] Can't change file names already sent to set_filenames
 2013-07-12 19:15:25 +02:00
Nathaniel Guse
27b550ae66 [ticket/11665] Fix test class name 
PHPBB3-11665
 2013-07-12 12:10:57 -05:00
Andreas Fischer
e9eeff8b38 Merge remote-tracking branch 'EXreaction/ticket/11664' into develop 
* EXreaction/ticket/11664:
  [ticket/11664] Stop creating php.html file in root path in tests
 2013-07-12 19:01:20 +02:00
Nathaniel Guse
df3f0a212e [ticket/11664] Stop creating php.html file in root path in tests 
Also includephp_absolute.html

PHPBB3-11664
 2013-07-12 11:56:03 -05:00
Nathaniel Guse
7e20b71180 [ticket/11665] Can't change file names already sent to set_filenames 
PHPBB3-11665
 2013-07-12 11:47:34 -05:00
Nathan Guse
7e4acced85 Merge pull request #1526 from bantu/ticket/11662-develop 
[ticket/11662] Typos: occured -> occurred
 2013-07-12 09:05:02 -07:00
Andreas Fischer
25c37bcee7 Merge remote-tracking branch 'EXreaction/ticket/11660' into develop 
* EXreaction/ticket/11660:
  [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect)
 2013-07-12 17:56:28 +02:00
Andreas Fischer
658b378b63 [ticket/11662] Typos: occured -> occurred 
PHPBB3-11662
 2013-07-12 17:51:29 +02:00
Nathaniel Guse
193670d7a9 Merge branch 'develop-olympus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* develop-olympus:
  [ticket/11662] Typos: occured -> occurred

Conflicts:
	tests/template/template_test.php
 2013-07-12 10:37:52 -05:00
Nathaniel Guse
16aeaed7bd Merge remote-tracking branch 'remotes/bantu/ticket/11662' into develop-olympus 
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/11662:
  [ticket/11662] Typos: occured -> occurred
 2013-07-12 10:33:45 -05:00
Andreas Fischer
f4b7cbd976 [ticket/11662] Typos: occured -> occurred 
PHPBB3-11662
 2013-07-12 17:10:18 +02:00
Nathaniel Guse
fa8f62a604 [ticket/11420] Fix tests 
PHPBB3-11420
 2013-07-12 09:46:51 -05:00
Nathaniel Guse
be020646f4 [ticket/11660] Fix bugs from bugs in #11651 (missing vars, db->sql_connect) 
PHPBB3-11660
 2013-07-12 09:37:24 -05:00
Joas Schilling
e1bf87844b [ticket/9657] Remove last references to m_restore permission 
PHPBB3-9657
 2013-07-12 07:24:35 -04:00
David King
068d350652 [ticket/11215] Don't try to correct paths during tests 
PHPBB3-11215
 2013-07-12 00:03:06 -04:00
Joas Schilling
d43645adfa [ticket/9657] Fix english language :( 
PHPBB3-9657
 2013-07-11 22:46:34 -04:00
Joas Schilling
1911285b77 [ticket/9657] Notifications do not require emails or jabber anymore 
PHPBB3-9657
 2013-07-11 22:44:06 -04:00
Joas Schilling
003a104f93 [ticket/9657] Add type hints for classes 
PHPBB3-9657
 2013-07-11 22:41:24 -04:00
Joas Schilling
5ab0090e6c [ticket/9657] Remove sql_visibility as it is always non-empty 
PHPBB3-9657
 2013-07-11 22:35:55 -04:00
Joas Schilling
53c0647aed [ticket/9657] Use include instead of include_once 
PHPBB3-9657
 2013-07-11 22:16:45 -04:00
Joseph Warner
b9f33e5a87 [feature/auth-refactor] Add parent::setUp() in setUp() 
PHPBB3-9734
 2013-07-11 21:57:36 -04:00
David King
3a87a6b700 [ticket/11215] use global 
PHPBB3-11215
 2013-07-11 20:46:18 -04:00
David King
8b7aef6f93 Merge branch 'develop' into ticket/11215 
* develop: (176 commits)
  [feature/bootstrap-dic] Bootstrap container from config.php
  [ticket/11548] Use new static methods for request and submit
  [ticket/10772] Updating tests
  [ticket/10772] Remove 3.1 code
  [ticket/11388] Add newlines at EOF
  [ticket/11388] INCLUDECSS
  [ticket/11548] Run array_map on complete error array and not just colour_error
  [ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
  [ticket/11388] Do not append assets_version if using remote path (e.g. http)
  [ticket/11388] Fix typo
  [ticket/11388] Remove typehints (causing tests to fail)
  [ticket/11388] Disable cache if IN_INSTALL defined
  [ticket/11388] Do not modify by reference
  [ticket/11388] typehits
  [ticket/11388] INCLUDEJS test for //(url)
  [ticket/11388] INCLUDEJS supports //(url)
  [ticket/11388] Fixing includejs test
  [ticket/11388] includejs inherit from includeasset
  [feature/twig] Unit tests for includejs
  [ticket/8319] Add migration file for update change
  ...
 2013-07-11 20:43:41 -04:00
Joseph Warner
79f0866b78 [feature/auth-refactor] Changes 
PHPBB3-9734
 2013-07-11 18:49:56 -04:00
Joseph Warner
e5f1e0f984 [feature/auth-refactor] DataProvider for acp_board test 
PHPBB3-9734
 2013-07-11 18:36:09 -04:00
Nils Adermann
b1d3c1bf69 Merge pull request #1522 from igorw/feature/bootstrap-dic 
[feature/bootstrap-dic] Bootstrap container from config.php
 2013-07-11 15:28:26 -07:00
Joseph Warner
4bd676e4ae [feature/auth-refactor] Test selecting invalid provider as well 
PHPBB3-9734
 2013-07-11 18:26:57 -04:00
Joseph Warner
8b2ca35b54 [feature/auth-refactor] Code style change 
PHPBB3-9734
 2013-07-11 18:25:19 -04:00
Joseph Warner
0fbf8f8c81 [feature/auth-refactor] Move test classes into separate directory 
PHPBB3-9734
 2013-07-11 18:22:26 -04:00
Joseph Warner
c17f8a5d37 [feature/auth-refactor] Test that acp_board excludes invalid providers 
PHPBB3-9734
 2013-07-11 18:15:41 -04:00
Vjacheslav Trushkin
f5c2119e7c [ticket/11647] Always use & for URLs 
Remove code for URLs separated with ;
Add test case for mix of & and & in URLs

PHPBB3-11647
 2013-07-11 18:13:48 -04:00
Andreas Fischer
382ae5a01e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11548] Use new static methods for request and submit
  [ticket/11548] Run array_map on complete error array and not just colour_error

Conflicts:
	tests/functional/ucp_groups_test.php
 2013-07-12 00:11:18 +02:00
Joas Schilling
54012dfb2f [ticket/9657] Initialise variable outside of the loop 
PHPBB3-9657
 2013-07-11 18:04:56 -04:00
Igor Wiedler
1a5d685f45 [feature/bootstrap-dic] Bootstrap container from config.php 
PHPBB3-11651
 2013-07-11 18:04:40 -04:00
Joas Schilling
0e5e128174 [ticket/9657] Fix variable naming of phpEx to php_ext 
PHPBB3-9657
 2013-07-11 18:02:45 -04:00
Joseph Warner
f4f29a1c0a [feature/auth-refactor] Fix style issue 
PHPBB3-9734
 2013-07-11 17:43:53 -04:00
Joseph Warner
a64a042830 [feature/auth-refactor] Fix typo 
PHPBB3-9734
 2013-07-11 17:39:51 -04:00
Andreas Fischer
a7edbf9258 Merge remote-tracking branch 'marc1706/ticket/11548' into develop-olympus 
* marc1706/ticket/11548:
  [ticket/11548] Use new static methods for request and submit
  [ticket/11548] Run array_map on complete error array and not just colour_error
 2013-07-11 23:38:49 +02:00
Marc Alexander
2667c3a527 [ticket/11548] Use new static methods for request and submit 
PHPBB3-11548
 2013-07-11 17:34:34 -04:00
Marc Alexander
dc4687501a Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket/11548 2013-07-11 17:30:32 -04:00
Nils Adermann
bf43da75f8 Merge branch 'develop-olympus' into develop with no effect 
No changes!

* develop-olympus:
  [ticket/10772] Updating tests
  [ticket/10772] Remove 3.1 code
 2013-07-11 17:06:32 -04:00
Nathaniel Guse
9bfb567854 [ticket/11420] Fix tests 
PHPBB3-11420
 2013-07-11 15:58:02 -05:00
Vjacheslav Trushkin
94fc0cccdc [ticket/11647] Allow custom ports 
Allow custom port number in schema-relative URLs

PHPBB3-11647
 2013-07-11 16:56:10 -04:00
Nathaniel Guse
91165e0758 [ticket/11420] Fix tests 
PHPBB3-11420
 2013-07-11 15:49:32 -05:00