Tristan Darricau
cd7b21a703
[ticket/12993] Update doc block
...
PHPBB3-12993
2014-09-24 16:07:23 +02:00
Tristan Darricau
834aea70a7
[ticket/12657] Fix unit tests
...
PHPBB3-12657
2014-09-24 15:24:56 +02:00
Joas Schilling
77ed437b79
Merge branch 'develop-ascraeus' into develop
...
Conflicts:
phpBB/styles/subsilver2/template/timezone_option.html
2014-09-24 14:49:50 +02:00
Joas Schilling
85bc9b69ae
Merge pull request #2844 from marc1706/ticket/12858
...
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
2014-09-24 13:47:59 +02:00
Joas Schilling
cb92b4668e
Merge branch 'develop-ascraeus' into develop
2014-09-24 12:26:21 +02:00
Joas Schilling
f3fef8934e
Merge pull request #2954 from rxu/ticket/13055
...
[ticket/13055] Fix string profile fields validation to support unicode
2014-09-24 12:25:57 +02:00
Joas Schilling
9717d860da
Merge branch 'develop-ascraeus' into develop
2014-09-24 10:34:08 +02:00
Joas Schilling
43279ee010
Merge pull request #2983 from Senky/ticket/13094
...
[ticket/13094] Remove the search box if there are no new posts to search for
2014-09-24 10:33:58 +02:00
Joas Schilling
6d0697eb89
[ticket/13077] Move extension module to the top of the Customise tab
...
PHPBB3-13077
2014-09-24 00:34:17 +02:00
Andreas Fischer
a437c8fdfd
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.
2014-09-23 23:34:03 +02:00
Andreas Fischer
d5128b3e87
Merge pull request #2988 from prototech/ticket/13011
...
[ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.
* prototech/ticket/13011:
[ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.
2014-09-23 23:34:03 +02:00
Andreas Fischer
138d320960
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13048] Only do not update the session page for ajax requests
2014-09-23 23:29:52 +02:00
Andreas Fischer
9feb7096ee
Merge pull request #2985 from nickvergessen/ticket/13048
...
[ticket/13048] Only do not update the session page for ajax requests
* nickvergessen/ticket/13048:
[ticket/13048] Only do not update the session page for ajax requests
2014-09-23 23:29:52 +02:00
Andreas Fischer
f20e3e9feb
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13070] Use old 'template' class for template class hook
2014-09-23 23:25:59 +02:00
Andreas Fischer
34aad4046f
Merge pull request #2982 from marc1706/ticket/13070
...
[ticket/13070] Use old 'template' class for template class hook
* marc1706/ticket/13070:
[ticket/13070] Use old 'template' class for template class hook
2014-09-23 23:25:59 +02:00
Andreas Fischer
cdd36f3243
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13096] Add phpbb_ prefix to ldap_escape()
2014-09-23 22:55:24 +02:00
Andreas Fischer
80f15a41c4
Merge branch 'develop-olympus' into develop-ascraeus
...
* develop-olympus:
[ticket/13096] Add phpbb_ prefix to ldap_escape()
Conflicts:
phpBB/includes/auth/auth_ldap.php
2014-09-23 22:55:13 +02:00
Andreas Fischer
2f773fca18
Merge pull request #2989 from Senky/ticket/13096
...
[ticket/13096] ldap_escape() added to PHP 5.6.0
* Senky/ticket/13096:
[ticket/13096] Add phpbb_ prefix to ldap_escape()
2014-09-23 22:54:27 +02:00
Jakub Senko
ba464ec93a
[ticket/13096] Add phpbb_ prefix to ldap_escape()
...
PHPBB3-13096
2014-09-23 22:43:52 +02:00
Cesar G
80d5a1ec1f
[ticket/13011] Do not apply bbcode to whole text when selecting first 2 chars.
...
PHPBB3-13011
2014-09-23 12:56:20 -07:00
Cesar G
b57f050d8e
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/12889] Fix multiple select lists
[ticket/13082] Repair fix
[ticket/13082] Join classes
[ticket/13082] move style to css file
[ticket/13082] Replace float by text-align
2014-09-23 12:49:28 -07:00
Cesar G
f2a98339e2
Merge remote-tracking branch 'hanakin/ticket/12889' into develop-ascraeus
...
* hanakin/ticket/12889:
[ticket/12889] Fix multiple select lists
2014-09-23 12:49:04 -07:00
Cesar G
2478eef550
Merge remote-tracking branch 'Senky/ticket/13082' into develop-ascraeus
...
* Senky/ticket/13082:
[ticket/13082] Repair fix
[ticket/13082] Join classes
[ticket/13082] move style to css file
[ticket/13082] Replace float by text-align
2014-09-23 12:48:23 -07:00
Cesar G
ead5276106
Merge branch 'develop-ascraeus' into develop
...
* develop-ascraeus:
[ticket/13097] Add missing unit type
2014-09-23 10:06:33 -07:00
Cesar G
7307380091
Merge remote-tracking branch 'hanakin/ticket/13097' into develop-ascraeus
...
* hanakin/ticket/13097:
[ticket/13097] Add missing unit type
2014-09-23 10:06:00 -07:00
hanakin
fb610f99df
[ticket/12889] Fix multiple select lists
...
PHPBB3-12889
2014-09-23 17:24:26 +02:00
hanakin
aa1ffc9319
[ticket/13097] Add missing unit type
...
PHPBB3-13097
2014-09-23 17:11:51 +02:00
Joas Schilling
c4428a507a
Merge branch 'develop-ascraeus' into develop
2014-09-23 15:32:22 +02:00
Joas Schilling
ef9e0e743a
Merge pull request #2937 from Senky/ticket/13027
...
[ticket/13027] PM folder full percentage could be a bit more accurate
2014-09-23 15:32:14 +02:00
Joas Schilling
820db008ff
[ticket/13048] Only do not update the session page for ajax requests
...
The session time still needs to be updated, so e.g. long upload times
with PLupload stop the session from timing out.
PHPBB3-13048
2014-09-23 15:25:40 +02:00
Joas Schilling
d5691431ef
Merge branch 'develop-ascraeus' into develop
2014-09-23 14:43:17 +02:00
Joas Schilling
05ae327553
Merge pull request #2974 from hanakin/ticket/13080
...
[Ticket/13080] Fix text overflow issue in mobile
2014-09-23 14:43:04 +02:00
Marc Alexander
397be4d93f
Merge branch 'develop-ascraeus' into develop
2014-09-23 11:12:39 +02:00
Marc Alexander
9b8d8b020f
Merge branch 'develop-olympus' into develop-ascraeus
2014-09-23 11:10:47 +02:00
Marc Alexander
92b096b05b
Merge pull request #2984 from nickvergessen/ticket/10729-asc
...
[3.1][ticket/10729] Update editor information when user being deleted
2014-09-23 11:09:29 +02:00
Marc Alexander
8bd1853b56
Merge pull request #2981 from nickvergessen/ticket/10729
...
Ticket/10729 Update editor information when user being deleted
2014-09-23 11:08:56 +02:00
Joas Schilling
96024e88e9
[ticket/10729] Also test *delete_user on posts and topics
...
PHPBB3-10729
2014-09-23 09:54:21 +02:00
Joas Schilling
d6008e896a
[ticket/10729] Fix handling of third parameter in 3.1
...
PHPBB3-10729
2014-09-23 09:42:30 +02:00
Joas Schilling
10b6399d30
[ticket/10729] Fix setup of the tests for 3.1
...
PHPBB3-10729
2014-09-23 09:38:35 +02:00
Joas Schilling
eeeb62b433
[ticket/10729] Update fixture to 3.1 database structure
...
PHPBB3-10729
2014-09-23 09:31:33 +02:00
Joas Schilling
9ff6358dc9
Merge branch 'ticket/10729' into ticket/10729-asc
...
Conflicts:
phpBB/includes/functions_user.php
2014-09-23 09:31:13 +02:00
Joas Schilling
bea5f94de6
[ticket/10729] Use mocked null cache for phpunit 3.6 on travis with php 5.2
...
PHPBB3-10729
2014-09-23 09:03:44 +02:00
Joas Schilling
e28b93e0cc
[ticket/10729] Ensure that no bans exist before testing create_session
...
PHPBB3-10729
2014-09-22 23:56:31 +02:00
Jakub Senko
9a8a0af7ba
[ticket/13094] Condition search properly
...
PHPBB3-13094
2014-09-22 21:12:18 +02:00
Marc Alexander
d03be5ea5f
[ticket/13070] Use old 'template' class for template class hook
...
PHPBB3-13070
2014-09-22 20:03:55 +02:00
Joas Schilling
7fca351e05
[ticket/10729] Add assert messages and finish up tests
...
PHPBB3-10729
2014-09-22 02:01:54 +02:00
Joas Schilling
d7c12ccd60
[ticket/10729] Add tests for some special tables with unique conditions
...
PHPBB3-10729
2014-09-22 01:42:36 +02:00
Joas Schilling
74854ac65d
[ticket/10729] Add tests for user posts, reports and attachments
...
PHPBB3-10729
2014-09-22 00:55:34 +02:00
Joas Schilling
d48e4b680e
[ticket/10729] Fix doc block for user_delete
...
PHPBB3-10729
2014-09-22 00:55:08 +02:00
Dhruv
29ffddee71
[ticket/12962] bootstrap functional and ui test when php >5.3.19
...
PHPBB3-12962
2014-09-21 15:54:52 +05:30
