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

527 Commits

Author SHA1 Message Date
Andreas Fischer
04c0d6461f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.
2011-07-25 22:26:57 +02:00
Callum Macrae
f51b2f8fec [ticket/10292] Fixed a whitespace inconsistency in acp_ranks.
There is no space between the first radio button and "Yes", while there
is a space between the second radio button and "No". This commit fixes
that.

PHPBB3-10292
2011-07-25 21:08:26 +01:00
Igor Wiedler
136a932303 [ticket/10258] Remove the meta charset tag
The charset tag is useless, because if a charset content-type header is
present it takes precedence. And phpBB always sends such a header.

PHPBB3-10258
2011-07-12 01:32:00 +02:00
Igor Wiedler
854c14f9f6 [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags
These meta tags are IE specific and do not validate as HTML5.

PHPBB3-10258
2011-07-10 23:04:14 +02:00
Igor Wiedler
766537035e [ticket/10258] Change the DOCTYPE to HTML5
PHPBB3-10258
2011-07-09 17:04:46 +02:00
Nils Adermann
3fb9b62c69 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9859] Changing all phpBB footers to match the new credit line
  [ticket/9859] New footer copyright line with registered symbol
2011-07-06 21:52:05 -04:00
Yuriy Rusko
a275d17625 [ticket/9859] Changing all phpBB footers to match the new credit line
PHPBB3-9859
2011-07-06 21:46:33 -04:00
Andreas Fischer
7d5438eb03 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8138] Add autocomplete="off" to acp_board and ldap settings
  [ticket/8138] Add autocomplete="off" to a user and forum ACP.

Conflicts:
	phpBB/adm/index.php
2011-06-09 13:00:39 +02:00
Nils Adermann
4ddd116cd4 [ticket/8138] Add autocomplete="off" to a user and forum ACP.
PHPBB3-8138
2011-06-03 18:59:24 +02:00
Oleg Pudeyev
f9307531a7 Merge remote-tracking branch 'nickvergessen/ticket/8542' into develop
* nickvergessen/ticket/8542:
  [ticket/8542] Display custom profile fields in private messages

Conflicts:
	phpBB/install/database_update.php
2011-05-20 19:50:29 -04:00
Joas Schilling
8fa44cc3b9 [ticket/8542] Display custom profile fields in private messages
Introduce an option to display the cpf in the PM view.

PHPBB3-8542
2011-05-20 16:45:29 +02:00
Oleg Pudeyev
6ac6680639 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10154] Move "copy permissions from" to below "parent" on forum creation
2011-05-09 22:36:47 -04:00
Andreas Fischer
2d35e60443 [ticket/10154] Move "copy permissions from" to below "parent" on forum creation
Move "copy permissions from" to below "parent forum" in forum creation form.

PHPBB3-10154
2011-05-09 22:53:08 +02:00
Oleg Pudeyev
8fc748770a Merge branch 'feature/rxu/attachment-management-no-reassignment' into develop
* feature/rxu/attachment-management-no-reassignment:
  [feature/attachment-management-no-reassignment] Handle privacy and some more.
  [feature/attachment-management-no-reassignment] Further feature adjustments.
  [feature/attachment-management-no-reassignment] Fix some more errors
  [feature/attachment-management-no-reassignment] Fix minor flaws in the code.
  [feature/attachment-management-no-reassignment] Attachments management
2011-04-24 14:29:59 -04:00
rxu
baba66a229 [feature/attachment-management-no-reassignment] Handle privacy and some more.
- restrict files info for PM attachments;
- add an option to resync files stats if wrong;
- replace post_id sorting with post type (PM/regular post) one;
- some language fixes.

PHPBB3-9721
2011-04-24 23:33:51 +08:00
rxu
d811820bc1 [feature/attachment-management-no-reassignment] Further feature adjustments.
-add database update entry;
- add files statistics checks;
- improve files deletion procedure;
- improve reversed order for pagination;
- adjust template file;
- add missing comma for orphan key in info module;
- change module mode name;
- fix module explanation text;
- add files comments output;
- change attachments per page amount from posts to topics per page value.

PHPBB3-9721
2011-04-11 20:16:59 +08:00
rxu
97864d69ee [feature/attachment-management-no-reassignment] Attachments management
This feature allows to manage attachments in posts and PMs via ACP.

PHPBB3-9721
2011-04-10 12:06:06 +08:00
Erik Frèrejean
1b60613319 [ticket/9581] Mass e-mail to banned users
Implement the suggestion made by Adam in the ticket, this will add
an additional checkbox to the mass e-mail page. By checking this
the mass e-mail shall also be send to banned users. By default
banned users however are excluded from the mass e-mail.

PHPBB3-9581
2011-03-04 11:10:08 +01:00
Oleg Pudeyev
e8def259ef Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.
2011-03-02 22:08:01 -05:00
Oleg Pudeyev
afae883619 Merge branch 'ticket/nickvergessen/9911' into develop-olympus
* ticket/nickvergessen/9911:
  [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.
2011-03-02 22:07:56 -05:00
Oleg Pudeyev
c177ba7a4e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9915] "Length of ban:" is not displayed in ACP
2011-03-02 20:47:06 -05:00
Oleg Pudeyev
7554469b6b [ticket/10070] Fixed line endings after ticket/9549.
PHPBB3-10070
2011-03-01 17:47:42 -05:00
Oleg Pudeyev
448df1cdf5 Merge branch 'ticket/9549' into develop
* ticket/9549:
  [ticket/9549] Display users in their primary group instead of their first group
  [ticket/9549] Change default value of "sort legend by group name" to false.
  [ticket/9549] Fix displaying empty groups
  [ticket/9549] Fix language strings.
  [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
  [ticket/9549] New method move() to move a group more than 1 up/down.
  [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
  [ticket/9549] Throw an error when the given field-name is invalid.
  [ticket/9549] Make the class non static and extend delete_group function.
  [ticket/9549] Add template changes for subsilver2.
  [ticket/9549] Enhance teampage and legend functionality
  [ticket/9549] Add the module and files for the ACP.
  [ticket/9549] Update database with the new config values and columns
  [ticket/9549] Enhance teampage functionality with a new class, group_positions.

Conflicts:
	phpBB/install/database_update.php
2011-03-01 16:57:00 -05:00
Joas Schilling
51b985399d [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.
IE handles onchange after the next click on the page, instead of directly like Firefox, Opera and Safari do. Changing it to onclick works.

PHPBB3-9911
2011-03-01 17:03:06 +01:00
Joas Schilling
25c738ccdb [ticket/9915] "Length of ban:" is not displayed in ACP
Regression from PHPBB3-9695, innerHTML does not work on input-fields, so we
need to go back to "value", which we had before.

PHPBB3-9915
2011-03-01 16:48:04 +01:00
Oleg Pudeyev
e3c854288c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9675] Correctly check whether the style/component is still in use.
  [ticket/9675] Put the code into methods to avoid code duplication.
  [ticket/9675] Adjust the language-string to reflect the changes.
  [ticket/9675] Add option to delete template/theme/imageset when deleting style.
2011-02-21 20:47:44 -05:00
Joas Schilling
d9f092a18b [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
The checkbox for the teampage was also missing from the template file.

PHPBB3-9549
2011-02-17 23:59:41 +01:00
Joas Schilling
d2e2ccf8a4 [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
PHPBB3-9549
2011-02-16 18:22:31 +01:00
Joas Schilling
4f2b0d9d42 [ticket/9549] Add the module and files for the ACP.
PHPBB3-9549
2011-02-16 18:21:48 +01:00
Joas Schilling
0e02f5cb0b [ticket/9675] Put the code into methods to avoid code duplication.
PHPBB3-9675
2011-02-08 14:57:42 +01:00
Joas Schilling
ffcd307746 [ticket/9675] Add option to delete template/theme/imageset when deleting style.
PHPBB3-9675
2011-02-08 14:27:27 +01:00
Nils Adermann
cde423591e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9859] Remove the years from the copyright statements in docs files.
  [ticket/9859] Remove the year from the copyright meta tag in docs/*.html
  [ticket/9859] Remove the meta copyright tag as well.
  [ticket/9859] Remove the credit line comment from all html files.
  [ticket/9859] Remove years in credit line from some more files.
2011-01-16 22:26:27 +01:00
Andreas Fischer
c617400f95 [ticket/9859] Remove the credit line comment from all html files.
PHPBB3-9859
2011-01-16 17:53:30 +01:00
Andreas Fischer
2a703b4055 [ticket/9859] Remove years in credit line from some more files.
Standard HTML output now includes:
Powered by <a href="http://www.phpbb.com/">phpBB</a> &copy; phpBB Group

Print output now includes:
Powered by phpBB &copy; phpBB Group<br />http://www.phpbb.com/

This also fixes an inconsistency where "phpBB Group" was linked instead of
"phpBB".

PHPBB3-9859
2011-01-16 17:53:30 +01:00
Andreas Fischer
442fc61be7 Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class:
  [feature/request-class] Convert some remaining cookies
  [feature/request-class] Adjust misleading comment
  [feature/request-class] Remove direct access to _REQUEST in acp_search
  [feature/request-class] Special case of direct access to _REQUEST
2010-12-16 02:22:17 +01:00
Nils Adermann
18f74a7e10 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9851] "Search new posts" should require login.
  [task/phpdoc] Added a phpdoc task to the build process
  [task/phpdoc] Added a configuration file for phpDocumentor.
  [feature/acm-wincache] Adding caching module for WinCache's User Cache.
  [ticket/9939] Fix JavaScript error in admin recaptcha template
  [ticket/9575] Also change 'administrate' to 'administer' in templates
  [ticket/8736] guest can have 255 chars long username
  [ticket/9928] Do not link "login to your board" to the "send statistics" page.
  [ticket/9575] Change 'administrate' to 'administer'
  [ticket/9921] Adding sample configuration file for the lighttpd webserver.
  [ticket/9932] Add the Bing bot when converting
  [ticket/9930] Redirect failes with open_basedir enabled.
  [ticket/9910] Make sure S_BBCODE_ALLOWED exists when viewing PMs
2010-12-13 17:14:36 +01:00
Nils Adermann
adfa1656fb Merge branch 'ticket/igorw/9556' into develop
* ticket/igorw/9556:
  [ticket/9556] Drop php closing tags, add trailing newline

Conflicts:
	phpBB/includes/constants.php
2010-12-13 16:35:55 +01:00
Igor Wiedler
7dd06e8113 [ticket/9939] Fix JavaScript error in admin recaptcha template
PHPBB3-9939
2010-12-05 14:35:19 +01:00
Igor Wiedler
0491bfbc2d [ticket/9575] Also change 'administrate' to 'administer' in templates
PHPBB3-9575
2010-12-05 14:09:39 +01:00
RMcGirr83
6c45754a43 [ticket/9899] Change recaptcha theme from default to 'clean' in the ACP.
Change recaptcha theme from default to 'clean' in the ACP to better match
the administration control panel.

Follow up to d6aa25ede149a2d483b064f5ce96abcf49458ee3.

PHPBB3-9899
2010-11-18 13:59:49 +01:00
Igor Wiedler
af5b9a9640 [ticket/9556] Drop php closing tags, add trailing newline
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .

Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;

Extensions: php, css, html, js, xml.

PHPBB3-9556
2010-11-11 19:10:55 +01:00
Igor Wiedler
857271ebbd [ticket/9850] Display upgrade instructions for feature release in acp
PHPBB3-9850
2010-11-02 23:53:14 +01:00
Igor Wiedler
30016a7084 [feature/request-class] Remove direct access to _REQUEST in acp_search
PHPBB3-9716
2010-10-17 13:55:45 +02:00
Andreas Fischer
2c4c1f9257 [ticket/9664] Resolve conflict with accesskey="t", change addlitsitem to "y".
PHPBB3-9664
2010-10-15 19:14:20 +02:00
Joas Schilling
44125f5533 [ticket/9104] Safari does not display box headers correctly in the ACP.
PHPBB3-9104
2010-08-19 12:22:18 -04:00
Josh Woody
4880305436 [ticket/9499] Unify definition of dE() and other javascript functions
dE() was defined differently in the ACP and in prosilver.  Other javascript
in editor.js files has also been unified (taking the prosilver implementation
as cannonical)

PHPBB3-9499
2010-07-26 13:29:53 -05:00
Josh Woody
0e93d8386b [ticket/9695] Correct the improper display of user input in mcp_ban.php
Correct the improper display of "ban_reason" and "ban_give_reason" in mcp_ban.php

PHPBB3-9695
2010-07-01 17:48:32 -05:00
Nils Adermann
b308cfe5ea Merge branch 'ticket/bantu/9547' into develop-olympus
* ticket/bantu/9547:
  [ticket/9547] Use separate constants for display/enable active topics.
2010-05-16 18:58:15 +02:00
Andreas Fischer
d555e83b80 [ticket/9547] Use separate constants for display/enable active topics.
Split S_DISPLAY_ACTIVE_TOPICS into S_DISPLAY_ACTIVE_TOPICS and
S_ENABLE_ACTIVE_TOPICS so we have correct default values when changing the
forum type.

PHPBB3-9547
2010-05-16 18:54:48 +02:00
Nils Adermann
7499c7c884 Merge branch 'ticket/nickvergessen/9535' into develop-olympus
* ticket/nickvergessen/9535:
  [ticket/9535] Also fix the margin in the install_update.html
  [ticket/9535] Fix some more rtl margin issues.
  [ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
2010-05-16 18:51:09 +02:00