1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-22 15:31:28 +02:00

12650 Commits

Author SHA1 Message Date
Igor Wiedler
9be55ba771 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10732] Add config_dev.php and config_test.php to .gitignore
2012-03-28 23:39:16 +02:00
Igor Wiedler
a820ff1ebc Merge pull request #664 from imkingdavid/ticket/10732
[ticket/10732] Add config_dev.php and config_test.php to .gitignore
2012-03-28 14:38:16 -07:00
David King
1789e0948b [ticket/10732] Add config_dev.php and config_test.php to .gitignore
PHPBB3-10732
2012-03-28 17:05:45 -04:00
Igor Wiedler
7258794be3 Merge remote-tracking branch 'imkingdavid/ticket/10586' into develop
* imkingdavid/ticket/10586:
  [ticket/10586] Added space in if statement
  [ticket/10586] Tidy up comments
  [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.
  [ticket/10586] some bootstrap additions and test changes to try and make it work
  [ticket/10586] test stuff. does not work yet, still need to put phpBB objects in bootstrap.php
  [ticket/10586] Copy/paste fail fixed
  [ticket/10586] Sanitize periods from class names, use manager to get path.
  [ticket/10586] Removed file_exists() check because class_exists() covers that.
  [ticket/10586] Extension front controller
2012-03-28 21:36:07 +02:00
David King
7c3ebcc3ff [ticket/10586] Added space in if statement
PHPBB3-10586
2012-03-28 15:34:24 -04:00
Oleg Pudeyev
4239d8aa4e Merge remote-tracking branch 'brunoais/feature/save-post-on-report' into develop
* brunoais/feature/save-post-on-report:
  [feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic
  [feature/save-post-on-report] bbcode_nl2br missing.
  [feature/save-post-on-report] Change the column type of reported text
  [feature/save-post-on-report] Changed the name of the column
  [feature/save-post-on-report] Bug fix table name
  [feature/save-post-on-report] Saves the post reported when a report is creat
  [feature/save-post-on-report] The complete changes for this feature
2012-03-27 22:45:02 -04:00
David King
56f75dbf93 [ticket/10586] Tidy up comments
PHPBB3-10586
2012-03-27 19:57:32 -04:00
Andreas Fischer
17a7fb7743 Merge remote-tracking branch 'imkingdavid/task/php5.3' into develop
* imkingdavid/task/php5.3:
  [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
2012-03-27 00:26:59 +02:00
David King
9bcf53057e [task/php5.3] Updated range of tested PHP versions
PHPBB3-10693
2012-03-26 17:56:10 -04:00
David King
063f6893af [task/php5.3] Looks like I missed a few places that needed PHP 5.2 changed to PHP 5.3.2
PHPBB3-10693
2012-03-25 21:20:52 -04:00
David King
75e731e14b [task/php5.3] Changed minimum PHP requirement for Ascraeus to 5.3.2
PHPBB3-10693
2012-03-25 21:20:52 -04:00
Andreas Fischer
a74e050310 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10694] Adjusting details link to 5.3 announcement
  [ticket/10694] Update PHP warning to 5.3.2
2012-03-26 00:06:25 +02:00
Andreas Fischer
a618e22fca Merge remote-tracking branch 'unknownbliss/ticket/10694' into develop-olympus
* unknownbliss/ticket/10694:
  [ticket/10694] Adjusting details link to 5.3 announcement
  [ticket/10694] Update PHP warning to 5.3.2
2012-03-26 00:06:17 +02:00
Andreas Fischer
0257cd1653 Merge remote-tracking branch 'dhruvgoel92/ticket/10703' into develop
* dhruvgoel92/ticket/10703:
  [ticket/10703] Added a condition to check if ext directory exists
2012-03-25 23:58:56 +02:00
Andreas Fischer
0ce899cb87 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10723] Stop Travis running all tests on sqlite
2012-03-24 14:57:42 +01:00
Andreas Fischer
9c85c6c318 Merge remote-tracking branch 'unknownbliss/ticket/10723' into develop-olympus
* unknownbliss/ticket/10723:
  [ticket/10723] Stop Travis running all tests on sqlite
2012-03-24 14:52:50 +01:00
Oleg Pudeyev
fb51bc487a Merge remote-tracking branch 'cyberalien/feature/prosilver-cleanup/css-reset-v2' into develop
* cyberalien/feature/prosilver-cleanup/css-reset-v2:
  [feature/prosilver-cleanup/css-reset-v2] CSS reset
2012-03-24 06:54:26 -04:00
Michael Cullum
5bcdfe94dd [ticket/10723] Stop Travis running all tests on sqlite
Correct information so all tests don't run on sqlite

PHPBB3-10723
2012-03-23 06:40:15 +00:00
Dhruv Goel
18c541dfee [ticket/10703] Added a condition to check if ext directory exists
The existence of ext directory is checked, if not present a proper
error message that file doesn't exist is printed out. No Fatal
Error messages.

PHPBB3-10703
2012-03-23 00:27:29 +05:30
Andreas Fischer
cc13bac412 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10684] Adjust function and parameter name, minor changes.
  [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
  [ticket/10684] Remove intval mapping for array keys
  [ticket/10684] Adjust pm_notifications() to handle stale bans
  [ticket/10684] Cast user_id to integer
  [ticket/10684] Refactor $sql_ignore_users array update
  [ticket/10684] Remove isset() for $sql_ignore_users update
  [ticket/10684] Fix 2 typos in comment lines.
  [ticket/10684] Send notifications for users with stale bans

Conflicts:
	phpBB/includes/functions_user.php
2012-03-22 18:15:10 +01:00
Andreas Fischer
57eb50812f Merge remote-tracking branch 'rxu/ticket/10684' into develop-olympus
* rxu/ticket/10684:
  [ticket/10684] Adjust function and parameter name, minor changes.
  [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
  [ticket/10684] Remove intval mapping for array keys
  [ticket/10684] Adjust pm_notifications() to handle stale bans
  [ticket/10684] Cast user_id to integer
  [ticket/10684] Refactor $sql_ignore_users array update
  [ticket/10684] Remove isset() for $sql_ignore_users update
  [ticket/10684] Fix 2 typos in comment lines.
  [ticket/10684] Send notifications for users with stale bans
2012-03-22 18:14:13 +01:00
Nils Adermann
81310f9351 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/travis] Refactor php version check for dbunit install
2012-03-22 17:16:11 +01:00
Nils Adermann
1337f86123 Merge remote-tracking branch 'github-unknownbliss/task/travis' into develop-olympus
* github-unknownbliss/task/travis:
  [task/travis] Refactor php version check for dbunit install
2012-03-22 17:15:52 +01:00
Michael Cullum
841d11c6cd [task/travis] Refactor php version check for dbunit install
PHPBB3-10718
2012-03-22 16:09:58 +00:00
Nils Adermann
aef9f31325 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/travis] Exclude functional and slow tests
2012-03-22 17:03:23 +01:00
Nils Adermann
992b58d468 Merge remote-tracking branch 'github-unknownbliss/task/travis' into develop-olympus
* github-unknownbliss/task/travis:
  [task/travis] Exclude functional and slow tests
2012-03-22 17:03:03 +01:00
Michael Cullum
0ed66ad0e8 [task/travis] Exclude functional and slow tests
PHPBB3-10718
2012-03-22 16:00:10 +00:00
Nils Adermann
b3169b376f Merge branch 'ticket/unknownbliss/10719' into develop
* ticket/unknownbliss/10719:
  [ticket/10719] Revert "Skip functional tests on PHP 5.2"
2012-03-22 16:36:06 +01:00
Michael Cullum
0172ced4e2 [ticket/10719] Revert "Skip functional tests on PHP 5.2"
This reverts commit 9c861a0350ae67f06a38ee6efc890412a32751f4.

PHPBB3-10719
2012-03-22 15:32:18 +00:00
Nils Adermann
2180902f11 Merge remote-tracking branch 'github-unknownbliss/task/travis-develop2' into develop
* github-unknownbliss/task/travis-develop2:
  [task/travis-develop2] Update version from 5.3 to 5.3.2
  [task/travis] Dropping support for 5.2 in develop branch
2012-03-22 16:23:51 +01:00
Nils Adermann
bab98ca5c2 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  [task/travis] Adding Travis Continuous Intergration Support
2012-03-22 16:12:35 +01:00
Nils Adermann
6f809416ba Merge remote-tracking branch 'github-unknownbliss/task/travis' into develop-olympus
* github-unknownbliss/task/travis:
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  [task/travis] Adding Travis Continuous Intergration Support
2012-03-22 16:11:55 +01:00
Michael Cullum
e034eb96b7 [task/travis-develop2] Update version from 5.3 to 5.3.2
PHPBB3-10718
2012-03-22 14:56:55 +00:00
Michael Cullum
4000d8051d [task/travis] Dropping support for 5.2 in develop branch
PHPBB3-10718
2012-03-22 14:45:45 +00:00
Michael Cullum
115ee7f3b8 [task/travis] Some more small travis fixes
PHPBB3-10718
2012-03-22 14:44:36 +00:00
Michael Cullum
c7f65fba62 [task/travis] Rename travis phpunit config files
PHPBB3-10718
2012-03-22 14:13:25 +00:00
Michael Cullum
d1980f6ad6 [task/travis] Fixing some travis issues
PHPBB3-10718
2012-03-22 13:32:58 +00:00
rxu
5a9dd1994f [ticket/10684] Adjust function and parameter name, minor changes.
PHPBB3-10684
2012-03-22 21:19:01 +08:00
Andreas Fischer
67ae7f6b60 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
2012-03-22 11:11:31 +01:00
Andreas Fischer
99a271f34b Merge remote-tracking branch 'nickvergessen/ticket/10717' into develop-olympus
* nickvergessen/ticket/10717:
  [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
2012-03-22 11:11:21 +01:00
Andreas Fischer
099f8de621 Merge remote-tracking branch 'dhruvgoel92/ticket/10704' into develop
* dhruvgoel92/ticket/10704:
  [ticket/10704] minor typo in a comment
2012-03-22 10:59:41 +01:00
Andreas Fischer
89f988ecdd Merge remote-tracking branch 'p/task/php54-ascraeus' into develop
* p/task/php54-ascraeus:
  [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
2012-03-22 10:56:07 +01:00
Andreas Fischer
21bd0ca31a Merge branch 'develop-olympus' into develop
With 5efdbfa5e4e3c00c08167cdfff912ee4937f4fd2 reverted.

* develop-olympus:
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
2012-03-22 10:51:03 +01:00
Andreas Fischer
e5205ba2f8 Merge remote-tracking branch 'p/task/php54-olympus' into develop-olympus
* p/task/php54-olympus:
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
2012-03-22 10:49:37 +01:00
Michael Cullum
4325bbf4c6 [task/travis] Add automated testing to readme
PHPBB3-10718
2012-03-22 09:08:43 +00:00
Michael Cullum
9120c7691e [task/travis] Removing development information
PHPBB3-10718
2012-03-22 09:08:12 +00:00
Michael Cullum
4dafcc2525 [task/travis] Adding Travis Continuous Intergration Support
PHPBB3-10718
2012-03-22 09:05:59 +00:00
Dhruv Goel
92f771eb82 [ticket/10704] minor typo in a comment
Make sure $id separation is working fine

PHPBB3-10704
2012-03-22 03:10:14 +05:30
Joas Schilling
2005c339ff [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
PHPBB3-10717
2012-03-20 17:45:08 +01:00
David King
6a0bad8c0b [ticket/10586] Tests finally work (thanks naderman)
PHPBB3-10586
2012-03-19 09:56:48 -04:00