mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
12,783 Commits 17 Branches 190 Tags
Commit Graph

12783 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David King
cfb8f01040 [ticket/10727] Do not hide Quick Reply with javascript on prosilver 
PHPBB3-10727
 2012-03-24 22:03:03 -04:00
Igor Wiedler
a44423baee [feature/event-dispatcher] Change composer autoloading options 
Check if composer's generated autoloader is present, and if not give an error.

PHPBB3-9550
 2012-03-24 21:37:45 +01:00
HTF
2768db44f5 [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket. 
PHPBB3-10129
 2012-03-24 15:13:04 +00:00
Igor Wiedler
ef85ef8ed6 Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcher 
* upstream/develop:
  [ticket/10723] Stop Travis running all tests on sqlite
  [feature/prosilver-cleanup/css-reset-v2] CSS reset
 2012-03-24 15:45:54 +01:00
Igor Wiedler
400277c036 [feature/event-dispatcher] Change phpbb_event_dispatcher to inheritance, tests 
PHPBB3-9550
 2012-03-24 15:45:18 +01: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
Igor Wiedler
935a4abb7e Merge pull request #12 from unknownbliss/feature/events-dispatcher 
Feature/events dispatcher
 2012-03-24 06:31:54 -07:00
Michael Cullum
afc2c5a2e3 [feature/event-dispatcher] Add composer install to travis 
PHPBB3-9550
 2012-03-24 11:03:54 +00: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
Vjacheslav Trushkin
583da4274f Merge branch 'develop' into feature/prosilver-cleanup/duplicate-colors 
* develop: (117 commits)
  [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
  [task/travis] Adding Travis Continuous Intergration Support
  [ticket/10704] minor typo in a comment
  [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
  [ticket/10691] Fixed the speed of creating search index
  [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
  [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
  [ticket/10689] Fix "First character"-option in "Find a member"-search
  ...

Conflicts:
	phpBB/styles/prosilver/theme/cp.css
 2012-03-24 11:45:53 +02:00
Igor Wiedler
e35aecb9bd Merge remote-tracking branch 'upstream/develop' into feature/event-dispatcher 
* upstream/develop: (30 commits)
  [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
  [task/travis] Adding Travis Continuous Intergration Support
  [ticket/10704] minor typo in a comment
  [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
  [ticket/10691] Fixed the speed of creating search index
  [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
  [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
  [ticket/10689] Fix "First character"-option in "Find a member"-search
  ...
 2012-03-23 11:43:54 +01: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
Igor Wiedler
baefbdb882 [feature/event-dispatcher] Add phpbb_event_dispatcher_wrapper 
PHPBB3-9550
 2012-03-21 13:15:45 +01:00
Igor Wiedler
b4b586ae10 [feature/event-dispatcher] Switch subscriber loader to EventDispatcherInterface 
Do not hardcode the implementation of EventDispatcher.

PHPBB3-9550
 2012-03-21 13:09:39 +01:00
Michael Cullum
c2169f6899 [feature/events-dispatcher] Adding phpBB/vendor to .gitignore 
PHPBB3-9550
 2012-03-21 09:17:16 +00:00