Commit graph

14961 commits

Author SHA1 Message Date
Andreas Fischer
fc1c7211ab Merge remote-tracking branch 'nickvergessen/ticket/encryptedmind/11516' into develop
* nickvergessen/ticket/encryptedmind/11516:
  [ticket/11516] Upgrading the .live jquery function because it is deprecated.
2013-05-28 12:49:46 +02:00
Jesús Rafael Cova Huerta
7f82a95cb0 [ticket/11516] Upgrading the .live jquery function because it is deprecated.
I changed the .live function of jQuery for .on function because a user
reported that he had an error because of that, it showed that .live function
was deprecated, so I changed for .on that it's same but it work with new
jQuery versions.

PHPBB3-11516
2013-05-28 01:48:25 +02:00
Joas Schilling
a3c5809f94 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11578] Add missing underscore after 'validate' function prefix
2013-05-27 23:07:06 +02:00
marc1706
b75f67231f [ticket/11578] Add missing underscore after 'validate' function prefix
The underscore after the 'validate' function prefix for the older
functions was dropped by accident in PR #1407. This patch will add it
back.

PHPBB3-11578
2013-05-27 22:56:49 +02:00
Joas Schilling
0032651729 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11538] Cut functional tests down a bit as these are more expensive.
  [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.
  [ticket/11538] Add unit tests for phpbb_validate_hex_colour().
2013-05-27 11:52:44 +02:00
Andreas Fischer
401e9466bf [ticket/11538] Compare to '' instead of using empty(), so '0' does not pass.
PHPBB3-11538
2013-05-26 19:24:09 +02:00
Andreas Fischer
06379aece8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11538] Add optional switch as argument to hex colour validation
  [ticket/11538] Modify test colour values
  [ticket/11538] Limit comment in acp_groups to 80 characters per line
  [ticket/11538] Move group ID into abstract test class and add more test cases
  [ticket/11538] Merge calls to validate_data() in acp_groups
  [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
  [ticket/11538] Use abstract class for functional test cases for group colour
  [ticket/11538] Add function phpbb_validate_colour for validating colours
  [ticket/11538] Make sure regex doesn't allow multiple color values
  [ticket/11538] Add tests for acp group manage page
  [ticket/11538] Simplify colour value check and remove support for '#'
  [ticket/11538] Fix incorrect regex and test for duplicate # in color string
  [ticket/11538] Use regex for testing color value and improve tests
  [ticket/11538] Make sure group color can't exceed maximum of 6 characters

Conflicts:
	phpBB/includes/functions_user.php
	phpBB/styles/prosilver/template/ucp_groups_manage.html
2013-05-26 19:19:08 +02:00
Andreas Fischer
2b356e766f Merge remote-tracking branch 'marc1706/ticket/11538' into develop-olympus
* marc1706/ticket/11538:
  [ticket/11538] Add optional switch as argument to hex colour validation
  [ticket/11538] Modify test colour values
  [ticket/11538] Limit comment in acp_groups to 80 characters per line
  [ticket/11538] Move group ID into abstract test class and add more test cases
  [ticket/11538] Merge calls to validate_data() in acp_groups
  [ticket/11538] Rename phpbb_validate_colour to phpbb_validate_hex_colour
  [ticket/11538] Use abstract class for functional test cases for group colour
  [ticket/11538] Add function phpbb_validate_colour for validating colours
  [ticket/11538] Make sure regex doesn't allow multiple color values
  [ticket/11538] Add tests for acp group manage page
  [ticket/11538] Simplify colour value check and remove support for '#'
  [ticket/11538] Fix incorrect regex and test for duplicate # in color string
  [ticket/11538] Use regex for testing color value and improve tests
  [ticket/11538] Make sure group color can't exceed maximum of 6 characters
2013-05-26 18:24:29 +02:00
Oliver Schramm
bb67b07920 [ticket/11567] Renamed extension_manager variable to avoid fatal error
PHPBB3-11567
2013-05-26 13:12:13 +02:00
Andreas Fischer
64e2230d19 Merge remote-tracking branch 'cyberalien/ticket/11560' into develop
* cyberalien/ticket/11560:
  [ticket/11560] Fix jQuery link in installer
2013-05-24 22:00:10 +02:00
David King
4b0d51adea Merge remote-tracking branch 'EXreaction/ticket/11435-2' into develop
* EXreaction/ticket/11435-2:
  [ticket/11435] Enable spacing test as it should now pass
  [ticket/11435] Create new template filter option (cleanup)
2013-05-22 16:10:51 -04:00
Vjacheslav Trushkin
01fb9ea3e3 [ticket/11560] Fix jQuery link in installer
PHPBB3-11560
2013-05-22 21:05:25 +03:00
Nathaniel Guse
3ab222d1c7 Merge remote-tracking branch 'remotes/Senky/ticket/11010' into develop
# By Senky (19) and others
# Via Senky
* remotes/Senky/ticket/11010: (32 commits)
  [ticket/11010] properly tabifying 'max_autologin_time'
  [ticket/11010] resolving latest comments
  [ticket/11010] Fixes for number input in acp
  [ticket/11010] Fix input type for urls
  [ticket/11010] Fix email inputs
  [ticket/11010] updating tests
  [ticket/11010] dealing with dimensions problem, removing extra code
  [ticket/11010] Change input type to search for search forms
  [ticket/11010] Add all HTML5 input types to ACP
  [ticket/11010] Add HTML5 input types to installer
  [ticket/11010] validation to match type
  [ticket/11010] displaying min and max only if they are set
  [ticket/11010] fixing tests
  [ticket/11010] replacing maxlenght with max
  [ticket/11010] applying some of EXreaction notes
  [ticket/11010] Try to keep min < max.
  [ticket/11010] Mock user in order for the test to run standalone.
  [ticket/11010] Progress toward fixing the test suite.
  [ticket/11010] adding type="url" to 'site_home_url'
  [ticket/11010] fixing inputs types in memberlist_search.html
  ...
2013-05-21 09:49:53 -05:00
Senky
721bc03b2b [ticket/11010] properly tabifying 'max_autologin_time'
PHPBB3-11010
2013-05-21 11:57:33 +02:00
Senky
930f4c70ed [ticket/11010] resolving latest comments
PHPBB3-11010
2013-05-21 11:55:45 +02:00
Vjacheslav Trushkin
67053d0b4e [ticket/11279] Log error in console
PHPBB-11279
2013-05-20 22:12:20 +03:00
Vjacheslav Trushkin
a9c9448ebb [ticket/11279] Clearer AJAX errors
Display clearer AJAX errors rather than generic error

PHPBB3-11279
2013-05-20 21:35:51 +03:00
Nathan Guse
778658f787 Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/feature/editor-code-tabs:
  [feature/editor-code-tabs] Adjust code style to match guidelines
  [feature/editor-code-tabs] Correctly calculate end tag location
  [feature/editor-code-tabs] Allow tabs when typing code
2013-05-20 11:57:32 -05:00
Nathan Guse
421452e6fb Merge remote-tracking branch 'remotes/upstream/develop-olympus' into develop
# By David King
# Via David King (1) and Nathan Guse (1)
* remotes/upstream/develop-olympus:
  [ticket/11551] Fix error in system tab if get_remote_file returns empty string
2013-05-20 11:55:33 -05:00
Nathan Guse
c84fc97e90 [ticket/11435] Create new template filter option (cleanup)
This allows us to only run cleanup on the last run of template compilation
and not cleanup during event parsing

PHPBB3-11435
2013-05-20 11:45:32 -05:00
Vjacheslav Trushkin
3e64c1b5d7 [ticket/11010] Fixes for number input in acp
PHPBB3-11010
2013-05-20 18:42:11 +02:00
Vjacheslav Trushkin
cfa23c1102 [ticket/11010] Fix input type for urls
PHPBB3-11010
2013-05-20 18:42:10 +02:00
Vjacheslav Trushkin
504038d230 [ticket/11010] Fix email inputs
Add type="email" to fields that should be email fields
Change back to type="text" fields that might have wildcards or not necessary email

PHPBB3-11010
2013-05-20 18:42:09 +02:00
Senky
ae2700eef2 [ticket/11010] updating tests
PHPBB3-11010
2013-05-20 18:42:08 +02:00
Senky
4c03c22e50 [ticket/11010] dealing with dimensions problem, removing extra code
PHPBB3-11010
2013-05-20 18:42:06 +02:00
Vjacheslav Trushkin
178f23d4d8 [ticket/11010] Change input type to search for search forms
Change input type to search for search forms
Replace search placeholder JS with placeholder attribute
Add style for search placeholder

PHPBB3-11010
2013-05-20 18:42:05 +02:00
Vjacheslav Trushkin
06b7e424fc [ticket/11010] Add all HTML5 input types to ACP
Add all new HTML5 input types to functions_acp.php, handle them as text for now

PHPBB3-11010
2013-05-20 18:42:04 +02:00
Vjacheslav Trushkin
854b88d139 [ticket/11010] Add HTML5 input types to installer
Add new HTML5 input types to installer

PHPBB3-11010
2013-05-20 18:42:03 +02:00
Senky
3547b9738a [ticket/11010] validation to match type
PHPBB3-11010
2013-05-20 18:42:02 +02:00
Senky
05639b85ad [ticket/11010] displaying min and max only if they are set
PHPBB3-11010
2013-05-20 18:41:36 +02:00
Senky
6c0f3513d9 [ticket/11010] replacing maxlenght with max
PHPBB3-11010
2013-05-20 18:41:32 +02:00
Senky
cf9d407493 [ticket/11010] applying some of EXreaction notes
PHPBB3-11010
2013-05-20 18:40:12 +02:00
Senky
f75aa97282 [ticket/11010] adding type="url" to 'site_home_url'
PHPBB3-11010
2013-05-20 18:40:05 +02:00
Senky
97fb79bea9 [ticket/11010] fixing inputs types in memberlist_search.html
PHPBB3-11010
2013-05-20 18:40:03 +02:00
Senky
e6391acd69 [ticket/11010] adding type="number" to subsilver2
and removing it from prosilver wher it should not be.

PHPBB3-11010
2013-05-20 18:40:01 +02:00
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