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

921 Commits

Author SHA1 Message Date
Oleg Pudeyev
145bc23044 Merge remote-tracking branch 'igorw/ticket/10155' into develop
* igorw/ticket/10155:
  [ticket/10155] Briefly explain assets in coding-guidelines
  [ticket/10155] Move jQuery inclusion to footer
  [ticket/10155] Update to jQuery 1.6.2
  [ticket/10155] Add jQuery to AUTHORS
  [ticket/10155] Add jQuery, introduce global assets path
2011-09-05 06:03:19 -04:00
Vjacheslav Trushkin
98590201d8 [feature/remove-imagesets] Changing admin control panel styles module
Removing imagesets. Changing admin control panel styles module

PHPBB3-10336
2011-09-03 18:57:16 +03:00
callumacrae
81f682a812 [ticket/8599] Added ability to select all to add multiple smilies screen.
PHPBB3-8599
2011-08-24 10:17:28 +01:00
Oleg Pudeyev
124b8a92ec Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.
2011-07-30 19:37:24 -04:00
Oleg Pudeyev
edb745e951 Merge remote-tracking branch 'callumacrae/ticket/8173' into develop-olympus
* callumacrae/ticket/8173:
  [ticket/8173] Removed some redundant code in the BBCode JavaScript.

Conflicts:
	phpBB/adm/style/acp_users_signature.html
2011-07-30 19:33:41 -04:00
Andreas Fischer
366b14b6c5 Merge remote-tracking branch 'igorw/ticket/10258' into develop
* igorw/ticket/10258:
  [ticket/10258] Add HTML5 meta charset tag
2011-07-30 16:49:39 +02:00
Callum Macrae
9c6339fb57 [ticket/8173] Removed some redundant code in the BBCode JavaScript.
The following code can be found in the ACP, when changing a user's
signature:

t: '{ BBCODE_T_HELP }',

The code that uses it and the code that produces it were changed or
removed a while ago, but this code remained. In 2c4c1f9, the accesskey
for the list item button was changed to y from t, explaining the origin of
the redundant code - although it wasn't being used then, either.

This commit also changes the helpline code of "[*]" to y, as the access
key is y, so this makes it more consistent.

PHPBB3-8173
2011-07-30 08:57:17 +01:00
Oleg Pudeyev
b960dd4e0d Merge remote-tracking branch 'callumacrae/ticket/10032' into develop-olympus
* callumacrae/ticket/10032:
  [ticket/10032] Fixed typos in bbcode button name.
2011-07-30 00:48:03 -04:00
Oleg Pudeyev
45b19e6419 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10032] Fixed typos in bbcode button name.
2011-07-30 00:45:31 -04:00
Igor Wiedler
681c4a478d [ticket/10258] Add HTML5 meta charset tag
This allows knowing the charset when saving web pages to disk. Also, this is
supported by all browsers.

PHPBB3-10258
2011-07-29 16:32:22 +02:00
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
17bf983cdc [ticket/10155] Move jQuery inclusion to footer
PHPBB3-10155
2011-07-17 10:05:40 +02:00
Callum Macrae
16c5352a12 [ticket/10032] Fixed typos in bbcode button name.
addlistitem was addlitsitem.

PHPBB3-10032
2011-07-14 21:00:10 +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
c945fc9355 [ticket/10155] Add jQuery, introduce global assets path
Add the jQuery JavaScript library to all pages, giving modifications
instant access and allowing for any future core JavaScript to take
advantage of it.

Also introduce a global /assets directory for assets that are shared
between styles.

PHPBB3-10155
2011-07-11 10:00:30 +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
a4f7002995 Merge remote-tracking branch 'naderman/ticket/10198' into develop-olympus
* naderman/ticket/10198:
  [ticket/10198] range validation for strings should limit characters not bytes
  [ticket/10198] validate_config_vars() improperly validates multibyte strings
2011-06-10 01:23:17 +02:00
Nils Adermann
72479e13ab [ticket/10198] range validation for strings should limit characters not bytes
PHPBB3-10198
2011-06-10 01:21:40 +02:00
rxu
eb0ffd3503 [ticket/10198] validate_config_vars() improperly validates multibyte strings
PHPBB3-10198
2011-06-10 01:21:36 +02: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
Andreas Fischer
c6e946c65f Merge remote-tracking branch 'naderman/ticket/8138' into develop-olympus
* naderman/ticket/8138:
  [ticket/8138] Add autocomplete="off" to acp_board and ldap settings
  [ticket/8138] Add autocomplete="off" to a user and forum ACP.
2011-06-09 12:55:04 +02:00
Andreas Fischer
759f8d5c2c Merge remote-tracking branch 'naderman/ticket/10067' into develop-olympus
* naderman/ticket/10067:
  [ticket/10067] Add separator to h_radio to place options on individual lines
2011-06-06 10:58:05 +02:00
Nils Adermann
26e052bb26 [ticket/10067] Add separator to h_radio to place options on individual lines
The previous mechanism for account activation resulted in two h_radio calls
with identical id attributes for two elements.

PHPBB3/10067
2011-06-05 09:52:17 +02:00
Nils Adermann
f11ef89c65 [ticket/8138] Add autocomplete="off" to acp_board and ldap settings
PHPBB3-8138
2011-06-03 19:06:12 +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
Oleg Pudeyev
15a5d2c4bf Merge branch 'ticket/nickvergessen/9675' into develop-olympus
* ticket/nickvergessen/9675:
  [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:31 -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