1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 04:24:56 +02:00

287 Commits

Author SHA1 Message Date
Shitiz Garg
e51a5791dd [ticket/12730] Update maxlen for type_googleplus to 255
PHPBB3-12730
2014-06-21 03:51:08 +05:30
Shitiz Garg
e1454ec487 [ticket/12730] Minor formatting fixes
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
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
03c5de594e [ticket/12731] Add YouTube custom profile field
PHPBB3-12731
2014-06-20 19:21:57 +05:30
Shitiz Garg
deae22b85f [ticket/12733] Convert spaces to tabs
PHPBB3-12733
2014-06-20 19:21:35 +05:30
Shitiz Garg
04e43e2087 [ticket/12733] Fix spacing for block header in profilefield_twitter.php
PHPBB3-12733
2014-06-20 19:21:35 +05:30
Shitiz Garg
fac6ab1fd4 [ticket/12733] Add Twitter custom profile field
PHPBB3-12733
2014-06-20 19:21:35 +05:30
Shitiz Garg
2ba12a17b2 [ticket/12729] Convert spaces to tabs
PHPBB3-12729
2014-06-20 18:10:08 +05:30
Shitiz Garg
e127a4fcce [ticket/12729] Fix block header spacing for profilefield_facebook.php
PHPBB3-12729
2014-06-20 18:10:08 +05:30
Shitiz Garg
ab47798a3e [ticket/12729] Unnecessary whitespace in profilefield_facebook.php
PHPBB3-12729
2014-06-20 18:10:08 +05:30
Shitiz Garg
310b8af148 [ticket/12729] Add Facebook custom profile field
PHPBB3-12729
2014-06-20 18:10:08 +05:30
Shitiz Garg
da4b1d25a1 [ticket/12732] Use user info instead of chat as default Skype action
PHPBB3-12732
2014-06-20 16:37:42 +05:30
Shitiz Garg
28012dc9e1 [ticket/12732] Add Skype custom profile field
PHPBB3-12732
2014-06-20 16:37:42 +05:30
Andreas Fischer
5964ca21c2 Merge pull request #2525 from Nicofuma/ticket/12638
[ticket/12638] v30x\local_url_bbcode break the migrations if we don't use the auto updater

* Nicofuma/ticket/12638:
  [ticket/12638] Use require if phpbb_require_updated isn't available
2014-06-17 21:04:47 +02:00
Marc Alexander
2ca9e25bf2 [ticket/12712] Remove unneeded GROUP BY clause to fix query for mssql
PHPBB3-12712
2014-06-15 17:09:07 +02:00
Nils Adermann
694f8391c9 Merge remote-tracking branch 'github-marc1706/ticket/12352' into develop-ascraeus
* github-marc1706/ticket/12352: (33 commits)
  [ticket/12352] Do not check hashes that don't have the necessary length
  [ticket/12352] Update file headers to fit new format
  [ticket/12352] Use custom provider collection for auth providers
  [ticket/12352] Add checks for existing user_pass_convert to migrations
  [ticket/12352] Remove usages of user_pass_convert column
  [ticket/12352] Update schema json file
  [ticket/12352] Remove user_pass_convert column from database
  [ticket/12352] Check each newly added passwords driver in manager_test
  [ticket/12352] Add get_settings_only method to passwords driver base
  [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
  [ticket/12352] Add tests for wcf1 and wcf2 drivers
  [ticket/12352] Add driver for woltlab community framework 1 passwords
  [ticket/12352] Add driver for woltlab community framework 2 passwords
  [ticket/12352] Add missing $ to md5_mybb and md5_vb driver
  [ticket/12352] Fix spacing in passwords tests
  [ticket/12352] Add passwords driver for vB passwords
  [ticket/12352] Use correct hashing method in md5_mybb driver
  [ticket/12352] Add driver for myBB md5 passwords
  [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
  [ticket/12352] Add passwords driver for sha1 password hashes
  ...
2014-06-11 14:27:57 +02:00
Nils Adermann
b6232aa9b2 Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop-ascraeus
* github-nickvergessen/ticket/10073: (36 commits)
  [ticket/10073] Fix button descriptions
  [ticket/10073] Do not check disable boxes by default
  [ticket/10073] Store values with config_text in the ACP
  [ticket/10073] Move config values to config_text
  [ticket/10073] Fix request usage
  [ticket/10073] Deduplicate template variable names
  [ticket/10073] Get service from container
  [ticket/10073] Fix more "Contact Us" strings
  [ticket/10073] Move template code into the template
  [ticket/10073] Make contact page available when board is disabled
  [ticket/10073] Change name of the ACP module
  [ticket/10073] Deduplicate posting buttons code in ACP
  [ticket/10073] Use phpbb_validate_email to verify email address
  [ticket/10073] Add tests for new validate_email()
  [ticket/10073] Split email validation from email ban and taken checks
  [ticket/10073] Deduplicate the if statement
  [ticket/10073] Fallback to board_contact when contact page is disabled
  [ticket/10073] Remove language string from rebase conflict
  [ticket/10073] Add ACP module to add bbcode text for contact admin info
  [ticket/10073] Add new configs to the schema
  ...
2014-06-09 17:55:25 +02:00
Joas Schilling
e3c3a5d2a7 [ticket/10073] Do not check disable boxes by default
PHPBB3-10073
2014-06-09 01:36:19 +02:00
Marc Alexander
94b2b64ca1 [ticket/12352] Update file headers to fit new format
PHPBB3-12352
2014-06-01 21:36:53 +02:00
Marc Alexander
306beab4cb [ticket/12352] Add checks for existing user_pass_convert to migrations
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
dde9201975 [ticket/12352] Remove user_pass_convert column from database
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Marc Alexander
f78b99dce4 [ticket/12352] Add $CP$ prefix to passwords that need to be converted
Also set user_pass_convert to 0 in the process of doing so.

PHPBB3-12352
2014-06-01 21:31:04 +02:00
Tristan Darricau
f7b8043b43 [ticket/12638] Use require if phpbb_require_updated isn't available
PHPBB3-12638
2014-05-31 01:54:38 +02:00
Joas Schilling
0cfc0413ca [prep-release-3.1.0-b4] Add migration for 3.1.0-b4 2014-05-30 16:27:42 +02:00
Joas Schilling
634824e888 [ticket/12594] Fix file headers of new files
PHPBB3-12594
2014-05-30 15:29:10 +02:00
Joas Schilling
d3f65cd66e [ticket/10073] Add ACP module to add bbcode text for contact admin info
PHPBB3-10073
2014-05-29 02:14:38 +02:00
Joas Schilling
971b3f59bf [ticket/10073] Add configs for contact info text
PHPBB3-10073
2014-05-29 02:14:36 +02:00
Joas Schilling
fffb07fd91 [ticket/10073] Use namespaces and fix all class names
PHPBB3-10073
2014-05-29 02:14:29 +02:00
Tristan Darricau
8dc10d6971 [ticket/11366] Add $config['extension_force_unstable']
PHPBB3-11366
2014-05-28 22:19:03 +02:00
Yuriy Rusko
55e1f02151 [ticket/12594] Replace phpBB Group with phpBB Limited
PHPBB3-12594
2014-05-28 01:07:56 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Tristan Darricau
290a1b04c4 [ticket/12402] CAPTCHA plugin migration fails to detect missing plugins
PHPBB3-12402
2014-05-06 23:36:37 +02:00
Joas Schilling
eca1e582d0 [prep-release-3.1.0-b3] Add migration for 3.1.0-b3 2014-05-04 17:34:02 +02:00
Joas Schilling
b60108dc78 Merge pull request #2267 from prototech/ticket/10737
[ticket/10737] Add  live member search.

* prototech/ticket/10737:
  [ticket/10737] Remove loading indicator.
  [ticket/10737] Enforce allow_live_searches setting in memberlist.php.
  [ticket/10737] Add config setting to disable live searches.
  [ticket/10737] Add loading indicator and alert box code to simple_footer.html.
  [ticket/10737] Load core.js and ajax.js in simple_footer.html.
  [ticket/10737] Set the username as the input value instead of redirecting.
  [ticket/10737] Drop subsilver2 changes.
  [ticket/10737] Add a more generic live search implementation.
  [ticket/10737] Clean up memberlist.php.
  [ticket/10737] Use dropdown for search results container.
  [ticket/10737] Adding delayed keyup and removing target_blank.
  [ticket/10737] Using UTF-8 aware alternatives in PHP code.
  [ticket/10737] Removing obsolete code.
  [ticket/10737] Avoid hard-coding table row and use case-insensitive search.
  [ticket/10737] Removing unnecessary/obsolete code.
  [ticket/10737] Using JQuery events and JSON response.
  [ticket/10737] Code fixes in AJAX search feature
  [ticket/10737] Improvements over last commit
  [ticket/10737] Adding username suggestions in "Find a member" using AJAX
2014-05-03 16:39:31 +02:00
Nils Adermann
4f17d0653a Merge branch 'exreaction/ticket/11881' into develop-ascraeus
* exreaction/ticket/11881:
  [ticket/11881] Move convert_timezones_test to migrator
  [ticket/11881] Fix test filename
  [ticket/11881] Limit to 500
  [ticket/11881] Make sure user_timezone isn't converted twice
  [ticket/11881] Better split the timezone conversion into chunks; add test
  [ticket/11881] Timezone migration can take a long time
2014-05-02 14:46:25 +02:00
Nils Adermann
854854b60f Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into develop-ascraeus
* github-elsensee/ticket/stenudd/8558-2:
  [ticket/8558] Fix operator
  [ticket/8558] Fix field length in ACP
  [ticket/8558] Use only one variable and improve explain string
  [ticket/8558] Add config in migrations and schema_data
  [ticket/8558] Add display name in emails from board

Conflicts:
	phpBB/includes/functions_messenger.php
2014-05-02 12:49:07 +02:00
Nils Adermann
6e85b2acc7 Merge remote-tracking branch 'github-nickvergessen/ticket/11917' into develop-ascraeus
* github-nickvergessen/ticket/11917:
  [ticket/11917] Move OAuth Module to the bottom while installing
  [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend

Conflicts:
	phpBB/install/install_install.php
2014-04-24 11:33:00 +02:00
Cesar G
607698c884 [ticket/10737] Add config setting to disable live searches.
PHPBB3-10737
2014-04-23 09:11:40 -07:00
Oliver Schramm
809054abfd [ticket/8558] Add config in migrations and schema_data
PHPBB3-8558
2014-04-17 15:17:54 +02:00
Cesar G
3d1a07f8f0 [ticket/12121] Preserve link redirect counts when updating from 3.0.x.
PHPBB3-12121
2014-04-15 21:15:54 -07:00
Joas Schilling
57146ccdd1 [ticket/11917] Hide OAuth UCP Module when OAuth is not the selected backend
PHPBB3-11917
2014-04-12 11:50:54 +02:00
Dhruv
634e5cae0f Merge remote-tracking branch 'nickvergessen/ticket/12349' into develop-ascraeus
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/12349:
  [ticket/12349] Fix Sniffer for @license tag
  [ticket/12349] Update license header in several new files
2014-04-08 02:27:32 +05:30
Joas Schilling
f0176b5393 Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeus
* Marc/ticket/12150:
  [ticket/12150] Use correct license URL in prune shadow migrations file
  [ticket/12150] Remove 'after' for columns from migrations file
  [ticket/12150] Update schema files for prune shadow topics
  [ticket/12150] Use log service instead of add_log() function
  [ticket/12150] Use shorter column names for prune settings
  [ticket/12150] Add functional tests for pruning shadow topics
  [ticket/12150] Add missing space to query for shadow topics
  [ticket/12150] Add missing prune settings variables in acp_forums
  [ticket/12150] Add file and caller for pruning shadow topics
  [ticket/12150] Add prune columns to schema files and migration file
  [ticket/12150] Add options to acp
2014-04-06 22:26:27 +02:00
Marc Alexander
e83c6cb61d [ticket/12150] Use correct license URL in prune shadow migrations file
PHPBB3-12150
2014-04-05 11:14:41 +02:00
Joas Schilling
0a586258a2 [ticket/12349] Update license header in several new files
PHPBB3-12349
2014-04-03 15:42:36 +02:00
Marc Alexander
808c5277a9 [ticket/12150] Remove 'after' for columns from migrations file
PHPBB3-12150
2014-04-03 11:07:58 +02:00
Matt Friedman
025779ac62 [ticket/12337] Fix jQuery update migration file
PHPBB3-12337
2014-04-01 06:50:00 -07:00