makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-02 16:18:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
31395 commits 18 branches 192 tags 207 MiB
Commit graph

1093 commits

Author SHA1 Message Date
Oliver Schramm
01df1d3301 [ticket/11863] Grey out unavailable activation methods when emails disabled 
Further fall back to USER_ACTIVATION_DISABLE when emails are disabled
but evaluate it at runtime.

PHPBB3-11863
 2014-10-17 15:40:03 +02:00
Joas Schilling
61601a052c Merge pull request #2942 from Senky/ticket/12489 
[ticket/12489] Description for Contact link in custom profile fields
 2014-10-07 11:41:47 +02:00
Jakub Senko
0c0024497d [ticket/12489] Language correction 
PHPBB3-12489
 2014-10-07 10:24:30 +02:00
Joas Schilling
4b90357d79 Merge pull request #2307 from PayBas/ticket/12408 
[ticket/12408] Add quick setting for "default guest style" to ACP
 2014-10-06 23:43:27 +02:00
Andreas Fischer
1b3109d650 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13086] String replaces 50 with 20

Conflicts:
	phpBB/language/en/acp/email.php
 2014-09-24 21:24:29 +02:00
Mario Skouat
077db77259 [ticket/13086] String replaces 50 with 20 
PHPBB3-13086
 2014-09-24 19:03:33 +02:00
Joas Schilling
f3fef8934e Merge pull request #2954 from rxu/ticket/13055 
[ticket/13055] Fix string profile fields validation to support unicode
 2014-09-24 12:25:57 +02:00
Joas Schilling
3066cd700a Merge pull request #2875 from PayBas/ticket/12961 
[ticket/12961] Add link in anti-spam ACP page which links directly to captchas in titania

* PayBas/ticket/12961:
  [ticket/12961] Shorten ext-db link text
  [ticket/12961] Fix missing phpBB.com
  [ticket/12961] Remove target="_blank" and switch to <strong>
  [ticket/12961] Add additional link to the KB
  [ticket/12961] Move link to language file
  [ticket/12961] Refactor lang entry
  [ticket/12961] Change url to anti-spam-ext
  [ticket/12961] Change url to https://www.phpbb.com/go/anti-spam/
  [ticket/12961] Add link in anti-spam ACP page to titania
 2014-09-18 14:23:41 +02:00
Jakub Senko
31e43ce124 [ticket/12489] Add notice about %s wildcard in FIELD_IS_CONTACT_EXPLAIN 
PHPBB3-12489
 2014-09-18 12:13:17 +02:00
Giampaolo Falqui
a2b5ec7e1b [ticket/13068] Language correction in FIELD_IS_CONTACT_EXPLAIN 
PHPBB3-13068
 2014-09-18 02:25:39 +02:00
rxu
dc65058c20 [ticket/13055] Add string profile fields validation options to support unicode 
PHPBB3-13055
 2014-09-18 08:19:08 +08:00
PayBas
5a780dfab1 [ticket/12408] Clarify the behavior of "override style" 
PHPBB3-12408
 2014-09-15 14:49:56 +02:00
PayBas
aaddf41e5b [ticket/12408] Changed lang vars, added fieldset and removed "default" 
PHPBB3-12408
 2014-09-15 14:43:40 +02:00
PayBas
265c621c9e [ticket/12408] Add quick setting for "default guest style" to ACP 
PHPBB3-12408
 2014-09-15 14:43:38 +02:00
PayBas
ab9cdcadfb [ticket/12961] Shorten ext-db link text 
PHPBB3-12961
 2014-08-26 12:45:54 +02:00
PayBas
5eea1ca44e [ticket/12961] Fix missing phpBB.com 
Don't know how that happened. Weird

PHPBB3-12961
 2014-08-23 12:32:43 +02:00
PayBas
f22ee4f73a [ticket/12961] Remove target="_blank" and switch to <strong> 
PHPBB3-12961
 2014-08-22 15:23:35 +02:00
PayBas
ca55f22c73 [ticket/12961] Add additional link to the KB 
PHPBB3-12961
 2014-08-21 20:05:55 +02:00
PayBas
45405a48a8 [ticket/12961] Move link to language file 
PHPBB3-12961
 2014-08-15 22:53:05 +02:00
PayBas
73426d2d30 [ticket/12961] Refactor lang entry 
PHPBB3-12961
 2014-08-14 22:22:20 +02:00
PayBas
55260127bd [ticket/12961] Add link in anti-spam ACP page to titania 
PHPBB3-12961
 2014-08-13 15:39:03 +02:00
Joas Schilling
f474e33a43 Merge pull request #2729 from Nicofuma/ticket/12847 
[ticket/12847] Allow the extensions to say if they can be enabled

* Nicofuma/ticket/12847:
  [ticket/12847] Allow the extensions to say if they can be enabled
 2014-08-07 13:00:08 +02:00
Andreas Fischer
e78a6046ca [ticket/12663] Have cli.php language file at top level; unrelated to ACP. 
PHPBB3-12663
 2014-07-17 16:54:42 +02:00
Carlo
f784510494 [ticket/12663] Extract CLI language string into their own file 
PHPBB3-12663
 2014-07-17 16:53:33 +02:00
Carlo
2ec50c0ff1 [ticket/12685] Add --safe-mode 
PHPBB3-12685
 2014-07-15 00:38:07 +02:00
Tristan Darricau
519e64205a [ticket/12847] Allow the extensions to say if they can be enabled 
PHPBB3-12847
 2014-07-13 18:09:34 +02:00
n-aleha
f2745d1e57 [ticket/12768] More fixes in language files 
More spaces converted to tabs for identation in language files.

PHPBB3-12768
 2014-07-08 02:09:10 +03:00
Joas Schilling
e3e0c79b7a [ticket/12515] Remove check for PostgreSQL 8.3+ 
PHPBB3-12515
 2014-07-06 19:31:46 +02:00
Crizzo
addcbb1585 [ticket/12807] New variables for _EXPLAIN 
PHPBB3-12807
 2014-07-06 00:28:25 +02:00
Crizzo
dbefb74abe [ticket/12807] Adds missing language variables language/en/acp/forums.php 
PHPBB3-12807
 2014-07-05 23:57:57 +02:00
Joas Schilling
7e769083bf [ticket/12196] Fix typo in "referrer" 
Referer is a typo in the HTTP RFC and should not be used in the UI

PHPBB3-12196
 2014-06-26 23:44:21 +02:00
Andreas Fischer
ffa1f9baf5 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12196] Revert Fix typo "referer" in acp/attachments
 2014-06-26 23:33:47 +02:00
Dhruv
a730c0291f [ticket/12196] Revert Fix typo "referer" in acp/attachments 
This reverts commit 9bc1f7924d.
https://tracker.phpbb.com/browse/PHPBB3-12196

PHPBB3-12196
 2014-06-27 00:07:15 +05:30
Dhruv
eb3e1b35d6 Merge branch 'develop-olympus' into develop-ascraeus 
# By Joas Schilling
# Via Dhruv (1) and Joas Schilling (1)
* develop-olympus:
  [ticket/12196] Fix typo "referer" in acp/attachments
 2014-06-26 23:30:06 +05:30
Joas Schilling
9bc1f7924d [ticket/12196] Fix typo "referer" in acp/attachments 
PHPBB3-12196
 2014-06-25 23:17:02 +02:00
Dhruv Goel
dfbe072d51 Merge pull request #2571 from Crizz0/ticket/12563 
[ticket/12563] Changes 2 style specific language variables for better understanding
 2014-06-23 22:04:20 +05:30
Crizzo
c4e48ed0b9 [ticket/12563] Adds &laquo; and &raquo; to the links in acp_styles.php 
PHPBB3-12563
 2014-06-22 22:02:46 +02:00
Shitiz Garg
ab83995f44 [ticket/12730] Add a Google+ field by default 
PHPBB3-12730
 2014-06-21 03:31:23 +05:30
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
Shitiz Garg
310b8af148 [ticket/12729] Add Facebook custom profile field 
PHPBB3-12729
 2014-06-20 18:10:08 +05:30
Shitiz Garg
9d3f437149 [ticket/12732] Improve ALPHA_PUNCTUATION description 
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
Crizzo
ff808b341c [ticket/12563] Removes ending . from <a> 
PHPBB3-12563
 2014-06-14 14:31:12 +02:00
Joas Schilling
e18365dc63 [ticket/12209] Notify the admin that OAuth still allows DB authentification 
PHPBB3-12209
 2014-06-13 14:00:34 +02:00
Crizzo
453cb70963 [ticket/12563] Removes strintf in acp_styles.php and shorts up <a> 
PHPBB3-12563
 2014-06-12 19:19:46 +02:00
Crizzo
3a48f76558 [ticket/12563] Changes 2 language variables to better understandable names 
PHPBB3-12563
 2014-06-10 20:29:30 +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
Marc Alexander
9a02dc3e27 [ticket/11331] Inform user that double dots will be stripped from avatar paths 
PHPBB3-11331
 2014-06-07 16:28:03 +02:00
Andreas Fischer
fc4275ab2b Merge pull request #2543 from Nicofuma/ticket/12655 
[ticket/12655] Run phpbbcli as a shell when --shell or -s is used

* Nicofuma/ticket/12655:
  [ticket/12655] Set register_container_commands as public
  [ticket/12655] Don't try to restore the definition in the help
  [ticket/12655] Fix coding style
  [ticket/12655] Make the --shell option available only for phpbbcli.php
  [ticket/12655] Fix coding style in \phpbb\console\application
  [ticket/12655] Set the arguments of \phpbb\console\application as required
  [ticket/12655] Don't require acp/common again in the commands
  [ticket/12655] Run the shell when --shell is used
 2014-06-06 19:49:29 +02:00
Etienne Baroux
088ce641be [ticket/12602] Fix language key removal. 
PHPBB3-12602
 2014-06-06 17:49:18 +02:00