1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

15142 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
David King
901955e452 [ticket/11551] Fix error in system tab if get_remote_file returns empty string
Currently a debug error is thrown. With this patch, it fails without keeping
the admin from being able to access the rest of the System modules by showing
a nicer error "Failed to obtain latest version information."

PHPBB3-11551
2013-05-20 12:20:55 -04: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
Vjacheslav Trushkin
c25c17adb7 [feature/editor-code-tabs] Adjust code style to match guidelines
PHPBB3-11557
2013-05-20 18:49:52 +03: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
Vjacheslav Trushkin
a1993bc074 [feature/editor-code-tabs] Correctly calculate end tag location
PHPBB3-11557
2013-05-20 18:47:25 +03: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
Marc Alexander
cd1da92d85 [ticket/11538] Add optional switch as argument to hex colour validation
The value of $optional will decide whether an empty string will be
treated as incorrect input or if it is allowed. The optional argument
will default to false and therefore treat an empty string as incorrect
unless explicitly told to not do so.

PHPBB3-11538
2013-05-19 17:45:45 +02: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
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
Marc Alexander
7898dd9459 [ticket/11538] Limit comment in acp_groups to 80 characters per line
PHPBB3-11538
2013-05-19 15:13:37 +02:00
Marc Alexander
373e26ca74 [ticket/11538] Merge calls to validate_data() in acp_groups
PHPBB3-11538
2013-05-19 11:38:11 +02:00
Marc Alexander
b49ce5eb3a [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
PHPBB3-11538
2013-05-19 11:29:11 +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
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
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
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
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
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
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
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