| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
PHPBB3-12747
|
|
|
|
| |
PHPBB3-12637
|
|
|
|
| |
PHPBB3-12594
|
|
|
|
| |
PHPBB3-12594
|
|
|
|
| |
PHPBB3-12286
|
|
|
|
| |
PHPBB3-12286
|
|
|
|
| |
PHPBB3-12286
|
|
|
|
| |
PHPBB3-12286
|
|
|
|
| |
PHPBB3-12286
|
|
|
|
| |
PHPBB3-12286
|
|
|
|
| |
PHPBB3-12286
|
|
|
|
|
|
| |
The request class takes care of this
PHPBB3-12286
|
|
|
|
| |
PHPBB3-12286
|
|
|
|
| |
PHPBB3-12286
|
|
|
|
| |
PHPBB3-12286
|
|
|
|
| |
PHPBB3-12286
|
|
|
|
| |
PHPBB3-12286
|
|
|
|
| |
PHPBB3-12286
|
|\
| |
| |
| |
| | |
* develop-olympus:
[ticket/11794] Add missing array element commas to docs/coding-guidelines.html
|
| |
| |
| |
| |
| |
| |
| |
| | |
Even though the coding guidelines document prescribes "commas after every
array element", it contains several example code fragments with array elements
not terminated by a comma. This commit fixes that.
PHPBB3-11794
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/11112] Do not change opensource.org link to https
[ticket/11112] Use https for user-visible links to phpbb.com
Conflicts:
phpBB/language/en/install.php
phpBB/language/en/ucp.php
|
| |
| |
| |
| | |
PHPBB3-11112
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/11144] Add missing {FORUM_NAME} variable
[ticket/11144] Add missing {FORUM_NAME} variable
Conflicts:
phpBB/download/file.php
phpBB/styles/prosilver/template/login_forum.html
|
| |\
| | |
| | |
| | |
| | |
| | | |
* MGaetan89/ticket/11144:
[ticket/11144] Add missing {FORUM_NAME} variable
[ticket/11144] Add missing {FORUM_NAME} variable
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The template variable {FORUM_NAME} was missing from
the login page of a password protected forum
PHPBB3-11144
|
|\ \ \
| |/ /
| | |
| | |
| | | |
* develop-olympus:
[ticket/11517] Fix list numbering
|
| |/
| |
| |
| | |
PHPBB3-11517
|
| |
| |
| |
| | |
PHPBB3-11287
|
| |
| |
| |
| | |
PHPBB3-10091
|
| |
| |
| |
| | |
PHPBB3-11181
|
| |
| |
| |
| | |
PHPBB3-10855
|
| |
| |
| |
| | |
PHPBB3-10855
|
| |
| |
| |
| | |
PHPBB3-10855
|
| |
| |
| |
| |
| |
| | |
Braces always go on the same line in JavaScript.
PHPBB3-10855
|
| |
| |
| |
| | |
PHPBB3-10161
|
| |
| |
| |
| | |
PHPBB3-10161
|
| |
| |
| |
| | |
PHPBB-10609
|
| |
| |
| |
| |
| |
| | |
Updating styles section in coding guidelines
PHPBB3-10632
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
feature/merging-style-components
* upstream/develop: (65 commits)
[ticket/10730] Added label tag around "select" text in post splitting UI
[ticket/10732] Add config_dev.php and config_test.php to .gitignore
[ticket/10586] Added space in if statement
[ticket/10586] Tidy up comments
[task/php5.3] Updated range of tested PHP versions
[task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
[task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
[ticket/10723] Stop Travis running all tests on sqlite
[ticket/10703] Added a condition to check if ext directory exists
[task/travis] Refactor php version check for dbunit install
[task/travis] Exclude functional and slow tests
[ticket/10719] Revert "Skip functional tests on PHP 5.2"
[task/travis-develop2] Update version from 5.3 to 5.3.2
[task/travis] Dropping support for 5.2 in develop branch
[task/travis] Some more small travis fixes
[task/travis] Rename travis phpunit config files
[task/travis] Fixing some travis issues
[ticket/10684] Adjust function and parameter name, minor changes.
[task/travis] Add automated testing to readme
[task/travis] Removing development information
...
Conflicts:
phpBB/install/database_update.php
|
| | |
| | |
| | |
| | |
| | |
| | | |
to PHP 5.3.2
PHPBB3-10693
|
|/ /
| |
| |
| |
| |
| | |
Updating template inheritance section in coding guidelines
PHPBB3-10632
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/9916] Changing header in non-distributed files
[ticket/9916] Changing coding guidelines license
[ticket/9916] Updating License in the header
Conflicts:
tests/mock/cache.php
|
| |
| |
| |
| | |
PHPBB3-9916
|
| |
| |
| |
| | |
PHPBB3-10524
|
|\ \
| |/
| |
| |
| | |
* 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
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* 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
|