David King
cfb8f01040
[ticket/10727] Do not hide Quick Reply with javascript on prosilver
...
PHPBB3-10727
2012-03-24 22:03:03 -04: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
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
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
Andreas Fischer
dad37a4329
Merge remote-tracking branch 'dhruvgoel92/ticket/10691' into develop-olympus
...
* dhruvgoel92/ticket/10691:
[ticket/10691] Fixed the speed of creating search index
2012-03-19 12:55:24 +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
Oleg Pudeyev
1fa39ea722
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:35 -04:00
Oleg Pudeyev
81eeafbb8d
Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympus
...
* nickvergessen/ticket/8636:
[ticket/8636] Add resync option to topic_view moderation page
2012-03-16 06:18:29 -04:00
Oleg Pudeyev
8de8dc916e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10689] Fix "First character"-option in "Find a member"-search
2012-03-16 06:06:56 -04:00
Oleg Pudeyev
95e011ccbe
Merge remote-tracking branch 'nickvergessen/ticket/10689' into develop-olympus
...
* nickvergessen/ticket/10689:
[ticket/10689] Fix "First character"-option in "Find a member"-search
2012-03-16 06:06:44 -04:00
Oleg Pudeyev
29b11b69f8
Merge remote-tracking branch 'nickvergessen/ticket/10690' into develop
...
* nickvergessen/ticket/10690:
[ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
2012-03-16 05:29:23 -04:00
Oleg Pudeyev
ccdd176b72
[task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
...
Split module_auth into a static and a non-static version.
Call the static version statically and the non-static version non-statically.
PHPBB3-10615
2012-03-16 04:56:41 -04:00
Oleg Pudeyev
5efdbfa5e4
[task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
...
We cannot use static in Olympus because it must be PHP 4 compatible.
Therefore disable E_STRICT for Olympus.
This commit should be reverted for Ascraeus.
PHPBB3-10615
2012-03-15 22:47:42 -04:00
Oleg Pudeyev
71afba0ded
[task/php54] Refactor error_reporting call slightly.
...
Separate error level assignment into a variable in this commit
so that the only difference between Olympus and Ascraeus
is the addition of logic altering $level.
PHPBB3-10615
2012-03-15 22:46:06 -04:00
Joas Schilling
33dce916e2
[ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
...
PHPBB3-10690
2012-03-14 22:22:22 +01:00
Joas Schilling
3b7a6a3efa
[ticket/10689] Fix "First character"-option in "Find a member"-search
...
PHPBB3-10689
2012-03-12 00:39:12 +01:00
rxu
ff8d523768
[ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
...
PHPBB3-10684
2012-03-12 01:57:51 +08:00
rxu
da395edbca
[ticket/10684] Remove intval mapping for array keys
...
PHP manual for arrays http://php.net/manual/en/language.types.array.php states
that the following key cast will occur: Strings containing valid integers will
be cast to the integer type. E.g. the key "8" will actually be stored under 8.
Thus, no intval mapping for numeric array keys is needed.
PHPBB3-10684
2012-03-12 01:47:28 +08:00
