makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-21 18:58:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
13822 commits 18 branches 192 tags 207 MiB
Commit graph

13822 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 9c861a0350.

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 5efdbfa5e4 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
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
Richard Foote
97d4f168f5 [ticket/10675] Add disk full language string when posting attachments 
Add language string visible by admins only for when the disk does not have
enough free space to upload attachments.

PHPBB3-10675
 2012-03-19 15:08:28 -04:00
David King
6a0bad8c0b [ticket/10586] Tests finally work (thanks naderman) 
PHPBB3-10586
 2012-03-19 09:56:48 -04:00
Nils Adermann
1bbb32a5cf [ticket/10586] Correctly purge board cache and don't rename install directory 
PHPBB3-10586
 2012-03-19 09:12:34 -04:00
David King
76e6195194 [ticket/10586] trying to get tests to work 
PHPBB3-10586
 2012-03-19 09:12:34 -04:00
David King
7d1e4bca33 [ticket/10586] more work on getting tests to pass 
PHPBB3-10586
 2012-03-19 09:12:34 -04:00
David King
4100b312bb [ticket/10586] Tests are coming along, just a little more to go 
PHPBB3-10586
 2012-03-19 09:12:33 -04:00
David King
e78585c973 [ticket/10586] Rename install directory back to install/ after tests 
PHPBB3-10586
 2012-03-19 09:12:33 -04:00
David King
66b45318ef [ticket/10586] browse tests now work, but mine dont. at least we are making progress 
PHPBB3-10586
 2012-03-19 09:12:33 -04:00
David King
7b44d6f21a [ticket/10586] initial work on copying fixtures. Note that this depends on 10706 
PHPBB3-10586
 2012-03-19 09:12:33 -04:00
David King
d235262bc2 [ticket/10586] Adding the extensions used by the tests 
PHPBB3-10586
 2012-03-19 09:12:33 -04:00
David King
a37a28b485 [ticket/10586] Now tests run, but fail. But here is what I have. 
PHPBB3-10586
 2012-03-19 09:12:33 -04:00
David King
9212466626 [ticket/10586] some bootstrap additions and test changes to try and make it work 
PHPBB3-10586
 2012-03-19 09:12:32 -04:00
David King
401de113f9 [ticket/10586] test stuff. does not work yet, still need to put phpBB objects in bootstrap.php 2012-03-19 09:12:32 -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