1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-01 12:05:37 +02:00

12059 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
Richard Foote
70d88965c7 [ticket/10708] Check converted passwords for multi-byte characters
Check for multi-byte characters in converted passwords.

PHPBB3-10708
2012-03-19 23:19:21 -04:00
David King
e5ce964656 [ticket/10586] Copy/paste fail fixed
PHPBB3-10586
2012-03-19 09:12:32 -04:00
David King
e45452d1b3 [ticket/10586] Sanitize periods from class names, use manager to get path.
PHPBB3-10586
2012-03-19 09:12:32 -04:00
David King
969c6d42e3 [ticket/10586] Removed file_exists() check because class_exists() covers that.
PHPBB3-10586
2012-03-19 09:12:32 -04:00
David King
a0131b45f5 [ticket/10586] Extension front controller
Handle extension front pages

PHPBB3-10586
2012-03-19 09:12:31 -04:00
Bruno Ais
3a044b4b3e [feature/save-post-on-report] Changed mark in subsilver2 to look like viewtopic
As cyberalien requested. This was changed to match better the idea behind
what was made in prosilver to subsilver2.

PHPBB3-10600
2012-03-19 08:27:32 -04:00
Bruno Ais
28c6b95100 [feature/save-post-on-report] bbcode_nl2br missing.
New lines were missing in the reported_post_text.
By adding the bbcode_nl2br() became as it is supposed to.

PHPBB3-10600
2012-03-19 08:27:32 -04:00
Bruno Ais
165a2d1aa8 [feature/save-post-on-report] Change the column type of reported text
What ever it said. I changed the type of data in the column
reported_post_text to match what was requested by p

PHPBB3-10600
2012-03-19 08:27:32 -04:00
Bruno Ais
18373035c3 [feature/save-post-on-report] Changed the name of the column
The name of the column was changed from reported_post AND
reported_text to reported_post_text.
This change was made by request

PHPBB3-10600
2012-03-19 08:27:32 -04:00
Bruno Ais
6f5c0dddfc [feature/save-post-on-report] Bug fix table name
There was a bug in the previous commit. I changed the name
of the colon of the table and forgot to update the database_update.php
now it's fixed.

PHPBB3-10600
2012-03-19 08:27:32 -04:00
Bruno Ais
c241a4a2b4 [feature/save-post-on-report] Saves the post reported when a report is creat
A problem when creating a report is that the report may be made and then
the post changed. After the changes, if the report is seen the message
it shows may not be correct to be reported. With these changes, when
a report is created the system copies the post that was reported and
shows it in the report details in the MCP

PHPBB3-10600
2012-03-19 08:27:31 -04:00
Bruno Ais
95b5109c62 [feature/save-post-on-report] The complete changes for this feature
This covers all the changes so that when a report is made, the post
itself is copied and displayed in the MCP instead of the current post.
Unfortunatly, I made all commits in the wrong way and they were lost.
Now I have only the final files.
2012-03-19 08:27:31 -04:00
Andreas Fischer
cfd0afe4ea Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10691] Fixed the speed of creating search index
2012-03-19 12:55:37 +01:00
Dhruv Goel
c551b46115 [ticket/10691] Fixed the speed of creating search index
$time is now initialized after each batch iteration.
Speed for each batch iteration of creating search index is fixed.

PHPBB3-10691
2012-03-19 17:11:30 +05:30
Igor Wiedler
847d47a533 [feature/event-dispatcher] Change subscriber naming {subscriber => listener}.php
This is more consistent with what Symfony2 uses (EventListener/FooListener.php).

PHPBB3-9550
2012-03-18 23:12:17 +01:00
Oleg Pudeyev
43899ffdf3 [feature/event-dispatcher] Implement mutation for page_header ledge.
PHPBB3-9550
2012-03-18 02:48:55 -04:00
Oleg Pudeyev
be23445b8c [feature/event-dispatcher] Add get_data_filtered function to event data.
Its purpose is to discard any keys added by hooks to data stored
in the event, such that only keys that the ledge knows how to handle
are processed.

PHPBB3-9550
2012-03-18 02:48:55 -04:00
Oleg Pudeyev
fbf34f16ab [feature/event-dispatcher] Implement configurable autoloader selection.
The code is in startup.php which should be used by all scripts.

PHPBB3-9550
2012-03-18 02:48:55 -04:00