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

1481 Commits

Author SHA1 Message Date
Joas Schilling
65a34fd047 [ticket/10410] Add option to display users in their first teampage group
PHPBB3-10410
2011-10-28 22:55:26 +02:00
Andreas Fischer
5cae822594 Merge remote-tracking branch 'nickvergessen/ticket/10409' into develop
* nickvergessen/ticket/10409:
  [ticket/10409] Running database_update.php multiple times breaks the update
2011-10-13 23:48:24 +02:00
Joas Schilling
1df2148bf4 [ticket/10409] Running database_update.php multiple times breaks the update
PHPBB3-10409
2011-10-13 23:29:52 +02:00
Chris Smith
e95aec1637 [ticket/10152] Remove end '?>' from generated config.php.
PHPBB3-10152
2011-09-21 08:36:53 +01:00
Chris Smith
cb245f5d04 [feature/remove-db-styles] Add schema changes sinces 3.0.x.
PHPBB3-9741
2011-09-20 21:06:53 +01:00
Chris Smith
270cd839a6 [feature/remove-db-styles] Update database schemas.
Removes:
* styles_template_data table
* template_storedb on styles_template table
* On styles_theme table:
  - theme_storedb
  - theme_mtime
  - theme_data

PHPBB3-9741
2011-09-20 21:06:52 +01:00
Chris Smith
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 0dbe7e3b6cd450342d3c566eb2caf36ca1b5db8e.

PHPBB3-9741
2011-09-20 21:06:51 +01:00
Nils Adermann
4e8e31c10b Merge remote-tracking branch 'github-cyberalien/feature/remove-imagesets' into develop
* github-cyberalien/feature/remove-imagesets:
  [feature/remove-imagesets] Script for converting imageset to css
  [feature/remove-imagesets] Changing subsilver
  [feature/remove-imagesets] Changing prosilver
  [feature/remove-imagesets] Adjustments to php files
  [feature/remove-imagesets] Changing admin control panel styles module
  [feature/remove-imagesets] Changing database structure
  [feature/remove-imagesets] Removing imageset files
  [feature/remove-imagesets] Moving images
2011-09-20 21:26:37 +02:00
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
33adfd633b [feature/remove-imagesets] Changing database structure
Removing imagesets. Changing database structure

PHPBB3-10336
2011-09-03 18:55:30 +03:00
Igor Wiedler
c5cef773c4 [feature/request-class] Adjust code base to do html decoding manually
PHPBB3-9716
2011-08-18 23:44:30 +02:00
Igor Wiedler
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
Igor Wiedler
f84460c710 [feature/request-class] Make use of the is_secure() method
PHPBB3-9716
2011-08-18 22:26:30 +02:00
Nils Adermann
6fa83ba876 Merge remote-tracking branch 'github-p/feature/template-engine' into develop
* github-p/feature/template-engine: (87 commits)
  [feature/template-engine] Delete _get_locator function.
  [feature/template-engine] Clean up template locator usage in bbcode.
  [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.
  [feature/template-engine] Delete no longer used $template_filename property.
  [feature/template-engine] Delete useless $template globalization.
  [feature/template-engine] Use template engine class in bbcode class.
  [feature/template-engine] Corrected an error message in template locator.
  [feature/template-engine] Remaining documentation.
  [feature/template-engine] More documentation for template class.
  [feature/template-engine] Create load_and_render to reduce code duplication.
  [feature/template-engine] Get rid of orig_tpl_* in template engine.
  [feature/template-engine] Delete $style_name param from locator's set_custom_template.
  [feature/template-engine] Add constructor to template locator.
  [feature/template-engine] Factor template locator out of template class.
  [feature/template-engine] Delete $files_template property.
  [feature/template-engine] Rename is_absolute to phpbb_is_absolute.
  [feature/template-engine] Test template DEFINE statements across files
  ...

Conflicts:
	.gitignore
	phpBB/includes/template.php
2011-08-13 23:59:15 -04:00
Oleg Pudeyev
60372b43c2 [feature/template-engine] Update installer for template engine changes.
PHPBB3-9726
2011-08-09 23:28:56 -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
Nils Adermann
ddbad5551d Merge remote-tracking branch 'github-igorw/ticket/10258' into develop
* github-igorw/ticket/10258:
  [ticket/10258] Remove the meta charset tag
  [ticket/10258] Adjust some deprecated tags for HTML5 in coding-guidelines
  [ticket/10258] Remove copyright meta tag from docs
  [ticket/10258] Remove resource-type and distribution meta tags
  [ticket/10258] Remove X-UA-Compatible and imagetoolbar meta tags
  [ticket/10258] Change the DOCTYPE to HTML5
2011-07-20 09:21:16 -04:00
Igor Wiedler
0bf6966c52 [feature/request-class] Add server(), header() and is_ajax() to request
Extend the request class with helpers for reading server vars (server())
and HTTP request headers (header()). Refactor the existing code base
to make use of these helpers, make $_SERVER a deactivated super global.

Also introduce an is_ajax() method, which checks the X-Requested-With
header for the value 'XMLHttpRequest', which is sent by JavaScript
libraries, such as jQuery.

PHPBB3-9716
2011-07-15 22:34:24 +02:00
Igor Wiedler
541a7db101 [ticket/7090] Update documented minimum PHP version to 5.2.0
PHPBB3-7090
2011-07-13 13:02:37 +02: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
Andreas Fischer
09e0460e5b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.9] Bumping version number for 3.0.9 final.

Conflicts:
	phpBB/install/database_update.php
2011-07-10 23:11:29 +02:00
Andreas Fischer
e4707a8be7 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [prep-release-3.0.9] Bumping version number for 3.0.9 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2011-07-10 23:08:56 +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
Andreas Fischer
e6572b766f [prep-release-3.0.9] Bumping version number for 3.0.9 final. 2011-07-10 22:36:17 +02:00
Igor Wiedler
f7b06ca12d [feature/template-engine] Move template.php to includes/template
This allows making use of autoloading.

PHPBB3-9726
2011-07-10 00:30:50 +02:00
Igor Wiedler
766537035e [ticket/10258] Change the DOCTYPE to HTML5
PHPBB3-10258
2011-07-09 17:04:46 +02:00
Andreas Fischer
e2d27a30a6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10003] Fixed comment referring to db_tools duplication.
  [ticket/10003] Require db_tools.php in database_update.php.
  [ticket/10003] Use phpbb_db_tools in database_update.php.
  [ticket/10003] Delete the copy of db_tools in database_update.php.

Conflicts:
	phpBB/install/database_update.php
2011-07-09 16:01:54 +02:00
Oleg Pudeyev
00f7db66f2 [ticket/10003] Fixed comment referring to db_tools duplication.
PHPBB3-10003
2011-07-09 01:56:43 -04:00
Oleg Pudeyev
fd728c2815 [ticket/10003] Require db_tools.php in database_update.php.
Use require_updated to use the new version of db_tools if one
is present.

PHPBB3-10003
2011-07-09 01:53:07 -04:00
Oleg Pudeyev
5b5c227423 [ticket/10003] Use phpbb_db_tools in database_update.php.
Now that the copy of db tools has been deleted, change which
class name is used.

PHPBB3-10003
2011-07-09 01:53:07 -04:00
Oleg Pudeyev
919ba8eb3f [ticket/10003] Delete the copy of db_tools in database_update.php.
PHPBB3-10003
2011-07-09 01:53:01 -04:00
Andreas Fischer
9c6c5895bc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.
  [prep-release-3.0.9] Decreasing version for an RC4 release.
2011-07-07 20:29:25 +02:00
Andreas Fischer
f2110183e0 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [prep-release-3.0.9] Update Changelog for 3.0.9-RC4 release.
  [prep-release-3.0.9] Decreasing version for an RC4 release.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2011-07-07 20:29:14 +02:00
Andreas Fischer
787245a113 [prep-release-3.0.9] Decreasing version for an RC4 release. 2011-07-07 20:19:11 +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
Nils Adermann
cf4e6d8a3e Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [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:51:33 -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
7b2f88686b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10247] Remove attempt_id as primary key from database_update.php
2011-07-06 23:20:41 +02:00
Andreas Fischer
5eeb870442 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [ticket/10247] Remove attempt_id as primary key from database_update.php
2011-07-06 23:19:02 +02:00
Joas Schilling
0c93e92eef [ticket/10247] Remove attempt_id as primary key from database_update.php
PHPBB3-10247
2011-07-05 23:19:39 +02:00
Andreas Fischer
5f73cdcdc2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [prep-release-3.0.9] Update Changelog for 3.0.9 release.
  [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.
  [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.
  [ticket/10247] Add a db_tools test for the removal of a primary key column.
  [ticket/10247] Add empty data section to database update for RC4
  [ticket/10247] Remove unecessary attempt_id primary key column

Conflicts:
	phpBB/install/database_update.php
2011-07-05 01:07:22 +02:00
Andreas Fischer
fa253b8b58 Merge branch 'prep-release-3.0.9' into develop-olympus
* prep-release-3.0.9:
  [prep-release-3.0.9] Update Changelog for 3.0.9 release.
  [prep-release-3.0.9] Bumping version number for the final 3.0.9 release.
  [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.
  [ticket/10247] Add a db_tools test for the removal of a primary key column.
  [ticket/10247] Add empty data section to database update for RC4
  [ticket/10247] Remove unecessary attempt_id primary key column

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2011-07-05 01:03:37 +02:00
Andreas Fischer
d8ac2cc5f0 [prep-release-3.0.9] Bumping version number for the final 3.0.9 release. 2011-07-05 00:40:45 +02:00
Nils Adermann
cb7604dcd8 [ticket/10247] Removing attempt_id column from the 3.0.8 to 3.0.9-RC1 updater.
To make sure that this column (which was too small and unecessary) does not
remain on 3.0.9-RCX installations and boards that were updated to a 3.0.9 RC,
the 3.0.10-RC1 release must correctly drop the column after db_tools has been
corrected and fully reviewed. The current version is not capable of dropping
primary keys correctly on all supported DBMSs.

PHPBB3-10247
2011-07-04 02:31:00 -04:00
Nils Adermann
984fd07319 [ticket/10247] Add empty data section to database update for RC4
PHPBB3-10247
2011-07-03 02:29:51 -04:00
Nils Adermann
cf4b639be5 [ticket/10247] Remove unecessary attempt_id primary key column
The database update drops any key of the same name (potential primary key) and
afterwards the column. This does not work on some of the supported DBMS and
needs further changes.

PHPBB3-10247
2011-07-03 02:15:40 -04:00
Andreas Fischer
ffa6f3448f [prep-release-3.0.9] Bump database version to RC3 too. 2011-06-26 21:50:02 +02:00
Andreas Fischer
fe0932fdf0 [prep-release-3.0.9] Bumping version number for 3.0.9-RC3. 2011-06-26 20:47:33 +02:00
Andreas Fischer
cc7c5d54ad Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10223] Make definition of phpbb_require_updated conditional
2011-06-20 00:28:42 +02:00