Nils Adermann
c5a15c0635
[ticket/13617] Use request->variable instead of request_var
...
PHPBB3-13617
2015-02-25 16:58:38 +01:00
Nils Adermann
d08d988df4
Merge branch 'ticket/13617' into ticket/13617-ascraeus
...
* ticket/13617:
[ticket/13617] Enforce column size limit for session_forum_id
Conflicts:
phpBB/phpbb/session.php
2015-02-25 16:25:20 +01:00
Nils Adermann
6f3f6282d1
[ticket/13617] Enforce column size limit for session_forum_id
...
PHPBB3-13617
2015-02-25 16:20:50 +01:00
Joas Schilling
261c3bc1d0
Merge branch '3.1.x'
2015-02-24 21:57:14 +01:00
Joas Schilling
3ac583271f
Merge pull request #3381 from rxu/ticket/13591
...
[ticket/13591] Add core events to the function obtain_users_online_string()
2015-02-24 21:56:34 +01:00
Joas Schilling
06d6bcbe00
Merge branch '3.1.x'
2015-02-24 21:53:05 +01:00
Joas Schilling
9f9e392c7d
Merge pull request #3436 from RMcGirr83/ticket/13650
...
[ticket/13650] Validate ucp profile data changes
2015-02-24 21:53:01 +01:00
Joas Schilling
17b00812a7
Merge branch '3.1.x'
2015-02-24 20:44:37 +01:00
Joas Schilling
56cbff720d
Merge pull request #3439 from RMcGirr83/ticket/13587
...
[ticket/13587] SQL syntax errors in get_prune_users()
2015-02-24 20:44:15 +01:00
RMcGirr83
80e1c233d9
[ticket/13587] SQL syntax errors in get_prune_users()
...
PHPBB3-13587
2015-02-24 13:28:47 -05:00
Marc Alexander
b650f45d55
[ticket/12368] Correctly check if avatars migration is installed
...
Try to set the avatar type to string value to check if new avatar
types are supported.
PHPBB3-12368
2015-02-24 11:43:33 +01:00
Richard McGirr
03ded5853b
[ticket/13650] Validate ucp profile data changes
...
PHPBB3-13650
2015-02-23 21:19:10 -05:00
Andreas Fischer
525a62f72e
Merge pull request #3433 from Nicofuma/ticket/13643
...
[ticket/13643] Change the priority of kernel_terminate_subscriber to -10000
* Nicofuma/ticket/13643:
[ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
2015-02-22 23:44:42 +01:00
Andreas Fischer
b57e00226a
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
2015-02-22 23:44:42 +01:00
Joas Schilling
9c6fba558c
[ticket/13647] Switch FAQ handling in view online to controller
...
PHPBB3-13647
2015-02-22 22:57:14 +01:00
Joas Schilling
19a236205f
[ticket/13647] Generate route links for faq
...
PHPBB3-13647
2015-02-22 22:44:50 +01:00
Joas Schilling
9bd6535a7d
[ticket/13647] Send 301 status
...
PHPBB3-13647
2015-02-22 22:44:31 +01:00
Joas Schilling
0357a4d89b
Merge branch '3.1.x'
2015-02-22 22:27:59 +01:00
Joas Schilling
269dee4189
Merge pull request #3415 from RMcGirr83/ticket/13578
...
[ticket/13578] Add ucp_register.php core events
2015-02-22 22:27:41 +01:00
Nicofuma
ffc5a73a0c
[ticket/13643] Change the priority of kernel_terminate_subscriber to PHP_INT_MIN
...
PHP_INT_MIN isn't a defined constant but it can be calculed by
~PHP_INT_MAX (two's complement of PHP_INT_MAX)
PHPBB3-13643
2015-02-22 21:53:05 +01:00
Joas Schilling
0595ab959c
[ticket/13647] Move FAQ page to a controller
...
PHPBB3-13647
2015-02-22 20:20:28 +01:00
Andreas Fischer
71eb981a81
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:36 +01:00
Andreas Fischer
d152bbc727
Merge pull request #3427 from prototech/ticket/13551
...
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
* prototech/ticket/13551:
[ticket/13551] Fix incorrectly named template variable: AUTH_LDAP_DN
2015-02-22 18:57:35 +01:00
Andreas Fischer
677337348f
Merge branch '3.1.x'
...
* 3.1.x:
[ticket/13644] Always type hint dispatch_interface
2015-02-22 17:39:45 +01:00
Andreas Fischer
702a51b01c
Merge pull request #3431 from Nicofuma/ticket/13644
...
[ticket/13644] Always type hint dispatch_interface
* Nicofuma/ticket/13644:
[ticket/13644] Always type hint dispatch_interface
2015-02-22 17:39:45 +01:00
Nicofuma
9b5493372d
[ticket/13644] Always type hint dispatch_interface
...
PHPBB3-13644
2015-02-22 17:01:37 +01:00
RMcGirr83
7bfb8686d9
[ticket/13578] Add ucp_register.php core events
...
PHPBB3-13578
2015-02-22 08:52:19 -05:00
Marc Alexander
c63bc6ee93
[ticket/13522] Fix QA tests for request_var() use
...
PHPBB3-13522
2015-02-21 17:53:25 +01:00
Marc Alexander
94b72cfbdb
[ticket/13522] Add captcha to test file class name
...
PHPBB3-13522
2015-02-21 17:46:39 +01:00
Marc Alexander
8e737e483e
[ticket/13522] Remove unneeded variables and correctly output input on error
...
PHPBB3-13522
2015-02-21 17:46:37 +01:00
Marc Alexander
4167be1e2c
[ticket/13522] Add tests for acp_get_question_input and set/get name
...
PHPBB3-13522
2015-02-21 17:45:20 +01:00
Marc Alexander
5bfcc7e707
[ticket/13522] Add test file for Q&A captcha
...
PHPBB3-13522
2015-02-21 17:45:20 +01:00
Marc Alexander
d15e5372ca
[ticket/13522] Use acp_get_question_input() for retrieving input data
...
PHPBB3-13522
2015-02-21 17:45:17 +01:00
Marc Alexander
12fe882741
[ticket/13522] Trim array elements before processing further
...
PHPBB3-13522
2015-02-21 17:43:15 +01:00
Kailey Truscott
b8c388f184
[ticket/13637] Update event name and docblock
...
Update the event name to core.ucp_pm_compose_modify_data
Change description of to_group_id and submit dockblock
PHPBB3-13637
2015-02-20 20:36:17 -05:00
Joas Schilling
3657d7a85a
Merge branch '3.1.x'
2015-02-20 22:26:47 +01:00
Joas Schilling
379eae1a92
Merge pull request #3418 from brunoais/ticket/13631
...
[ticket/13631] Fix wrong variable in get_global_visibility_sql()'s event
2015-02-20 22:26:39 +01:00
Joas Schilling
7f3ad29c47
Merge branch '3.1.x'
2015-02-20 21:00:49 +01:00
Joas Schilling
e6e7d7040a
Merge pull request #3423 from RMcGirr83/ticket/13635
...
[ticket/13635] Add sql_ary to ucp profile event
2015-02-20 21:00:39 +01:00
Joas Schilling
33ea266daf
Merge branch '3.1.x'
2015-02-20 20:55:55 +01:00
Joas Schilling
059790f386
Merge pull request #3425 from dragosvr92/patch-4
...
Update colours.css
2015-02-20 20:55:23 +01:00
Joas Schilling
76d22f3e53
Merge branch '3.1.x'
2015-02-20 20:53:03 +01:00
Joas Schilling
835ee2ba63
Merge pull request #3380 from n-aleha/ticket/13586
...
[ticket/13586] Allow '0' as username with Jabber notifications
2015-02-20 20:52:54 +01:00
Joas Schilling
275d6bec6a
Merge branch '3.1.x'
2015-02-20 20:50:18 +01:00
Joas Schilling
5e215aef26
Merge pull request #3369 from marc1706/ticket/13577
...
[ticket/13577] Skip tests requiring fileinfo if not enabled
2015-02-20 20:50:10 +01:00
Joas Schilling
61fa9dcb9f
Merge branch '3.1.x'
...
Conflicts:
phpBB/styles/subsilver2/template/search_results.html
2015-02-20 20:42:52 +01:00
Joas Schilling
461ce3f892
Merge branch 'Wolfsblvt-ticket/13533' into 3.1.x
2015-02-20 20:41:55 +01:00
Wolfsblvt
cba12aca2a
[ticket/13533] Add template core event to search results
...
PHPBB3-13533
2015-02-20 20:41:17 +01:00
Joas Schilling
0dab7e2552
Merge branch '3.1.x'
2015-02-20 20:29:45 +01:00
Joas Schilling
c24a840048
Merge pull request #3277 from dhruvgoel92/ticket/13472
...
[ticket/13472] Delete admin activation notification when deleting user
2015-02-20 20:29:05 +01:00
