| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
binlog files are now added to the data folder.
PHPBB3-10946
|
|
|
|
| |
PHPBB3-10946
|
|\
| |
| |
| |
| | |
* develop-olympus:
[ticket/10925] Clarify installation requirements for SQLite
|
| |\
| | |
| | |
| | |
| | | |
* Noxwizard/ticket/10925:
[ticket/10925] Clarify installation requirements for SQLite
|
| | |
| | |
| | |
| | | |
PHPBB3-10925
|
|\ \ \
| | | |
| | | | |
[ticket/10855] Modified coding guidelines to reflect JS brace changes.
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10855
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10855
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10855
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Braces always go on the same line in JavaScript.
PHPBB3-10855
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* develop-olympus:
[develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.
[develop-olympus] Add changelog for 3.0.11 release.
[develop-olympus] Bump version numbers for 3.0.11-RC1 release.
[develop-olympus] Bumping version numbers to final for 3.0.11 releases.
Conflicts:
phpBB/docs/INSTALL.html
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
|
| | | | |
|
| | | | |
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
By Andreas Fischer
via Nils Adermann (2) and Andreas Fischer (1)
* develop-olympus:
[ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10788:
[ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
|
| | | |/
| | |/|
| | | |
| | | | |
PHPBB3-10788
|
|\ \ \ \
| |/ / /
| | | /
| |_|/
|/| | |
* develop-olympus:
[ticket/9896] Links changed
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
* Senky/ticket/9896:
[ticket/9896] Links changed
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Link to languaged updated to http://www.phpbb.com/languages/
Link to styles updated to http://www.phpbb.com/customise/db/styles-2/
Link to MODs updated to http://www.phpbb.com/customise/db/modifications-1/
Link to Community Forums updated to http://www.phpbb.com/community/
PHPBB3-9896
|
| | | |
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10688
PHPBB3-10843
|
| | |/
| |/|
| | |
| | |
| | | |
PHPBB3-10688
PHPBB3-10834
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* Senky/ticket/10161:
[ticket/10161] added fullstop to the end of sentence
[ticket/10161] coding-guidelines.html updated
[ticket/10161] all "e-mail" strings in language files changed to "email"
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10161
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10161
|
|\ \ \ \
| |/ / /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* shibulijack/ticket/10688:
[ticket/10688] Update install.html for 3.1 and current practices.
[ticket/10688] Update readme for 3.1 and current practices.
[ticket/10688] Changed version 3.0 to 3.1
[ticket/10688] Updated version to 3.1
[ticket/10688] Changed 3.0 to 3.1 in docs
Conflicts:
phpBB/docs/INSTALL.html
phpBB/docs/README.html
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10688
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10688
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Replaced all the occurrences of phpBB 3.0 with phpBB 3.1 in all the doc
files
PHPBB-10688
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | | |
* develop-olympus:
[ticket/10788] Move ckwalsh and kellanved to the Former Contributors section.
[ticket/10788] Add imkingdavid to the list of developers in docs/AUTHORS.
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10788
|
| | |/
| |/|
| | |
| | | |
PHPBB3-10788
|
| | |
| | |
| | |
| | | |
PHPBB3-10609
|
| | |
| | |
| | |
| | | |
PHPBB-10609
|
| | |
| | |
| | |
| | |
| | |
| | | |
Updating styles section in coding guidelines
PHPBB3-10632
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* develop: (175 commits)
[feature/ajax] Remove strange non-breaking spaces from approve button
[feature/ajax] Add entirely unrelated but nice newlines
[feature/ajax] Unify phpbb_json_response instantiation
[feature/ajax] Fix acp_styles activate_deactivate ajax callback name
[feature/ajax] Send correct activate/deactivate JSON response in acp_profile
[ticket/10270] Alter background colors for posts
[feature/ajax] Remove not working module enable/disable ajax code
[feature/ajax] Replace static call to phpbb_request with OO
[feature/ajax] Remove quick-reply AJAX handling until we have something good
[ticket/10270] Changing close button for ajax popups
[ticket/10270] Disabling links in disappearing content
[ticket/10291] Fixed an AJAX bug on quick reply form submit.
[ticket/10273] Fixed accepting / denying posts AJAX.
[ticket/10272] Removed code that was prevent event propogation in AJAX.
[ticket/10291] Fixed a bug in the quick reply AJAX.
[feature/ajax] Handle acp_modules error cases with JSON response
[feature/ajax] Fix filter check, quick mod tools data-attribute
[feature/ajax] Use the error handler
[feature/ajax] Generic error handling with a phpbb.alert box
[feature/ajax] Change filter semantics, some minor adjustments
...
Conflicts:
phpBB/adm/style/acp_styles.html
phpBB/includes/acp/acp_styles.php
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* upstream/develop: (35 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/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket.
[ticket/10703] Added a condition to check if ext directory exists
[ticket/10708] Check converted passwords for multi-byte characters
[ticket/10586] Tests finally work (thanks naderman)
[ticket/10586] Correctly purge board cache and don't rename install directory
[ticket/10586] trying to get tests to work
[ticket/10586] more work on getting tests to pass
[ticket/10586] Tests are coming along, just a little more to go
[ticket/10586] Rename install directory back to install/ after tests
[ticket/10586] browse tests now work, but mine dont. at least we are making progress
[ticket/10586] initial work on copying fixtures. Note that this depends on 10706
[ticket/10586] Adding the extensions used by the tests
[ticket/10586] Now tests run, but fail. But here is what I have.
...
|
| | |_|/
| |/| |
| | | |
| | | | |
PHPBB3-9550
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | | |
PHPBB3-10693
|
| |/ /
| | |
| | |
| | |
| | |
| | | |
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-9916
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[prep-release-3.0.10] Update Changelog for 3.0.10-RC3 release.
|
| | |
|
| |
| |
| |
| | |
PHPBB3-10524
|
|\ \
| |/
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/10480] Add a build target for changelog building.
[ticket/10480] Add a build script for exporting the changelog from tracker.
[ticket/10502] Fix typo in changelog. 'red' should have been 'read'.
|
| |
| |
| |
| | |
PHPBB3-10502
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[prep-release-3.0.10] Remove duplicate ticket PHPBB3-10490 from changelog.
|