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

19039 Commits

Author SHA1 Message Date
Cesar G
74a37259f7 Merge remote-tracking branch 'PayBas/ticket/12608' into develop-ascraeus
* PayBas/ticket/12608:
  [ticket/12608] Change CSS classes to prevent styling conflicts
  [ticket/12608] Add subSilver
  [ticket/12608] Changed get_styling() to get_style_class()
  [ticket/12608] Remove somewhat redundant reported color style
  [ticket/12608] Improved LTR and various bugfixes
  [ticket/12608] Clean up whitespace
  [ticket/12608] Add styling (CSS class) options to notifications
  [ticket/12608] Updated tests
  [ticket/12608] Improve notifications drop-down menu styling in header
2014-06-22 15:44:06 -07:00
Andreas Fischer
4f2acbaed2 Merge pull request #2629 from nickvergessen/ticket/12747
[ticket/12747] Drop support for Firebird

* nickvergessen/ticket/12747:
  [ticket/12747] Remove some methods which are not used anymore
  [ticket/12747] Drop support for Firebird

Conflicts:
	phpBB/phpbb/db/driver/firebird.php
2014-06-22 23:41:14 +02:00
Joas Schilling
de04304e94 Merge pull request #2591 from rxu/ticket/12704
[ticket/12704] Improve the load time information in the footer when enabled

* rxu/ticket/12704:
  [ticket/12704] Improve the load time information in the footer when enabled
2014-06-22 23:09:21 +02:00
Joas Schilling
d3b3e9265c Merge pull request #2597 from Skouat/ticket/12714
[ticket/12714] Switching the description of radio buttons to align the correct description above the listbox

* Skouat/ticket/12714:
  [ticket/12714] Move "allow all forums" in its own dd-element
2014-06-22 23:01:32 +02:00
Joas Schilling
bb8be29fd5 Merge pull request #2575 from lucifer4o/ticket/12691
[ticket/12691] Add core.delete_pm to funtion delete_pm

* lucifer4o/ticket/12691:
  [ticket/12691] Comment change
  [ticket/12691] Change event to core.delete_pm_before
  [ticket/12691] Add core.delete_pm to funtion delete_pm
2014-06-22 22:59:37 +02:00
Joas Schilling
1e97502d90 Merge pull request #2586 from lucifer4o/ticket/12701
[Ticket/12701] Add events to user_add function

* lucifer4o/ticket/12701:
  [ticket/12701] Add change
  [ticket/12701] Rmove before event and expand modify_data
  [ticket/12701] Add events to user_add function
2014-06-22 22:57:40 +02:00
PayBas
1a3c1d5b9a [ticket/12608] Change CSS classes to prevent styling conflicts
PHPBB3-12608
2014-06-22 22:41:56 +02:00
Mario Skouat
a487fab0ea [ticket/12714] Move "allow all forums" in its own dd-element
PHPBB3-12714
2014-06-22 21:13:42 +02:00
Stanislav Atanasov
152d5fc263 [ticket/12701] Add change
Change back to since
Add change

PHPBB3-12701
2014-06-22 22:07:04 +03:00
Stanislav Atanasov
165c5f8f15 [ticket/12701] Rmove before event and expand modify_data
Removing core.user_add_before
Adding $user_row and $cp_data to core.user_add_modify_data

PHPBB3-12701
2014-06-22 22:07:04 +03:00
Stanislav Atanasov
dd075e4bbc [ticket/12701] Add events to user_add function
Add two new events to user_add function
in ./includes/functions_user.php.

core.user_add_before - allow modification of
submitted to function data.
Returns:
@var array $user_row - user_row array - User array
@var array $cp_data - cp_data array - CPF array

core.user_add_after - return user_id, user_row and
cp_data after user registration
Returns:
@var int $user_id - user_id of the new user
@var array $user_row - user_row array - User array
@var array $cp_data - cp_data array - CPF array

Justification:
Allow extensions to parse data before and after
creation of the user.

PHPBB3-12701
2014-06-22 22:07:04 +03:00
Stanislav Atanasov
992fb8e452 [ticket/12691] Comment change
Change a bit the core event comment

PHPBB3-12691
2014-06-22 22:03:01 +03:00
Stanislav Atanasov
e8dd7904e9 [ticket/12691] Change event to core.delete_pm_before
Just a requested change by nickvergessen

PHPBB3-12691
2014-06-22 22:03:00 +03:00
Stanislav Atanasov
cd31aea4be [ticket/12691] Add core.delete_pm to funtion delete_pm
Add core.delete_pm to funtion delete_pm.
Event will return:
int $user_id - ID of the user requested the message delete
array $msg_ids - array of all messages to be deleted
int $folder_id - ID of the user folder where the messages are stored
Justification:
Allow extensions to capture this event
and act as intended by ext author

PHPBB3-12691
2014-06-22 22:03:00 +03:00
Joas Schilling
80ac276971 Merge pull request #2530 from PayBas/ticket/12646
[ticket/12646] Add data-# attribute to breadcrumb links

* PayBas/ticket/12646:
  [ticket/12646] Changed to navlinks.MICRODATA
  [ticket/12646] Add check for navlinks.FORUM_ID
  [ticket/12646] Changed index/home data attr & updated subsilver
  [ticket/12646] Add data-f attribute to breadcrumb links
2014-06-22 20:50:23 +02:00
Joas Schilling
b41a730471 Merge pull request #2635 from PayBas/ticket/12758
[ticket/12758] Add show_results var to core.search_modify_rowset

* PayBas/ticket/12758:
  [ticket/12758] Add @changed to doc block
  [ticket/12758] Add show_results var to core.search_modify_rowset
2014-06-22 20:42:14 +02:00
Joas Schilling
d421187cb6 Merge pull request #2638 from VSEphpbb/ticket/12332
[ticket/12332] Fix plupload attachments with long names

* VSEphpbb/ticket/12332:
  [ticket/12332] Fix plupload attachments with long names overflow
2014-06-22 20:38:22 +02:00
Joas Schilling
92a385dea6 Merge pull request #2617 from hanakin/ticket/12740
[ticket/12740] Use .logo instead of #logo in css

* hanakin/ticket/12740:
  [ticket/12740] Use class for logo in css
2014-06-22 20:10:13 +02:00
Joas Schilling
eddf77d2c2 Merge pull request #2632 from Dragooon/ticket/12753
[ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUAION

* Dragooon/ticket/12753:
  [ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUATION
2014-06-22 20:00:19 +02:00
Matt Friedman
bd7fdb32cf [ticket/12332] Fix plupload attachments with long names overflow
PHPBB3-12332
2014-06-22 10:58:00 -07:00
Joas Schilling
7afc13b4db Merge pull request #2615 from Dragooon/ticket/12730
[ticket/12730] Add Google+ profile field

* Dragooon/ticket/12730:
  [ticket/12730] Update Google+ button class to use proper identification
  [ticket/12730] Update maxlen for type_googleplus to 255
  [ticket/12730] Fix type_googleplus_test to use same validation rule as the field
  [ticket/12730] Update field_length to be 20 by default for Google+
  [ticket/12730] Google+ field_order should be 13
  [ticket/12730] Switch service name to googleplus for type_googleplus
  [ticket/12730] Restore field_length to 10 for type_googleplus
  [ticket/12730] Add functional test for Google+ field
  [ticket/12730] Value shouldn't be escaped for schema_data.sql
  [ticket/12730] Missing newline at type_googleplus_test.php
  [ticket/12730] Set field_active to 1 for Google+ field
  [ticket/12730] Add unit test for type_googleplus
  [ticket/12730] Add missing brackets to type_googleplus.php
  [ticket/12730] Update field_order for Google+ CPF
  [ticket/12730] Use string template for Google+ CPF instead of a new one
  [ticket/12730] Minor formatting fixes
  [ticket/12730] Incorrect indentation for type_googleplus
  [ticket/12730] Spaces in block header
  [ticket/12730] Add a Google+ field by default
  [ticket/12730] Add Google+ profile field type
2014-06-22 19:40:56 +02:00
Andreas Fischer
afe9d3c3f3 Merge pull request #2630 from Nicofuma/ticket/12723
[ticket/12723] Add Sniff ensuring PHP files use the correct file header

* Nicofuma/ticket/12723:
  [ticket/12723] Do not mention too many details on documentation.
  [ticket/12723] Do not reference the coding guidelines section.
  [ticket/12757] Add a Code Sniffer ruleset for PHP files of phpBB extensions
  [ticket/12723] Properly describe new Code Sniffer rulsets.
  [ticket/12723] Use core suffix in filename instead of phpbb in the middle.
  [ticket/12723] Add Sniff ensuring PHP files use the correct file header
2014-06-22 11:35:13 +02:00
PayBas
e5b7414589 [ticket/12758] Add @changed to doc block
PHPBB3-12758
2014-06-22 10:23:41 +02:00
PayBas
22966927ea [ticket/12758] Add show_results var to core.search_modify_rowset
PHPBB3-12758
2014-06-22 02:43:24 +02:00
Tristan Darricau
32a2c95f90 [ticket/12723] Add Sniff ensuring PHP files use the correct file header
PHPBB3-12723
2014-06-22 00:45:34 +02:00
Tristan Darricau
89a7a55190 [ticket/12756] Fix mysqli_fetch_assoc on hhvm
PHPBB3-12756
2014-06-21 16:50:17 +02:00
Shitiz Garg
6b90a0d095 [ticket/12753] Add invalid chars string for ALPHA_DOTS and ALPHA_PUNCTUATION
PHPBB3-12753
2014-06-21 04:03:43 +05:30
Shitiz Garg
d4679e6a95 [ticket/12730] Update Google+ button class to use proper identification
PHPBB3-12730
2014-06-21 03:55:09 +05:30
Shitiz Garg
e51a5791dd [ticket/12730] Update maxlen for type_googleplus to 255
PHPBB3-12730
2014-06-21 03:51:08 +05:30
Shitiz Garg
72f3ff2dcc [ticket/12730] Update field_length to be 20 by default for Google+
PHPBB3-12730
2014-06-21 03:48:23 +05:30
Shitiz Garg
4b49d451aa [ticket/12730] Google+ field_order should be 13
PHPBB3-12730
2014-06-21 03:42:38 +05:30
Shitiz Garg
985dbd4482 [ticket/12730] Switch service name to googleplus for type_googleplus
PHPBB3-12730
2014-06-21 03:35:19 +05:30
Shitiz Garg
83966a575b [ticket/12730] Restore field_length to 10 for type_googleplus
PHPBB3-12730
2014-06-21 03:35:19 +05:30
Shitiz Garg
4690709212 [ticket/12730] Value shouldn't be escaped for schema_data.sql
PHPBB3-12730
2014-06-21 03:33:02 +05:30
Shitiz Garg
9c18df8690 [ticket/12730] Set field_active to 1 for Google+ field
PHPBB3-12730
2014-06-21 03:32:34 +05:30
Shitiz Garg
474dc57782 [ticket/12730] Add missing brackets to type_googleplus.php
PHPBB3-12730
2014-06-21 03:31:45 +05:30
Shitiz Garg
b516da649f [ticket/12730] Update field_order for Google+ CPF
PHPBB3-12730
2014-06-21 03:31:45 +05:30
Shitiz Garg
1363dccf12 [ticket/12730] Use string template for Google+ CPF instead of a new one
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Shitiz Garg
e1454ec487 [ticket/12730] Minor formatting fixes
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Shitiz Garg
d15706bff5 [ticket/12730] Incorrect indentation for type_googleplus
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Shitiz Garg
0e04748d7f [ticket/12730] Spaces in block header
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Shitiz Garg
ab83995f44 [ticket/12730] Add a Google+ field by default
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Shitiz Garg
3cebb18ce8 [ticket/12730] Add Google+ profile field type
Google+ has a "+" before a custom URL but doesn't for those which are using
their integer ID. To cover that we need to have an extra profile field

PHPBB3-12730
2014-06-21 03:29:31 +05:30
Joas Schilling
18bf45ab1b Merge pull request #2628 from Dragooon/ticket/12731
[ticket/12731] Add YouTube custom profile field

* Dragooon/ticket/12731:
  [ticket/12731] Add functional test for youtube field
  [ticket/12731] Set field_active to 1 for YouTube field
  [ticket/12731] Add YouTube custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
2014-06-20 23:42:54 +02:00
Joas Schilling
3c38fcce40 Merge pull request #2621 from Dragooon/ticket/12732
[ticket/12732] Add Skype custom profile field

* Dragooon/ticket/12732:
  [ticket/12732] Update schema.json for Skype
  [ticket/12732] Add functional test for Skype profile field
  [ticket/12732] Values shouldn't be escaped for schema_data.sql
  [ticket/12732] Set field_active to 1 for Skype's field
  [ticket/12732] Add unit tests for ALPHA_PUNCTUATION
  [ticket/12732] Missing comma after validation definition
  [ticket/12732] Improve ALPHA_PUNCTUATION description
  [ticket/12732] Use user info instead of chat as default Skype action
  [ticket/12732] Add Skype custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
	tests/profilefields/type_string_test.php
2014-06-20 23:39:54 +02:00
Joas Schilling
b9890c6a4c Merge pull request #2612 from Dragooon/ticket/12733
[ticket/12733] Add Twitter custom profile field

* Dragooon/ticket/12733:
  [ticket/12733] Add functional test for twitter profile field
  [ticket/12733] Values needn't be escaped for schema_data.sql
  [ticket/12733] Set field_active to 1 for Twitter
  [ticket/12733] Convert spaces to tabs
  [ticket/12733] Fix spacing for block header in profilefield_twitter.php
  [ticket/12733] Update schema.json
  [ticket/12733] Add Twitter custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
2014-06-20 23:37:51 +02:00
Shitiz Garg
6b58f40663 [ticket/12732] Update schema.json for Skype
PHPBB3-12732
2014-06-21 01:16:37 +05:30
Shitiz Garg
27d761d08e [ticket/12730] Values needn't be escaped for schema_data.sql
PHPBB3-12730
2014-06-20 21:04:07 +05:30
Shitiz Garg
abc55dcb40 [ticket/12733] Values needn't be escaped for schema_data.sql
PHPBB3-12733
2014-06-20 21:03:04 +05:30
Shitiz Garg
01e05ccc6b [ticket/12732] Values shouldn't be escaped for schema_data.sql
PHPBB3-12732
2014-06-20 21:02:11 +05:30