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

19105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Nathaniel Guse
367b3dac8c Merge remote-tracking branch 'remotes/blitze/ticket/11458' into develop 2013-05-18 07:01:51 -05:00
Marc Alexander
0a5988ec1f [ticket/11538] Use abstract class for functional test cases for group colour 
PHPBB3-11538
 2013-05-17 18:31:17 +02:00
Marc Alexander
30e0b694e6 Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket/11538 2013-05-17 12:22:27 +02:00
Andreas Fischer
1c1452d758 Merge remote-tracking branch 'bantu/ticket/11547-develop' into develop 
* bantu/ticket/11547-develop:
  [ticket/11547] Add phpbb_db_driver_ prefix to DBMS names.
 2013-05-17 02:32:23 +02:00
Andreas Fischer
0a1ca4d3ea [ticket/11547] Add phpbb_db_driver_ prefix to DBMS names. 
PHPBB3-11547
 2013-05-17 02:31:25 +02:00
Andreas Fischer
2961994f16 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11542] Use Czech as example as it contains non-latin characters
  [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.
 2013-05-17 02:27:25 +02:00
Andreas Fischer
37a334c187 Merge remote-tracking branch 'bantu/ticket/11547' into develop-olympus 
* bantu/ticket/11547:
  [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager.
 2013-05-17 02:27:12 +02:00
Andreas Fischer
2c3e831128 Merge remote-tracking branch 'nickvergessen/ticket/11542-2' into develop-olympus 
* nickvergessen/ticket/11542-2:
  [ticket/11542] Use Czech as example as it contains non-latin characters
 2013-05-17 02:27:05 +02:00
Joas Schilling
1ee2543309 [ticket/11542] Use Czech as example as it contains non-latin characters 
PHPBB3-11542
 2013-05-17 02:13:51 +02:00
Andreas Fischer
d969203158 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11544] Add admin_login() method to 3.0 functional test case

Conflicts:
	tests/test_framework/phpbb_functional_test_case.php
 2013-05-17 01:31:41 +02:00
Andreas Fischer
555e89755e Merge remote-tracking branch 'marc1706/ticket/11544' into develop-olympus 
* marc1706/ticket/11544:
  [ticket/11544] Add admin_login() method to 3.0 functional test case
 2013-05-17 01:29:47 +02:00
Andreas Fischer
225aba976e [ticket/11547] Set MySQL charset to UTF8 in database_test_connection_manager. 
PHPBB3-11547
 2013-05-17 01:22:22 +02:00
Andreas Fischer
4a1eaab341 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11542] Add non-existing default value for language select
  [ticket/11542] Add lang_english_name to fixture
  [ticket/11542] Add unit tests for language_select()
 2013-05-17 00:38:09 +02:00
Andreas Fischer
f2fd0031f4 Merge remote-tracking branch 'nickvergessen/ticket/11542' into develop-olympus 
* nickvergessen/ticket/11542:
  [ticket/11542] Add non-existing default value for language select
  [ticket/11542] Add lang_english_name to fixture
  [ticket/11542] Add unit tests for language_select()
 2013-05-17 00:34:35 +02:00
Joas Schilling
92e1e86e5c [ticket/11542] Add non-existing default value for language select 
PHPBB3-11542
 2013-05-16 23:23:10 +02:00
Andreas Fischer
a87f9ffea8 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11536] Fixed incorrect removal of "install" in script_path
 2013-05-16 19:12:04 +02:00
Andreas Fischer
be71701af7 Merge remote-tracking branch 'galaxyAbstractor/ticket/11536' into develop-olympus 
* galaxyAbstractor/ticket/11536:
  [ticket/11536] Fixed incorrect removal of "install" in script_path
 2013-05-16 19:11:55 +02:00
Andreas Fischer
30f7c52dbb Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
 2013-05-16 17:46:19 +02:00
Andreas Fischer
8e3c2ebf8e Merge remote-tracking branch 'nickvergessen/ticket/11545' into develop-olympus 
* nickvergessen/ticket/11545:
  [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute
 2013-05-16 17:44:20 +02:00
Joas Schilling
38dbfc17a7 [ticket/11545] Remove DIRECTORY_SEPARATOR dependency from is_absolute 
The given path is an absolute path in general, just not on our current system.

PHPBB3-11545
 2013-05-16 17:30:23 +02:00
Marc Alexander
1715619fda [ticket/11538] Add function phpbb_validate_colour for validating colours 
It will be possible to use this function via the validate_data() function
interface that has already been used previously. Thus, this new function
will extend the capabilities of validate_data() to checking hex color
values.

PHPBB3-11538
 2013-05-16 13:22:43 +02:00
Vjacheslav Trushkin
1ea1247cd5 [ticket/10772] Remove unnecessary comment 
PHPBB3-10772
 2013-05-16 09:34:58 +03:00
Vjacheslav Trushkin
56ac97e819 [ticket/10772] Functional tests for forum style 
PHPBB3-10772
 2013-05-16 09:24:16 +03:00
Joas Schilling
14ab0ba594 [ticket/11542] Add lang_english_name to fixture 
PHPBB3-11542
 2013-05-15 15:18:28 +02:00
Victor Nagy
63f11a8024 [ticket/11536] Fixed incorrect removal of "install" in script_path 
Earlier the script would incorrectly remove the word "install"
from the script_path when trying to remove the last folder in the
path named "/install". This would lead to issues when the path
you are installing phpBB contained "install". For example
"/install_test/install" would become "/_test".

This change gets the parent folder instead of replacing all
"install". $name contains /install_test/install/index.php
from start and running dirname() gives /install_test/install.
Running dirname once more gives the parent folder of install,
/install_test.

PHPBB3-11536
 2013-05-15 14:49:46 +02:00
Andreas Fischer
fad37dd383 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11541] Add unit tests for style_select()
 2013-05-15 14:30:40 +02:00
Andreas Fischer
c6de880cdb Merge remote-tracking branch 'nickvergessen/ticket/11541' into develop-olympus 
* nickvergessen/ticket/11541:
  [ticket/11541] Add unit tests for style_select()
 2013-05-15 14:28:16 +02:00
Andreas Fischer
44c4c3ed98 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string
 2013-05-15 14:10:51 +02:00
Andreas Fischer
5c23ed57fe Merge remote-tracking branch 'nickvergessen/ticket/11546' into develop-olympus 
* nickvergessen/ticket/11546:
  [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string
 2013-05-15 14:10:40 +02:00
Joas Schilling
06edf15ac3 [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string 
PHPBB3-11546
 2013-05-15 14:05:56 +02:00
Andreas Fischer
c9b2b7cc32 Merge remote-tracking branch 'bantu/ticket/11540' into develop 
* bantu/ticket/11540:
  [ticket/11540] Add phpbb_ prefix in is_absolute_test from olympus.
 2013-05-15 13:52:48 +02:00
Andreas Fischer
fd3b257468 [ticket/11540] Add phpbb_ prefix in is_absolute_test from olympus. 
PHPBB3-11540
 2013-05-15 13:52:02 +02:00
Andreas Fischer
f7fa95f6fa Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11540] Add unit tests for is_absolute()
 2013-05-15 13:50:54 +02:00
Andreas Fischer
f2bc62ba75 Merge remote-tracking branch 'nickvergessen/ticket/11540' into develop-olympus 
* nickvergessen/ticket/11540:
  [ticket/11540] Add unit tests for is_absolute()
 2013-05-15 13:48:21 +02:00
Marc Alexander
204cdb2164 [ticket/11538] Make sure regex doesn't allow multiple color values 
This will now make sure that 'AAFF00' will be matched but strings like
'AAFF00 AABB00' will not.

PHPBB3-11538
 2013-05-15 12:30:05 +02:00
Nathan Guse
20815ed5a2 [ticket/11415] Add test for find_from_extension() 
PHPBB3-11415
 2013-05-14 18:56:16 -05:00
Marc Alexander
ac8e8a156a [ticket/11544] Add admin_login() method to 3.0 functional test case 
This method is needed in order to be able to properly test acp functions.

PHPBB3-11544
 2013-05-14 22:51:10 +02:00
Marc Alexander
cbe4a3c3b6 [ticket/11538] Add tests for acp group manage page 
This will currently test if the colour check properly works.

PHPBB3-11538
 2013-05-14 22:50:17 +02:00
Marc Alexander
deefe5c0e4 [ticket/11538] Simplify colour value check and remove support for '#' 
The input length for the hex color is now limited to 6 characters and
the support for colors starting with a '#' has been dropped. The allowed
input length of 7 in prosilver seems to have been a relict from old ages
of phpBB3. In order to have proper support for correct checking of the
colour value, the new code was also ported to the ACP groups manage page.
The tests have been modified to reflect the changes to the behavior of
the color check. Tests for the ACP will follow.

PHPBB3-11538
 2013-05-14 22:39:33 +02:00
Marc Alexander
1fae7720e4 [ticket/11538] Fix incorrect regex and test for duplicate # in color string 
PHPBB3-11538
 2013-05-14 21:27:25 +02:00
Joas Schilling
6900e8dae0 [ticket/11542] Add unit tests for language_select() 
PHPBB3-11542
 2013-05-14 20:32:36 +02:00
Joas Schilling
25be16748d [ticket/11541] Add unit tests for style_select() 
PHPBB3-11541
 2013-05-14 20:29:38 +02:00
Marc Alexander
a547ba3f9d [ticket/11538] Use regex for testing color value and improve tests 
We are now using a regex with preg_match() in order to properly check
if the entered color value is in hex color format or not. A proper
error message is triggered if an incorrect color value is entered and
the prepended '#' is removed if necessary.

PHPBB3-11538
 2013-05-14 19:44:55 +02:00
Joas Schilling
3f75534258 [ticket/11540] Add unit tests for is_absolute() 
PHPBB3-11540
 2013-05-14 18:27:09 +02:00
Marc Alexander
b7b0b0ccc3 [ticket/11538] Make sure group color can't exceed maximum of 6 characters 
In order to prevent future issues with this, a basic set of functional
tests for the UCP groups manage page have been added.

PHPBB3-11538
 2013-05-14 13:43:53 +02:00
Marc Alexander
84cfacf1f2 [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp 
The current look highly differed from the rest of the UCP. Additionally,
this caused the error message to be hardly noticeable at all.

PHPBB3-11537
 2013-05-14 12:18:40 +02:00
Vjacheslav Trushkin
0d8ba50b64 [ticket/11489] Template changes for new topiclist layout 
PHPBB3-11489
 2013-05-14 09:17:43 +03:00
Vjacheslav Trushkin
33521310c7 [ticket/11489] CSS changes for topiclist lists 
PHPBB3-11489
 2013-05-14 09:17:43 +03:00
Marc Alexander
6890bf9f8d [ticket/11535] Correctly merge avatar_errors array into primary error array 
The $avatar_errors array needs to be merged into the primary $error array
before the group settings get applied. This is currently not the case.
Functional tests for this will be provided by PR #1401.

PHPBB3-11535
 2013-05-13 12:17:31 +02:00
Marc Alexander
9c4d8b3193 [ticket/11531] Add acp and ucp groups functional tests for avatars 
The test for the acp and ucp groups settings are currently marked as
incomplete due to a bug that causes the settings to not show an error
when incorrect data is entered. However, the avatar data is not saved.
That means that even though the error treatment seems to correctly work,
the user is never informed of the issues with the submitted avatar data.

PHPBB3-11531
 2013-05-13 11:57:41 +02:00