Oleg Pudeyev
95ac995be8
Merge remote-tracking branch 'bantu/ticket/10636' into develop
...
* bantu/ticket/10636:
[ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
2012-02-10 13:25:46 -05:00
Oleg Pudeyev
56ef5d5025
Merge remote-tracking branch 'cyberalien/ticket/10637' into develop
...
* cyberalien/ticket/10637:
[ticket/10637] Leftovers from implementation of extensions in convertor
[ticket/10637] Leftovers from implementation of extensions in develop tools
[ticket/10637] Leftovers from implementation of extensions in mcp_post
[ticket/10637] Leftovers from implementation of extensions in mcp_main
[ticket/10637] Leftovers from implementation of extensions
2012-02-10 13:06:58 -05:00
Oleg Pudeyev
9d81f97175
Merge remote-tracking branch 'bantu/ticket/10495' into develop
...
* bantu/ticket/10495:
[ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
2012-02-10 01:40:05 -05:00
Oleg Pudeyev
082132648b
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10512] Call startup.php from tests/bootstrap.php
2012-02-10 01:30:41 -05:00
Oleg Pudeyev
9c2d73c3f9
Merge remote-tracking branch 'bantu/ticket/10512' into develop-olympus
...
* bantu/ticket/10512:
[ticket/10512] Call startup.php from tests/bootstrap.php
2012-02-10 01:29:23 -05:00
Vjacheslav Trushkin
caeadf85d0
[ticket/10637] Leftovers from implementation of extensions in convertor
...
Replacing code in convertor that was missed in ticket 10323
PHPBB3-10637
2012-02-09 22:24:46 +02:00
Vjacheslav Trushkin
a1a1b61ae8
[ticket/10637] Leftovers from implementation of extensions in develop tools
...
Replacing code in development tools that was missed in ticket 10323
PHPBB3-10637
2012-02-09 22:22:32 +02:00
Vjacheslav Trushkin
92303d2dac
[ticket/10637] Leftovers from implementation of extensions in mcp_post
...
Replacing code in includes/mcp/mcp_post.php that was missed in ticket 10323
PHPBB3-10637
2012-02-09 22:17:33 +02:00
Vjacheslav Trushkin
1d72a47ea6
[ticket/10637] Leftovers from implementation of extensions in mcp_main
...
Replacing code in includes/mcp/mcp_main.php that was missed in ticket 10323
PHPBB3-10637
2012-02-09 22:13:13 +02:00
Vjacheslav Trushkin
11606c8607
[ticket/10637] Leftovers from implementation of extensions
...
Replacing code in includes/functions_admin.php that was missed in ticket 10323
PHPBB3-10637
2012-02-09 21:58:39 +02:00
Andreas Fischer
6858485964
[ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
...
Regression from 4c77903129
2012-02-09 14:18:17 +01:00
Igor Wiedler
6582a84379
Merge remote-tracking branch 'cyberalien/ticket/10634' into develop
...
* cyberalien/ticket/10634:
[ticket/10634] Specify module type when viewing profile
[ticket/10634] Changing p_master::is_full_class
2012-02-09 00:42:28 +01:00
Vjacheslav Trushkin
ad8ab09930
[ticket/10634] Specify module type when viewing profile
...
Specify module type when checking for enabled modules when viewing user's profile
PHPBB3-10634
2012-02-09 01:34:50 +02:00
Vjacheslav Trushkin
6cf7f20590
[ticket/10634] Changing p_master::is_full_class
...
Changing p_master::is_full_class to check allow all module types, not only current type
PHPBB3-10634
2012-02-09 01:34:37 +02:00
Igor Wiedler
d4e00b6c0d
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10616] Add template inheritance to exported template
[ticket/10616] Ignore template inheritance that points to self
[ticket/10616] Add template inheritance to default styles
2012-02-07 16:57:09 +01:00
Igor Wiedler
3feeb382c5
Merge remote-tracking branch 'cyberalien/ticket/10616' into develop-olympus
...
* cyberalien/ticket/10616:
[ticket/10616] Add template inheritance to exported template
[ticket/10616] Ignore template inheritance that points to self
[ticket/10616] Add template inheritance to default styles
2012-02-07 16:53:47 +01:00
Andreas Fischer
42d9edc4f2
[ticket/10495] Update request/type_cast_helper for PHP 5.4 magic_quotes_gpc drop
...
PHPBB3-10495
2012-02-04 00:57:39 +01:00
Andreas Fischer
c0b3239bf3
[ticket/10512] Call startup.php from tests/bootstrap.php
...
PHPBB3-10512
2012-02-04 00:38:16 +01:00
David King
2929d345ab
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9914] Add backup warning to updater.
2012-02-03 17:00:09 -05:00
David King
508b06063f
Merge remote-tracking branch 'unknownbliss/ticket/9914' into develop-olympus
...
* unknownbliss/ticket/9914:
[ticket/9914] Add backup warning to updater.
2012-02-03 16:58:50 -05:00
Oleg Pudeyev
cddd63aae0
Merge remote-tracking branch 'imkingdavid/ticket/10535' into develop
...
* imkingdavid/ticket/10535:
[ticket/10535] Delete no longer needed email confirm language entries.
[ticket/10535] Delete email confirm from installer
[ticket/10535] Removed email confirm field from acp_users module
[ticket/10535] Forgot a subsilver2 change. *doh*
[ticket/10535] Removed email confirm from UCP, removed unused language entries
[ticket/10535] Remove email confirm check on registration form
2012-02-03 16:21:51 -05:00
Oleg Pudeyev
ccf0cf649d
[ticket/10535] Delete no longer needed email confirm language entries.
...
PHPBB3-10535
2012-02-03 16:14:56 -05:00
Michael Cullum
225892f506
[ticket/9914] Add backup warning to updater.
...
PHPBB3-9914
2012-02-03 16:14:48 +00:00
Vjacheslav Trushkin
326ff46ef7
[ticket/10616] Add template inheritance to exported template
...
Add template inheritance when exporting template.cfg
PHPBB3-10616
2012-02-03 16:19:42 +02:00
Vjacheslav Trushkin
4aef6ea979
[ticket/10616] Ignore template inheritance that points to self
...
Ignore template inheritance if it points to self
PHPBB3-10616
2012-02-03 16:09:48 +02:00
Vjacheslav Trushkin
d2a3496149
[ticket/10616] Add template inheritance to default styles
...
Adding template inheritance field to prosilver and subsilver2
PHPBB3-10616
2012-02-03 16:00:14 +02:00
Andreas Fischer
6ad87d3aaf
Merge remote-tracking branch 'naderman/ticket/10477' into develop
...
* naderman/ticket/10477:
[ticket/10477] Correctly document module (base)name parameter
[ticket/10477] Document parameters to p_master#load.
[ticket/10477] Normalize loaded module names to be class names or xcp_ prefixed
2012-02-02 13:59:19 +01:00
Andreas Fischer
522090ab28
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10580] Remove checking of server timezone and DST when registering
2012-01-23 20:07:03 +01:00
Andreas Fischer
2ae6b8a5ed
Merge remote-tracking branch 'Dickyf/ticket/10580' into develop-olympus
...
* Dickyf/ticket/10580:
[ticket/10580] Remove checking of server timezone and DST when registering
2012-01-23 20:06:44 +01:00
Richard Foote
2cf586a372
[ticket/10580] Remove checking of server timezone and DST when registering
...
Remove checking of server timezone and DST. It causes a problem by
selecting the wrong timezone when registering when the board_timezone is 1
hour less than the server timezone.
PHPBB3-10580
2012-01-21 15:17:31 -05:00
Andreas Fischer
11f0984d87
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definition
2012-01-15 21:43:29 +01:00
Andreas Fischer
1628a28e0c
Merge remote-tracking branch 'rxu/ticket/10589' into develop-olympus
...
* rxu/ticket/10589:
[ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definition
2012-01-15 21:43:15 +01:00
rxu
aa21bc2a73
[ticket/10589] Add alias to 'user_birthday' in $leap_year_birthdays definition
...
PHPBB3-10589
2012-01-15 18:18:04 +08:00
Nils Adermann
82c05a7ed6
[ticket/10477] Correctly document module (base)name parameter
...
PHPBB3-10477
2012-01-13 13:01:30 +01:00
Igor Wiedler
660cfc2d2e
Merge pull request #531 from p/ticket/10579
...
[ticket/10579] Delete extra v2 from license block.
2012-01-12 23:01:28 -08:00
Oleg Pudeyev
c3aa466523
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9079] Always log backtrace to error log when logging errors.
[ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
2012-01-12 22:30:23 -05:00
Oleg Pudeyev
d7aa3aab5e
Merge remote-tracking branch 'bantu/ticket/9079' into develop-olympus
...
* bantu/ticket/9079:
[ticket/9079] Always log backtrace to error log when logging errors.
[ticket/9079] Display backtrace on all E_USER_ERROR errors, not only SQL errors
2012-01-12 22:28:45 -05:00
Oleg Pudeyev
3f754d118d
[ticket/10477] Document parameters to p_master#load.
...
PHPBB3-10477
2012-01-13 04:25:22 +01:00
Oleg Pudeyev
3e36ac6678
[ticket/10579] Delete extra v2 from license block.
...
PHPBB3-10579
2012-01-12 22:25:14 -05:00
Nils Adermann
ffde8c8e06
[ticket/10477] Normalize loaded module names to be class names or xcp_ prefixed
...
PHPBB3-10477
2012-01-06 17:45:42 +01:00
Oleg Pudeyev
466acfdd94
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10563] Show deactivated styles below active styles in acp
2012-01-06 02:46:52 -05:00
Oleg Pudeyev
95a74c7472
Merge remote-tracking branch 'cyberalien/ticket/10563' into develop-olympus
...
* cyberalien/ticket/10563:
[ticket/10563] Show deactivated styles below active styles in acp
2012-01-06 02:45:35 -05:00
Vjacheslav Trushkin
23363efaaa
[ticket/10563] Show deactivated styles below active styles in acp
...
Separates active and deactivated styles in styles list in acp
PHPBB3-10563
2012-01-02 21:07:40 +02:00
Andreas Fischer
2f010fe96e
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10407] Fix check for empty image paths in convertor
[ticket/10407] Fix check for empty image paths in convertor
2012-01-02 19:54:46 +01:00
Andreas Fischer
3e7a0a3746
Merge remote-tracking branch 'Dickyf/ticket/10407a' into develop-olympus
...
* Dickyf/ticket/10407a:
[ticket/10407] Fix check for empty image paths in convertor
[ticket/10407] Fix check for empty image paths in convertor
2012-01-02 19:54:14 +01:00
Andreas Fischer
6b8d5058c0
Merge branch 'ticket/unknownbliss/9916' into develop
...
* ticket/unknownbliss/9916:
[ticket/9916] Updating license in non-distributed files
[ticket/9916] Updating header license and removing Version $Id$
2012-01-02 19:10:47 +01:00
Unknown
66c50f6b30
[ticket/9916] Updating license in non-distributed files
...
PHPBB3-9916
2012-01-02 19:10:36 +01:00
Unknown
656a8ece6f
[ticket/9916] Updating header license and removing Version $Id$
...
PHPBB3-9916
2012-01-02 19:10:27 +01:00
Richard Foote
24cf7f1d29
[ticket/10407] Fix check for empty image paths in convertor
...
This applies to avatar_path,avatar_gallery_path,smilies_path and
upload_path.
Currently, the convertor gets each path from the config table and adds a
trailing slash. If there is no entry in the config table for the path, the
path can never be empty because of the added trailing slash. This patch
will check the path without the trailing slash to see if the path is
actually empty.
PHPBB3-10407
2012-01-02 13:09:21 -05:00
Andreas Fischer
69a725198b
Merge remote-tracking branch 'unknownbliss/ticket/9916' into develop
...
* unknownbliss/ticket/9916:
[ticket/9916] Updating header license and removing Version $Id$
2012-01-02 17:54:54 +01:00
