Commit graph

14907 commits

Author SHA1 Message Date
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
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
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
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
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
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
Joas Schilling
06edf15ac3 [ticket/11546] Fix is_absolute() throws E_NOTICE for empty string
PHPBB3-11546
2013-05-15 14:05:56 +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
Nathaniel Guse
05cd045923 [ticket/11413] Revert some cache service related changes from earlier
PHPBB3-11413
2013-05-13 00:56:08 -05:00
Nathaniel Guse
ad430ae406 [ticket/11413] $user should have been $this->user
PHPBB3-11413
2013-05-13 00:41:57 -05: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
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
7e70eec5a3 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11465 2013-05-12 22:41:00 +02:00
Nathaniel Guse
fe13b89dd4 Merge remote-tracking branch 'remotes/bantu/ticket/11452' into develop 2013-05-11 20:52:52 -05:00
Nathaniel Guse
393ed4a2d0 Merge remote-tracking branch 'remotes/cyberalien/ticket/10741' into develop 2013-05-11 20:15:53 -05:00
Vjacheslav Trushkin
858f644c38 [ticket/11533] Fix colspan and unnecessary tables
Fix colspan and remove unnecessary tables in notification
settings page in subsilver2.

PHPBB3-11533
2013-05-11 23:32:55 +03:00
Vjacheslav Trushkin
f129fdb559 [ticket/11533] Change list to table for notification settings
PHPBB3-11533
2013-05-11 23:32:23 +03:00
Vjacheslav Trushkin
b40c6fe46a [ticket/11533] Columns counter for notification settings
Add columns counter template variable. It counts number of
notification types + column for name + column for checkbox

PHPBB3-11533
2013-05-11 23:30:44 +03:00
Nathan Guse
f91f8666fd [ticket/11415] Send the extension base the finder rather than the manager
PHPBB3-11415
2013-05-10 14:01:31 -05:00
Nathan Guse
27b2bbb8ff [ticket/11415] Create function in finder find_from_extension
PHPBB3-11415
2013-05-10 13:58:55 -05:00