1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-15 22:26:32 +02:00
Commit Graph

1203 Commits

Author SHA1 Message Date
589f7ac8e4 Merge remote-tracking branch 'nickvergessen/ticket/10410' into develop
* nickvergessen/ticket/10410:
  [ticket/10410] Add option to display users in their first teampage group
2011-11-01 20:04:08 +01:00
72a3bcd048 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9307] Add config variable to installation schema.
  [ticket/9307] Remove hardcoded chunk size of mass emails.

Conflicts:
	phpBB/install/database_update.php
2011-10-29 13:03:04 +02:00
6d913d3646 Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympus
* cs278/ticket/9307:
  [ticket/9307] Add config variable to installation schema.
  [ticket/9307] Remove hardcoded chunk size of mass emails.
2011-10-29 13:01:03 +02:00
189bd6dc9b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
2011-10-29 12:32:39 +02:00
fa23def774 [ticket/10190] Do not show hint about permissions when editing forum settings.
PHPBB3-10190
2011-10-29 00:16:30 +02:00
65a34fd047 [ticket/10410] Add option to display users in their first teampage group
PHPBB3-10410
2011-10-28 22:55:26 +02:00
83d71ecb88 Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop
* VSEphpbb/ticket/10390:
  [ticket/10390] Revert back to escaped script tags inside document.write
  [ticket/10390] Fix wording: fallback should be fall back
  [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
  [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
  [ticket/10390] Drop http protocol for Microsoft's CDN option
  [ticket/10390] Reword the language for jQuery host/server options
  [ticket/10390] Fix a type-o - captialize AJAX
  [ticket/10390] Improve the jQuery CDN url generation function
  [ticket/10390] Move jQuery version definition
  [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Conflicts:
	phpBB/install/database_update.php
2011-10-20 20:46:48 -04:00
ba1464b6e0 [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
PHPBB3-10421
2011-10-18 21:25:27 +02:00
rxu
88b31c2ab3 [ticket/10419] Add mbstring PHP ini parameters checks to ACP
PHPBB3-10419
2011-10-18 02:09:08 +08:00
c6e370d33a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9525] Minimum post length 0 is accepted but not working.
2011-10-17 16:44:08 +02:00
cfb5135805 Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympus
* nickvergessen/ticket/9525:
  [ticket/9525] Minimum post length 0 is accepted but not working.
2011-10-17 16:43:58 +02:00
e40abfbde9 [ticket/9525] Minimum post length 0 is accepted but not working.
PHPBB3-9525
2011-10-14 15:19:47 +02:00
d68b815690 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10074] Change default value of 'Set as special rank' to No
2011-10-14 02:55:21 +02:00
d16b160d5c Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into develop-olympus
* github-nickvergessen/ticket/10074:
  [ticket/10074] Change default value of 'Set as special rank' to No
2011-10-14 02:55:05 +02:00
c5ee92c3f2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
2011-10-14 02:49:15 +02:00
dda1e13126 Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympus
* github-bantu/ticket/10278:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
2011-10-14 02:47:45 +02:00
1f677d5de3 [ticket/10074] Change default value of 'Set as special rank' to No
PHPBB3-10074
2011-10-14 02:41:37 +02:00
85407986ea Merge remote-tracking branch 'nickvergessen/ticket/10300' into develop
* nickvergessen/ticket/10300:
  [ticket/10300] Always set group attributes for teampage and legend
2011-10-13 23:48:45 +02:00
1dc1583b92 [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
PHPBB3-10278
2011-10-13 18:23:33 +02:00
9fbe4e34ab Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10400] Allow forum name to be '0'
2011-10-13 17:05:53 +02:00
cacb9f2ec5 [ticket/10400] Allow forum name to be '0'
PHPBB3-10400
2011-10-07 09:44:31 +02:00
61df8a87d1 [feature/extension-manager] Allow extensions to define captcha plugins.
The base class for captcha plugins has been renamed, but the old name continues
to exist as an empty subclass of it for backwards compatability.

PHPBB3-10323
2011-09-29 15:42:47 +02:00
d5a5cdd0d7 [feature/extension-manager] Avoid unecessary loading of acp classes
PHPBB3-10323
2011-09-29 15:42:47 +02:00
ade496e0f7 [feature/extension-manager] Fix whitespace in acp_modules
PHPBB3-10323
2011-09-29 15:42:47 +02:00
4844b00777 [feature/extension-manager] Load (A/U/M)CP modules from extensions
To avoid large bc breaking changes, modules in the old includes directory
structure still follow the same naming conventions. Modules in extensions
have to be placed in an xcp/ folder and need a _module suffix. The
corresponding info file is in the same directory but with an _info suffix.

PHPBB3-10323
2011-09-29 15:42:47 +02:00
989bd9cde7 [feature/extension-manager] Skip phpbb_search_base by checking for get_name()
PHPBB3-10323
2011-09-29 15:42:40 +02:00
dcc5ca5377 [feature/extension-manager] Make search backends loadable from extensions
Search backends are now required to be autoloadable. The database updater to
3.1 tries to guess the class name as phpbb_search_<oldname> which works for
the default backends we ship.

PHPBB3-10323
2011-09-29 15:42:40 +02:00
2dca3c3c27 [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
jQuery will now be available via remote CDN from Google. Microsoft and
jQuery CDNs have been removed, so we can simplify this option for the user.
Default mode is NO so the copy of jQuery included with phpBB is served by
default.

PHPBB3-10390
2011-09-27 11:12:11 -07:00
56c6476233 [ticket/10390] Allow option for jQuery to be hosted by a remote CDN
Add an option to the ACP so admins can choose to host jQuery
from the local version shipped with phpBB, or via a popular CDN.

PHPBB3-10390
2011-09-26 11:15:22 -07:00
138d1050fc [ticket/9307] Remove hardcoded chunk size of mass emails.
The new config option is 'email_max_chunk_size' I have not added
an interface option to change this.

PHPBB3-9307
2011-09-24 22:05:40 +01:00
a1febdd429 [ticket/10239] Add confirm box to backup restore.
PHPBB3-10239
2011-09-21 21:19:37 +01:00
7b7a56dc4a [feature/remove-db-styles] Remove forgotten template variables.
PHPBB3-9741
2011-09-20 23:15:30 +01:00
ee994b2968 [feature/remove-db-styles] Rework filesystem permission checks from 6d24a71.
PHPBB3-9741
2011-09-20 23:01:55 +01:00
6d24a7191f [feature/remove-db-styles] Add error if template/theme file is unwritable.
PHPBB3-9741
2011-09-20 22:18:06 +01:00
934a9da313 [feature/remove-db-styles] Remove style.php DB storage.
Removed all use of the DB for serving/caching the theme from style.php,
acp_style no longer stores the theme modified time either.

As a consequence currently all stylesheets will be served through style.php
(with no caching) until imagesets are removed [PHPBB3-10336], then
they can we served as static files by HTTPd.

PHPBB3-9741
2011-09-20 21:06:52 +01:00
c2d6c613d3 [feature/remove-db-styles] ACP has forgotten how to store themes in the DB.
PHPBB3-9741
2011-09-20 21:06:52 +01:00
ad11565ace [feature/remove-db-styles] Missed a few template DB bits in acp_styles.
PHPBB3-9741
2011-09-20 21:06:52 +01:00
23415170cb [feature/remove-db-styles] Removing unused methods from acp_style.
These got left behind in 6854d47.

PHPBB3-9741
2011-09-20 21:06:52 +01:00
9e4349e7fa [feature/remove-db-styles] Removed database storage of style components.
The bulk of database storage of templates is removed, rendering template
stored in the database as useless.

Theme database storage is reduced to a skeleton for full removal soon.

This commit was cherry picked from the old feature/ascraeus-experiment branch
the old commit hash is 0dbe7e3b6c.

PHPBB3-9741
2011-09-20 21:06:51 +01:00
830c3f4047 [feature/remove-imagesets] Adjustments to php files
Removing imagesets. Adjustments to php files

PHPBB3-10336
2011-09-04 01:08:00 +03:00
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
ac11806bf4 [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.
Introduced by 6b4d0a2542.

PHPBB3-10329
2011-08-21 14:34:34 +02:00
38c65da553 Merge branch 'develop' into feature/request-class
* develop: (157 commits)
  [ticket/10316] Resolve inconsistent move topic behavior
  [ticket/9297] Add network to class name of unit tests.
  [ticket/9297] Fix typo in localhost.
  [ticket/9297] Rename test class to reflect its contents.
  [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work.
  [ticket/9297] Fix markTestSkipped call in setUpBeforeClass.
  [ticket/9608] Remove use of references in topic_review
  [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails.
  [ticket/9297] Separate ipv4 and ipv6 tests into separate functions.
  [ticket/9297] Update copyright year of unit test file.
  [feature/template-engine] Delete _get_locator function.
  [feature/template-engine] Clean up template locator usage in bbcode.
  [ticket/9297] Make EPSV unit tests work without IPv6.
  [ticket/9297] Unit tests for ftp_fsock PASV and EPSV.
  [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class.
  [ticket/10312] Un-check the shadow option while moving.
  [feature/template-engine] Need to call set_template on template.
  [feature/template-engine] Update installer for template engine changes.
  [feature/template-engine] Dependency inject locator into template.
  [feature/template-engine] Delete useless code from set_template.
  ...

Conflicts:
	phpBB/includes/functions.php
2011-08-18 22:31:25 +02:00
5fa096aca4 Merge remote-tracking branch 'igorw/ticket/9608' into develop
* igorw/ticket/9608:
  [ticket/9608] Remove use of references in topic_review
  [ticket/9608] Revert changes to normalizer
  [ticket/9608] Remove blank line
  [ticket/9608] Remove use of references in captcha and other places
2011-08-14 19:24:27 -04:00
c24249ae55 [task/whitelist-code-coverage] Load all of includes/ into code coverage report
PHPBB3-10314
2011-08-07 20:14:53 -04:00
c2866f5245 [ticket/10300] Always set group attributes for teampage and legend
The code in acp_groups.php removes unchanged attributes from the
group_attributes array, to prevent issues with reapplying avatar/rank and more.
This code causes problems with the new teampage/legend feature, because when
the attribute is not set, the group is removed from the feature. Therefore I
added an array with the keys that need to be set, when calling the function.

PHPBB3-10300
2011-08-02 16:56:21 +02:00
139f8e84d8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
2011-07-30 18:55:32 -04:00
5653be8e16 Merge remote-tracking branch 'callumacrae/ticket/9645' into develop-olympus
* callumacrae/ticket/9645:
  [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
2011-07-30 18:47:54 -04:00
381ebcf195 [ticket/9645] Added code to repair invalid anchor names in acp_php_info.
Some of the anchor tags produced by php_info had names like "module_Zend
Optimizer", which is obviously invalid. This commit adds some code that
repairs the names by replacing all spaces found in the names with
underscores.

PHPBB3-9645
2011-07-28 16:41:04 +01:00
66a1ea52c4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_main
2011-07-16 22:46:39 -04:00