1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

16565 Commits

Author SHA1 Message Date
Senky
beafabbcb3 [ticket/11010] adding type="number" and type="date" to prosilver
PHPBB3-11010
2013-05-20 18:39:59 +02:00
Senky
d6e239bdd9 [ticket/11010] adding type="number" to inputs in functions_profile_fields.php
PHPBB3-11010
2013-05-20 18:39:58 +02:00
Senky
8851597638 [ticket/11010] adding type="number" to CPF int type
PHPBB3-11010
2013-05-20 18:39:56 +02:00
Senky
8993fa940f [ticket/11010] fixing problems with 4th parameter in number type
PHPBB3-11010
2013-05-20 18:39:54 +02:00
Vinny
05ebbbcd6a [ticket/11010] Changing email and url types in adm templates
PHPBB3-11010
2013-05-20 18:39:53 +02:00
Vinny
90becaa1a2 [ticket/11010] yahoo and msn user search fields changed to email input type
PHPBB3-11010
2013-05-20 18:39:50 +02:00
Vinny
e09412db58 [ticket/11010] Changing email and url input types in subsilver2 templates
PHPBB3-11010
2013-05-20 18:39:49 +02:00
Vinny
ce6ae9a7eb [ticket/11010] Changing email and url input types in prosilver templates
PHPBB3-11010
2013-05-20 18:39:46 +02:00
Senky
49c1e0e348 [ticket/11010] adding type="number" in ACP; adding type="email" in install
PHPBB3-11010
2013-05-20 18:39:44 +02:00
Senky
4fe7ba5daf [ticket/11010] changing email and url input types in php files
PHPBB3-11010
2013-05-20 18:34:28 +02:00
Senky
66a943cfd8 [ticket/11010] adding new input types into build_cfg_template()
PHPBB3-11010
2013-05-20 18:34:26 +02:00
Nathan Guse
f26257dc51 Merge remote-tracking branch 'remotes/cyberalien/ticket/11558' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11558:
  [ticket/11558] Adjustments for notification link
  [ticket/11558] Fix styling for notifications link
2013-05-20 11:07:54 -05:00
David King
fedd9d18d2 Merge remote-tracking branch 'EXreaction/ticket/11413' into develop
* EXreaction/ticket/11413: (23 commits)
  [ticket/11413] Revert some cache service related changes from earlier
  [ticket/11413] Use phpbb_user in test
  [ticket/11413] $user should have been $this->user
  [ticket/11413] Fix unit tests
  [ticket/11413] Translate the error
  [ticket/11413] Rename file to something more helpful
  [ticket/11413] Remove remaining irrelevant code to this PR
  [ticket/11413] Remove mock sql_insert_buffer.php (not relevant to PR)
  [ticket/11413] Remove conversion of user_notifications
  [ticket/11413] Correct copyright year
  [ticket/11413] Remove changes for ticket 11420 from this branch
  [ticket/11413] Include mock class
  [ticket/11413] Don't use the database for the convert test
  [ticket/11413] Test get_notification_type_id and _ids functions
  [ticket/11413] Use sql_insert_buffer
  [ticket/11413] Create test for notification conversion
  [ticket/11413] Fix test fixtures and tests
  [ticket/11413] Fix some more tests
  [ticket/11413] Fix notification tests
  [ticket/11413] Prevent recursive function calls
  ...
2013-05-20 11:54:39 -04:00
Nathan Guse
9fab868f0f Merge remote-tracking branch 'remotes/cyberalien/ticket/11482' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11482:
  [ticket/11482] Use double quotes for code
  [ticket/11482] Unit tests for advanced DEFINE
  [ticket/11482] Implementation of advanced DEFINE tag
2013-05-20 10:47:45 -05:00
Nathan Guse
71c1973db9 Merge remote-tracking branch 'remotes/cyberalien/ticket/11489' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11489:
  [ticket/11489] IE7 adjustments
  [ticket/11489] Template changes for new topiclist layout
  [ticket/11489] CSS changes for topiclist lists
2013-05-20 10:08:49 -05:00
Nathan Guse
ee89a706f9 Merge remote-tracking branch 'remotes/cyberalien/ticket/11556' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11556:
  [ticket/11556] Load apply_onkeypress_event() correctly
  [ticket/11556] Remove fallback JS
2013-05-20 09:59:28 -05:00
Vjacheslav Trushkin
9954657712 [ticket/11558] Adjustments for notification link
PHPBB3-11558
2013-05-20 10:13:03 +03:00
Vjacheslav Trushkin
c29257f732 [ticket/11556] Load apply_onkeypress_event() correctly
PHPBB3-11556
2013-05-20 10:04:03 +03:00
Vjacheslav Trushkin
d09c6660a8 [ticket/11489] IE7 adjustments
PHPBB3-11489
2013-05-20 09:52:09 +03:00
Nathaniel Guse
c34118f93b Merge remote-tracking branch 'remotes/cyberalien/ticket/11554' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/11554:
  [ticket/11554] Move forum_fn.js to footer
2013-05-19 18:33:56 -05:00
Vjacheslav Trushkin
ac122cbb4e [ticket/11558] Fix styling for notifications link
PHPBB3-11558
2013-05-19 20:16:45 +03:00
Andreas Fischer
a0f76f73e9 Merge remote-tracking branch 'marc1706/ticket/11535' into develop
* marc1706/ticket/11535:
  [ticket/11535] Correctly merge avatar_errors array into primary error array
2013-05-19 16:20:40 +02:00
Andreas Fischer
f49be85859 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp

Conflicts:
	phpBB/styles/prosilver/template/ucp_groups_manage.html
2013-05-19 15:44:25 +02:00
Andreas Fischer
4fc180ade5 Merge remote-tracking branch 'marc1706/ticket/11537' into develop-olympus
* marc1706/ticket/11537:
  [ticket/11537] Adjust error message on ucp group manage to fit rest of ucp
2013-05-19 15:40:04 +02:00
Andreas Fischer
a70eedecde Merge remote-tracking branch 'cyberalien/ticket/11555' into develop
* cyberalien/ticket/11555:
  [ticket/11555] Fix page comparison
2013-05-19 13:50:51 +02:00
Vjacheslav Trushkin
a2a6357fd5 [ticket/11556] Remove fallback JS
PHPBB3-11556
2013-05-19 11:19:57 +03:00
Vjacheslav Trushkin
b8afef5df0 [ticket/11554] Move forum_fn.js to footer
Move forum_fn.js to footer, move find_username to forum_fn.js

PHPBB3-11554
2013-05-19 11:07:29 +03:00
Vjacheslav Trushkin
9435f16f59 [ticket/11555] Fix page comparison
Strict comparison should not be used to compare string and number

PHPBB3-11555
2013-05-19 10:56:15 +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