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

1702 Commits

Author SHA1 Message Date
Vjacheslav Trushkin
3997ffac2a [feature/merging-style-components] Creating style class
Creating phpbb_style class, changing template initialization to style initialization

PHPBB3-10632
2012-03-15 13:13:21 +02:00
Oleg Pudeyev
b672fc7ae1 [feature/new-tz-handling] Started on database updater changes.
The changes are tricky since we need to drop user_dst column from
users table, but we need it during the data migration process to
properly calculate effective timezones for all users.

The change here converts user_timezone to vchar and computes
timezone identifiers from the offsets. It uses database-specific
functions for building SQL conditionals and concatenations which
need to be implemented, probably in a separate ticket. As a result
the current code is not functional.

PHPBB3-9558
2012-03-14 22:57:31 -04:00
Chris Smith
af789040b8 [feature/new-tz-handling] Modify database schemas.
- Dropped the user_dst column which is no longer required.
- Modified the user_timezone column to take a string, max length 100.

PHPBB3-9558
2012-03-14 22:57:30 -04:00
Vjacheslav Trushkin
ae3b0f736d [feature/merging-style-components] Updating database and acp modules
Removing theme and template tables, adding new columns to styles table, deleting acp modules, deleting code that updates theme in updater

PHPBB3-10632
2012-03-14 23:18:18 +02:00
Vjacheslav Trushkin
b7d84a586c [feature/merging-style-components] Renaming template classes
Changing template classes prefixes from phpbb_template to phpbb_style (for classes that will work with styles) or phpbb_style_template (for classes that are specific to templates)

PHPBB3-10632
2012-03-14 23:12:11 +02:00
Igor Wiedler
ae984025f0 Merge branch 'develop' into feature/event-dispatcher
* develop: (95 commits)
  [ticket/9084] Explain the logic.
  [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
  [ticket/9813] Only get posts table row count if we detected a fulltext index.
  [feature/append_var] Adding test case
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/10618] Change phpBB 3 to phpBB 3.1.
  [ticket/10685] Refactor template test defaults for php 5.4 compatibility.
  [feature/append_var] Adding append_var template class function
  [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
  [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
  [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
  [ticket/10653] Add ability to count table rows to database abstraction layer.
  [ticket/9813] Use table status row count only if greater than 100000 or exact.
  [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
  [ticket/8652] Comment for also updating forum watch table in user_notification.
  [ticket/8652] Sending 2 emails on 2 replies
  [ticket/10680] Add /phpBB/ext/* to .gitignore
  [ticket/10672] Fix total post count language string in statistics and feed
  [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
  [ticket/10453] Fixing spacing
  ...

Conflicts:
	tests/bootstrap.php
2012-03-11 15:18:33 +01:00
Igor Wiedler
e02d92ac62 [feature/event-dispatcher] Use real EventDispatcher through composer
* replace the copy-pasta EventDispatcher with the real one from Symfony2
* use composer for managing this dependency, use composer autoloading

PHPBB3-9550
2012-03-11 15:15:33 +01:00
Joas Schilling
45f39c6d1f [ticket/10605] Delete orphan private messages on update
PHPBB3-10605
2012-02-27 16:05:12 +01:00
Vjacheslav Trushkin
caeadf85d0 [ticket/10637] Leftovers from implementation of extensions in convertor
Replacing code in convertor that was missed in ticket 10323

PHPBB3-10637
2012-02-09 22:24:46 +02:00
Oleg Pudeyev
cddd63aae0 Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop
* imkingdavid/ticket/10535:
  [ticket/10535] Delete no longer needed email confirm language entries.
  [ticket/10535] Delete email confirm from installer
  [ticket/10535] Removed email confirm field from acp_users module
  [ticket/10535] Forgot a subsilver2 change. *doh*
  [ticket/10535] Removed email confirm from UCP, removed unused language entries
  [ticket/10535] Remove email confirm check on registration form
2012-02-03 16:21:51 -05: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
Andreas Fischer
44a236991c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.10] Bumping version number for 3.0.10 final.

Conflicts:
	phpBB/install/database_update.php
2012-01-01 16:09:53 +01:00
Andreas Fischer
3f91405acb Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
  [prep-release-3.0.10] Bumping version number for 3.0.10 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2012-01-01 16:03:06 +01:00
Andreas Fischer
e14c3f3b77 [prep-release-3.0.10] Bumping version number for 3.0.10 final. 2012-01-01 16:00:17 +01:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
p
fc297a710e [ticket/10535] Delete email confirm from installer
PHPBB3-10535
2011-12-28 14:14:05 +00:00
Oleg Pudeyev
0c0befe2f8 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10349] Removed duplicated functions from schema loading in tests
  [ticket/10349] Update function comment
  [ticket/10349] Use new schema comment function in installer
  [ticket/10349] Unit tests: Consolidate schema comment removal functions
  [ticket/10349] Unit tests: Remove comments while loading schema files
2011-12-03 22:25:32 -05:00
Oleg Pudeyev
bf6d501ab1 Merge remote-tracking branch 'Noxwizard/ticket/10349' into develop-olympus
* Noxwizard/ticket/10349:
  [ticket/10349] Removed duplicated functions from schema loading in tests
  [ticket/10349] Update function comment
  [ticket/10349] Use new schema comment function in installer
  [ticket/10349] Unit tests: Consolidate schema comment removal functions
  [ticket/10349] Unit tests: Remove comments while loading schema files
2011-12-03 22:07:34 -05:00
Andreas Fischer
3176dcbc05 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.

Conflicts:
	phpBB/install/database_update.php
2011-12-04 00:25:54 +01:00
Andreas Fischer
138f123bd8 Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC3.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2011-12-04 00:24:22 +01:00
Andreas Fischer
69cbb4ac1d [prep-release-3.0.10] Bumping version number for 3.0.10-RC3. 2011-12-04 00:22:10 +01:00
Andreas Fischer
791464258f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.

Conflicts:
	phpBB/install/database_update.php
2011-11-26 22:26:59 +01:00
Andreas Fischer
7520b27639 Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
  [prep-release-3.0.10] Bumping version number for 3.0.10-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2011-11-26 22:20:32 +01:00
Andreas Fischer
007457f182 [prep-release-3.0.10] Bumping version number for 3.0.10-RC2. 2011-11-26 22:17:43 +01:00
Oleg Pudeyev
3d17816812 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
2011-11-23 20:50:06 -05:00
Oleg Pudeyev
6f41f96444 Merge branch 'prep-release-3.0.10' into develop-olympus
* prep-release-3.0.10:
  [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
2011-11-23 20:50:01 -05:00
Andreas Fischer
43818289fe [ticket/10488] Only set $config['email_max_chunk_size'] when not already set.
PHPBB3-10488
2011-11-23 22:30:40 +01:00
Andreas Fischer
c67ca0ac99 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus.
  [develop-olympus] Add changelog for 3.0.10-RC1
  [develop-olympus] Bump version numbers for 3.0.10-RC1 release.
  [develop-olympus] Bumping version numbers to final for 3.0.10 releases.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
2011-11-21 01:08:43 +01:00
Andreas Fischer
a9d7b1f9a1 [develop-olympus] Increment version number to 3.0.11-dev in develop-olympus. 2011-11-21 00:57:53 +01:00
Andreas Fischer
3e43b53a63 [develop-olympus] Bump version numbers for 3.0.10-RC1 release. 2011-11-20 21:50:29 +01:00
Andreas Fischer
06ae98b1e5 [develop-olympus] Bumping version numbers to final for 3.0.10 releases. 2011-11-20 21:41:24 +01: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
Igor Wiedler
b7c4fb38de Merge remote-tracking branch 'naderman/feature/extension-manager' into develop
* naderman/feature/extension-manager: (67 commits)
  [feature/extension-manager] Removing now unused acp_search code
  [feature/extension-manager] Split disabling extensions up into steps as well
  [feature/extension-manager] Add documentation on caching in ext finder
  [feature/extension-manager] Reference correct new module basenames in install
  [feature/extension-manager] Rename default methods to core methods on finder.
  [feature/extension-manager] Document what the class loader stores in cache
  [feature/extension-manager] Add docblock to cached paths map in class loader
  [feature/extension-manager] Clear up docs of extension related template changes
  [feature/extension-manager] Use "core files" instead of "global files" in docs
  [feature/extension-manager] Add docblocks to new search backend methods
  [feature/extension-manager] Add docblocks to new methods in functions_module
  [feature/extension-manager] Clarify comment on ext meta class instantiator
  [feature/extension-manager] Add more info on suffixes in extension finder
  [feature/extension-manager] Clarify is_dir parameter description
  [feature/extension-manager] Clarify class finding method docblock
  [feature/extension-manager] Correct default path comment & remove double strlen
  [feature/extension-manager] Fix "disbale" typo in comment
  [feature/extension-manager] Properly remove old ACP language loading code
  [feature/extension-manager] Support extensions in subdirectories of ext/
  [feature/extension-manager] Add prefix to extension meta data / install classes
  ...
2011-11-19 01:20:22 +01:00
Nils Adermann
a4acd62f3b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9416] HTML entities in poll titles and options incorrectly re-encoded
2011-11-18 19:32:44 +01:00
Nils Adermann
665982bb32 Merge remote-tracking branch 'github-rxu/ticket/9416' into develop-olympus
* github-rxu/ticket/9416:
  [ticket/9416] HTML entities in poll titles and options incorrectly re-encoded
2011-11-18 19:32:36 +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
Andreas Fischer
03918f7fd2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10185] Always set board startdate on conversion
2011-11-18 18:07:58 +01:00
Andreas Fischer
93c4cdd1de Merge remote-tracking branch 'nickvergessen/ticket/10185' into develop-olympus
* nickvergessen/ticket/10185:
  [ticket/10185] Always set board startdate on conversion
2011-11-18 18:07:44 +01:00
Nils Adermann
0c443a089c [feature/extension-manager] Reference correct new module basenames in install
PHPBB3-10323
2011-11-18 17:09:53 +01:00
rxu
3091efc501 [ticket/9416] HTML entities in poll titles and options incorrectly re-encoded
PHPBB3-9416
2011-11-17 22:16:41 +08:00
Joas Schilling
815dd3591b [ticket/10185] Always set board startdate on conversion
The board startdate should always be set to first user registration date.
The current code did not do anything at all, as the board_startdate was always
set on installation before running the convertor.

PHPBB3-10185
2011-11-15 17:23:55 +01:00
Andreas Fischer
34ed1352a6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9066] Move regex into get_preg_expression function and add tests
  [ticket/9066] Disallow some database prefix to prevent same errors and problems
2011-11-14 15:46:58 +01:00
Andreas Fischer
f31da015fc Merge remote-tracking branch 'nickvergessen/ticket/9066' into develop-olympus
* nickvergessen/ticket/9066:
  [ticket/9066] Move regex into get_preg_expression function and add tests
  [ticket/9066] Disallow some database prefix to prevent same errors and problems
2011-11-14 15:46:50 +01:00
Joas Schilling
3302305cd4 [ticket/9066] Move regex into get_preg_expression function and add tests
PHPBB3-9066
2011-11-14 15:10:25 +01:00
Joas Schilling
6370ef2705 [ticket/9066] Disallow some database prefix to prevent same errors and problems
With this patch database prefixes must not be empty and only contain
alphanumeric characters, numbers and underscores.

PHPBB3-9066
2011-11-13 15:40:18 +01:00
Andreas Fischer
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
Igor Wiedler
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
Igor Wiedler
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