makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
13165 commits 18 branches 192 tags 206 MiB
Commit graph

1203 commits

Author SHA1 Message Date
Vjacheslav Trushkin
23363efaaa [ticket/10563] Show deactivated styles below active styles in acp 
Separates active and deactivated styles in styles list in acp

PHPBB3-10563
 2012-01-02 21:07:40 +02:00
Unknown
656a8ece6f [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2012-01-02 19:10:27 +01:00
Andreas Fischer
69a725198b Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop 
* unknownbliss/ticket/9916:
  [ticket/9916] Updating header license and removing Version $Id$
 2012-01-02 17:54:54 +01:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2011-12-31 13:32:52 +00:00
Andreas Fischer
7e3724c3e1 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9681] Add password length to security settings
 2011-12-25 15:17:09 +01:00
Andreas Fischer
a45f03a5af Merge remote-tracking branch 'p/ticket/9681' into develop-olympus 
* p/ticket/9681:
  [ticket/9681] Add password length to security settings
 2011-12-25 15:16:25 +01:00
Andreas Fischer
71698996ca Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10428] Documentation for optionget/optionset functions.
  [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.
  [ticket/10428] Dispose of $this->keyvalues cache for optionget.
  [ticket/10428] Compare $data to false strictly.
 2011-12-25 15:13:02 +01:00
Andreas Fischer
b0fd3b2bf0 Merge remote-tracking branch 'p/ticket/10428' into develop-olympus 
* p/ticket/10428:
  [ticket/10428] Documentation for optionget/optionset functions.
  [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness.
  [ticket/10428] Dispose of $this->keyvalues cache for optionget.
  [ticket/10428] Compare $data to false strictly.
 2011-12-25 15:12:03 +01:00
Oleg Pudeyev
10453b6752 [ticket/10428] Documentation for optionget/optionset functions. 
PHPBB3-10428
 2011-12-25 01:51:32 -05:00
Oleg Pudeyev
99c102344e [ticket/10428] Use phpbb_optionget/set in optionget/set for DRYness. 
PHPBB3-10428
 2011-12-25 01:51:32 -05:00
Oleg Pudeyev
38c2d4da35 [ticket/10428] Compare $data to false strictly. 
Users may pass 0 or '' for $data, this should cause the
user-specified $data code path to be taken.

PHPBB3-10428
 2011-12-25 01:51:20 -05:00
Oleg Pudeyev
48463cba2e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10507] DBAL unit test
  [ticket/10507] Sort styles in acp

Conflicts:
	phpBB/includes/acp/acp_styles.php
 2011-12-24 00:57:36 -05:00
Oleg Pudeyev
519db8e3b2 Merge remote-tracking branch 'cyberalien/ticket/10507' into develop-olympus 
* cyberalien/ticket/10507:
  [ticket/10507] DBAL unit test
  [ticket/10507] Sort styles in acp
 2011-12-24 00:57:07 -05:00
David King
4baa2bb52c [ticket/10535] Removed email confirm field from acp_users module 
PHPBB3-10535
 2011-12-23 21:55:49 +00:00
Andreas Fischer
31ddac6091 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10546] Add missing argument to adm_back_link in acp_captcha.
 2011-12-23 12:53:34 +01:00
Igor Wiedler
7779dae2cc [ticket/9681] Add password length to security settings 
PHPBB3-9681
 2011-12-23 00:42:13 -05:00
Oleg Pudeyev
fa2edf5187 [ticket/10546] Add missing argument to adm_back_link in acp_captcha. 
PHPBB3-10546
 2011-12-23 00:26:26 -05:00
Oleg Pudeyev
3412a6d676 Merge remote-tracking branch 'imkingdavid/ticket/10541' into develop 
* imkingdavid/ticket/10541:
  [ticket/10541] Fixed empty drop-down menu bug
 2011-12-22 19:59:39 -05:00
David King
53617dfce5 [ticket/10541] Fixed empty drop-down menu bug 
PHPBB3-10541
 2011-12-21 03:28:00 +00:00
Andreas Fischer
124ff6c50a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10531] Disallow deleting of the last style

Conflicts:
	phpBB/includes/acp/acp_styles.php
 2011-12-16 16:19:22 +01:00
Andreas Fischer
8f690d3475 Merge branch 'prep-release-3.0.10' into develop-olympus 
* prep-release-3.0.10:
  [ticket/10531] Disallow deleting of the last style
 2011-12-16 16:17:40 +01:00
Joas Schilling
0cfa843677 [ticket/10531] Disallow deleting of the last style 
Regression from PHPBB3-9675 commit 0e02f5cb0b

PHPBB3-9675
PHPBB3-10531
 2011-12-15 23:17:16 +01:00
David King
a3e8d3b00b [ticket/10463] removed extra comma in malformed query in acp_styles.php 
PHPBB3-10463
 2011-12-15 13:22:04 +00:00
Vjacheslav Trushkin
cd4958f72c [ticket/10507] Sort styles in acp 
Sort styles by name in admin control panel

PHPBB3-10507
 2011-12-15 14:44:09 +02:00
Joas Schilling
b790d2e283 [ticket/10345] Add documentation and phpbb_ prefix to the new avatar functions 
PHPBB3-10345
 2011-11-30 21:03:29 +01:00
Joas Schilling
c4aa8d8401 [ticket/10345] Fix some last use cases of sprintf() to use $user->lang() 
PHPBB3-10345
 2011-11-25 15:10:50 -05:00
Joas Schilling
179662e949 [ticket/10345] Use the plural function in some more places. 
I added two function avatar_explanation_string() and avatar_error_wrong_size()
for easier handling of the "pixels"-languages, as they are used quite often.

PHPBB3-10345
 2011-11-25 15:10:49 -05:00
Joas Schilling
88ae40a4b1 [ticket/10345] Make use of the plural function in some basic places 
PHPBB3-10345
 2011-11-25 15:10:44 -05:00
Andreas Fischer
79443eb1d4 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10280] Change the display of user activation settings in the ACP.
 2011-11-25 18:15:00 +01:00
RMcGirr83
3ce5b1d386 [ticket/10280] Change the display of user activation settings in the ACP. 
Use a select box to be consistent with other settings.

PHPBB3-10280
 2011-11-25 01:27:44 -05:00
Igor Wiedler
d766ee3fe6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
  [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
  [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
  [ticket/10446] DRY X-AntiAbuse header addition.

Conflicts:
	phpBB/includes/ucp/ucp_register.php
 2011-11-20 18:45:56 +01:00
Andreas Fischer
37c7668193 [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers(). 
PHPBB3-10446
 2011-11-20 16:35:31 +01:00
Oleg Pudeyev
64d62038cd [ticket/10446] DRY X-AntiAbuse header addition. 
PHPBB3-10446
 2011-11-20 04:15:44 -05:00
Oleg Pudeyev
f33dcacabe Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10239] Correct undefined variable error.
  [ticket/10239] Add confirm box to backup restore.
 2011-11-19 21:54:20 -05:00
Oleg Pudeyev
fb43029935 Merge remote-tracking branch 'cs278/ticket/10239' into develop-olympus 
* cs278/ticket/10239:
  [ticket/10239] Correct undefined variable error.
  [ticket/10239] Add confirm box to backup restore.
 2011-11-19 21:52:43 -05:00
Chris Smith
810016ce94 [ticket/10239] Correct undefined variable error. 
PHPBB3-10239
 2011-11-18 21:29:02 +00:00
Nils Adermann
5f48f55cca [feature/extension-manager] Removing now unused acp_search code 
PHPBB3-10323
 2011-11-18 19:57:20 +01:00
Nils Adermann
addf81f62e Merge branch 'develop' into feature/extension-manager 
* develop: (93 commits)
  [ticket/10157] Add notification to update cpfs when installing a language.
  [ticket/10185] Always set board startdate on conversion
  [ticket/10419] Reword the language strings
  [ticket/9361] View correct error messages when editing account information
  [ticket/10457] Undefined variable $request, when print-viewing PMs
  [ticket/10452] Fix xHTML errors when print-viewing PMs
  [ticket/9066] Move regex into get_preg_expression function and add tests
  [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
  [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
  [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
  [ticket/10254] Remove subsilver2 as default style on theme.
  [ticket/10254] Remove style names from themes and fix some informations on it.
  [ticket/7138] Allow simple header and footer for trigger_error() messages
  [ticket/9066] Disallow some database prefix to prevent same errors and problems
  [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
  [ticket/10437] Do not display announcements that are waiting for approval
  [ticket/10087] Organize bans in acp_baninto optgroups
  [ticket/8616] Include old U_INBOX var for BC
  [ticket/10435] Remove global announcement from forums total topic count
  [ticket/10435] Readd local announcements to total topic count in viewforum
  ...

Conflicts:
	phpBB/install/database_update.php
 2011-11-18 19:14:06 +01:00
Nils Adermann
0d296785b2 [feature/extension-manager] Rename default methods to core methods on finder. 
There are now extension_ and core_ methods for all finder settings as well as
a generic method which overwrites both.

PHPBB3-10323
 2011-11-18 16:44:42 +01:00
Oleg Pudeyev
ff91c037c9 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10157] Add notification to update cpfs when installing a language.
 2011-11-17 12:46:00 -05:00
Oleg Pudeyev
aeb896399c Merge remote-tracking branch 'nickvergessen/ticket/10157' into develop-olympus 
* nickvergessen/ticket/10157:
  [ticket/10157] Add notification to update cpfs when installing a language.
 2011-11-17 12:44:04 -05:00
Joas Schilling
b2b057910e [ticket/10157] Add notification to update cpfs when installing a language. 
We currently just copy the language-strings from the default language. But the
admin should be reminded to change them.

PHPBB3-10157
 2011-11-17 10:28:16 +01:00
Andreas Fischer
512aee5124 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10419] Reword the language strings
  [ticket/10419] Reword some language strings, minor code changes
  [ticket/10419] Add mbstring PHP ini parameters checks to ACP
 2011-11-15 16:46:23 +01:00
Andreas Fischer
39f8592312 Merge remote-tracking branch 'rxu/ticket/10419' into develop-olympus 
* rxu/ticket/10419:
  [ticket/10419] Reword the language strings
  [ticket/10419] Reword some language strings, minor code changes
  [ticket/10419] Add mbstring PHP ini parameters checks to ACP
 2011-11-15 16:46:08 +01:00
Andreas Fischer
3dfb116942 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10087] Organize bans in acp_baninto optgroups
 2011-11-13 21:14:21 +01:00
Andreas Fischer
9553b2239c Merge remote-tracking branch 'igorw/ticket/10087' into develop-olympus 
* igorw/ticket/10087:
  [ticket/10087] Organize bans in acp_baninto optgroups
 2011-11-13 21:13:22 +01:00
Igor Wiedler
ac8db51c47 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10190] Do not show hint about permissions when editing forum settings.
 2011-11-13 16:09:12 +01:00
Igor Wiedler
00f792f16f Merge remote-tracking branch 'bantu/ticket/10190' into develop-olympus 
* bantu/ticket/10190:
  [ticket/10190] Do not show hint about permissions when editing forum settings.
 2011-11-13 16:08:19 +01:00
Igor Wiedler
edd5866a6e [ticket/10087] Organize bans in acp_baninto optgroups 
PHPBB3-10087
 2011-11-11 23:08:52 +01:00
rxu
2918fbc970 [ticket/10419] Reword some language strings, minor code changes 
PHPBB3-10419
 2011-11-05 01:02:40 +08:00