Commit graph

16513 commits

Author SHA1 Message Date
Vjacheslav Trushkin
9db0fa8856 [feature/editor-code-tabs] Make inTag function reusable
Change inTag function to reusable JS function that can check
for any BBCode

PHPBB3-11557
2013-05-22 20:52:15 +03:00
Vjacheslav Trushkin
809c51f30d [feature/editor-code-tabs] Check for browser support in function
Check for browser support and valid textarea in function instead of
before applying function.

PHPBB3-11557
2013-05-20 20:33:51 +03:00
Vjacheslav Trushkin
b2e5cc8934 [feature/editor-code-tabs] Apply code editor to everything
Move code editor from prosilver to assets
Apply code editor to subsilver2
Apply code editor to ACP elements where bbcode is allowed

PHPBB3-11557
2013-05-20 20:29:37 +03:00
Vjacheslav Trushkin
3dae0cfcae [feature/editor-code-tabs] Correctly count indentation on first line
Correctly count indentation on first line of code tag

PHPBB3-11557
2013-05-20 19:59:40 +03:00
Vjacheslav Trushkin
c25c17adb7 [feature/editor-code-tabs] Adjust code style to match guidelines
PHPBB3-11557
2013-05-20 18:49:52 +03:00
Vjacheslav Trushkin
a1993bc074 [feature/editor-code-tabs] Correctly calculate end tag location
PHPBB3-11557
2013-05-20 18:47:25 +03:00
Vjacheslav Trushkin
1e216319a7 [feature/editor-code-tabs] Allow tabs when typing code
Allow tabs when typing code in textarea
Keep indentation when typing code in textarea

PHPBB3-11557
2013-05-19 17:25:58 +03:00
David King
d8ed228ddf Merge remote-tracking branch 'EXreaction/ticket/11415' into develop
* EXreaction/ticket/11415:
  [ticket/11415] Add test for find_from_extension()
  [ticket/11415] Send the extension base the finder rather than the manager
  [ticket/11415] Create function in finder find_from_extension
  [ticket/11415] Fix ext.manager constructor in tests
  [ticket/11415] Make migrator/ext.manager dependencies of the base ext class
  [ticket/11415] Remove migrator dependency from extension manager
  [ticket/11415] Move migrator to base extension class from ext.manager
  [ticket/11415] Move while loop from ext manager to acp_extensions.php
2013-05-18 11:20:47 -04:00
Nathaniel Guse
367b3dac8c Merge remote-tracking branch 'remotes/blitze/ticket/11458' into develop 2013-05-18 07:01:51 -05: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
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
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
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
Joas Schilling
3f75534258 [ticket/11540] Add unit tests for is_absolute()
PHPBB3-11540
2013-05-14 18:27:09 +02:00
Nathan Guse
bcf7ea3310 Merge remote-tracking branch 'remotes/cyberalien/ticket/11533' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11533:
  [ticket/11533] Update unit tests
  [ticket/11533] Fix colspan and unnecessary tables
  [ticket/11533] Change list to table for notification settings
  [ticket/11533] Columns counter for notification settings
2013-05-12 18:56:34 -05:00
Nathan Guse
f93a750f28 Merge remote-tracking branch 'remotes/Marc/ticket/11465' into develop
# By Marc Alexander (8) and Joas Schilling (3)
# Via Marc Alexander
* remotes/Marc/ticket/11465:
  [ticket/11465] Increase count of disabled extensions to 5 in functional test
  [ticket/11465] Add disabled ext to allow proper testing of get_module_infos()
  [ticket/11465] Add tests for optional arguments of get_module_infos()
  [ticket/11465] Add comments explaining the tests
  [ticket/11465] Check if class exists before including info file
  [ticket/11465] Correctly set the root path for the test
  [ticket/11465] The info file does not have _info suffix
  [ticket/11465] Add phpBB module to test
  [ticket/11465] Move require_once() in unit test to the top of the file
  [ticket/11465] Add unit tests for acp_modules::get_module_infos()
  [ticket/11465] Use extension finder when adding extensions' acp modules
2013-05-12 18:49:23 -05:00
Nils Adermann
a42693e66d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.

Conflicts:
	phpBB/includes/functions.php
2013-05-12 23:09:41 +02:00
Nils Adermann
45e014d35d Merge pull request #1403 from bantu/ticket/11105
[ticket/11105] Add mandatory space to content part of meta http-equiv=re...
2013-05-12 14:05:53 -07:00
gamerchan
d680aac7c5 [ticket/11105] Added spaces between ; and "url=" to adhere to w3c conventions.
There was no space between ; and the string "url=". But according to w3c, we
should have atleast one space between them. So, added space characters
accordingly.

PHPBB3-11105
2013-05-12 22:57:40 +02:00
Marc Alexander
bd6cebfe38 [ticket/11465] Increase count of disabled extensions to 5 in functional test
The ACP function test checks the amount of disabled extensions. Due to
the added disabled extension for the tests of the acp_modules method
get_module_infos(), this needed to be increased from 4 to 5.

PHPBB3-11465
2013-05-12 22:44:59 +02:00
Marc Alexander
7e70eec5a3 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465 2013-05-12 22:41:00 +02:00
Marc Alexander
f90ed6c3cb [ticket/11465] Add disabled ext to allow proper testing of get_module_infos()
This will now also enable us to test the $use_all_available parameter of
get_module_infos(), which will not only return the module infos for enabled
extensions but also those from disabled extensions.

PHPBB3-11465
2013-05-12 22:24:50 +02:00