| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| | |
|
| | |
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/10430] Fix typos/etc in coding guidelines
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Mainly minor changes to correct errors and improve readability.
* "overcroud" --> "overcrowd"
* "concentinations" --> "concatenations"
* "SQL Statements", "SQL Formatting" - unnecessary capitalisation removed
* "keep a very close eye to it" --> "keep a very close eye on it"
* Fixed some fragmented sentences under the SQL Quotes section
* Added capitalisation of "sql", "select", "select distinct"
* "noticable" --> "noticeable"
* "outputed" --> "outputted"
* Added a missing "it" on the line about append_sid()
* And some other grammatical/stylistic changes, not worth listing them all
PHPBB3-10430
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/10246] Move coding guidelines VCS section to wiki
|
| |
| |
| |
| |
| |
| |
| | |
The VCS section can now be found at:
* http://wiki.phpbb.com/Git#Branches
PHPBB3-10246
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/9898] Encourage patches in README
|
| |
| |
| |
| | |
PHPBB3-9898
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | |
| | |
| | |
| | | |
PHPBB3-10155
|
| | |
| | |
| | |
| | | |
PHPBB3-10155
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* 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
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-9726
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* 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
|
| | | | |
| | | | |
| | | | |
| | | | | |
PHPBB3-10258
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
It fails HTML5 validation and we already have a 'copyright and
disclaimer' section in all of those documents. We can always represent
the copyright more semantically later (such as the HTML5 <copyright>
tag).
PHPBB3-10258
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
They break HTML5 validation.
PHPBB3-10258
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
These meta tags are IE specific and do not validate as HTML5.
PHPBB3-10258
|
| | |/ /
| |/| |
| | | |
| | | | |
PHPBB3-10258
|
|/ / /
| | |
| | |
| | | |
PHPBB3-7090
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | | |
* 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.
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | | |
* develop-olympus:
[prep-release-3.0.9] Update Changelog for 3.0.9-RC3 release.
[prep-release-3.0.9] Bumping version number for 3.0.9-RC3.
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | | |
* develop-olympus:
[prep-release-3.0.9] Update Changelog for 3.0.9-RC2 release.
|
| | | |
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[develop-olympus] Changelog: Changes since 3.0.8
[develop-olympus] Bumping version number for 3.0.9-RC1.
[develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 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
|
| | | |
|
| | | |
|
|\ \ \
| |/ /
| | /
| |/
|/|
| | |
* develop-olympus:
[ticket/10075] Rename nn- to Oleg in docs/AUTHORS.
[ticket/10075] Move APTX to Former Contributors in docs/AUTHORS.
|
| |
| |
| |
| | |
PHPBB3-10075
|
| |
| |
| |
| | |
PHPBB3-10075
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/10110] Remove tab from empty lines
[ticket/10110] Enable the serialization and add a constant for defined the database
[ticket/10110] Update comments with a link to the phpredis extension
[ticket/10110] Add Redis ACM backend
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* ticket/haklop/10110:
[ticket/10110] Remove tab from empty lines
[ticket/10110] Enable the serialization and add a constant for defined the database
[ticket/10110] Update comments with a link to the phpredis extension
[ticket/10110] Add Redis ACM backend
|
| | |
| | |
| | |
| | |
| | |
| | | |
defined the database
PHPBB3-10110
|
| | |
| | |
| | |
| | | |
PHPBB3-10110
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10107] Add cache to the enumeration, make statement more generic
[ticket/10107] Make it clear that provided httpd samples are not perfect
[ticket/10107] Add a webserver section to docs/INSTALL.html
|
| | |
| | |
| | |
| | | |
PHPBB3-10107
|
| | |
| | |
| | |
| | | |
PHPBB3-10107
|
| |/
| |
| |
| |
| |
| |
| | |
Explain what to do with lighttpd and nginx after installing phpBB on
one of those webservers.
PHPBB3-10107
|
|\ \
| |/
| |
| |
| |
| | |
* develop-olympus:
[ticket/10079] Add gallery avatars to .gitignore.
[ticket/10069] Improvements to sample nginx configuration.
|
| |
| |
| |
| |
| |
| |
| |
| | |
Most of these were contributed by burningbunny:
https://github.com/burningbunny
PHPBB3-10069
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.
|
| |\
| | |
| | |
| | |
| | | |
* ticket/bantu/10075:
[ticket/10075] Update docs/AUTHORS for 3.0.9-RC1 release.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Remove:
- A_Jelly_Doughnut
- dhn
- TerraFrost
Add:
- nn-
Move:
- Brainy
Rename:
- Brainy -> ckwalsh
PHPBB3-10075
|