Oleg Pudeyev
7faabfb532
Merge remote-tracking branch 'bantu/ticket/10154' into develop-olympus
...
* bantu/ticket/10154:
[ticket/10154] Move "copy permissions from" to below "parent" on forum creation
2011-05-09 22:35:19 -04:00
Oleg Pudeyev
820ed7a17d
Merge remote-tracking branch 'bantu/ticket/9999' into develop-olympus
...
* bantu/ticket/9999:
[ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
[ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
2011-05-09 22:24:10 -04:00
Andreas Fischer
ccb78f74a4
[ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
...
PHPBB3-9999
2011-05-09 23:20:17 +02:00
Andreas Fischer
4038091382
[ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
...
L_FORUM_FOLDER_ALT was supposed to be a language variable but the language
variable is never looked up but directly passed as L_FORUM_FOLDER_ALT instead.
Also, the expected functionality is correctly implemented by
FORUM_FOLDER_IMG_ALT.
PHPBB3-9999
2011-05-09 23:11:56 +02:00
Andreas Fischer
2d35e60443
[ticket/10154] Move "copy permissions from" to below "parent" on forum creation
...
Move "copy permissions from" to below "parent forum" in forum creation form.
PHPBB3-10154
2011-05-09 22:53:08 +02:00
Joas Schilling
437013194a
[ticket/10158] Add return-link to folder, when the user replied from a folder.
...
PHPBB3-10158
2011-05-09 12:46:34 +02:00
Andreas Fischer
52316bb3f5
Merge remote-tracking branch 'p/ticket/10178' into develop-olympus
...
* p/ticket/10178:
[ticket/10178] Add path to find command to build packages on FreeBSD.
2011-05-08 16:34:23 +02:00
Andreas Fischer
4d1f6352e6
Merge remote-tracking branch 'p/ticket/10177' into develop-olympus
...
* p/ticket/10177:
[ticket/10177] Add `-f -` to tar command to build packages with bsdtar.
2011-05-08 16:34:21 +02:00
Oleg Pudeyev
d987c0a118
[ticket/10178] Add path to find command to build packages on FreeBSD.
...
PHPBB3-10178
2011-05-07 22:31:44 -04:00
Oleg Pudeyev
129f70bf95
[ticket/10177] Add -f -
to tar command to build packages with bsdtar.
...
PHPBB3-10177
2011-05-07 22:31:33 -04:00
Andreas Fischer
963a67332a
[ticket/9922] Link post subject to the post's anchor in subsilver2.
...
Link post subject to the post's anchor in subsilver2 to expose full URL to post
which is otherwise only hidden behind the small post icon.
PHPBB3-9922
2011-05-05 19:53:10 +02:00
Joas Schilling
0d234cabf4
[ticket/10171] Fix displaying the "PM marking colours" in Firefox4.
...
PHPBB3-10171
2011-05-05 15:57:59 +02:00
Nils Adermann
e7dd37910c
Merge branch 'ticket/p/10003' into develop-olympus
...
* ticket/p/10003:
[ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.
[ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools.
[ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools.
[ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools.
[ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools.
[ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools.
[ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.
2011-05-05 14:44:49 +02:00
Joas Schilling
65d956bd81
[ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
...
PHPBB3-10158
2011-05-05 10:49:54 +02:00
Oleg Pudeyev
3a70cb478c
Merge remote-tracking branch 'erikfrerejean/ticket/9954' into develop-olympus
...
* erikfrerejean/ticket/9954:
[ticket/9954] Remove unneeded never permission
2011-05-03 00:24:44 -04:00
Oleg Pudeyev
c651948cb3
[ticket/9630] Make language for moving posts clearer in quickmod/mcp.
...
PHPBB3-9630
2011-05-02 23:54:35 -04:00
rxu
5254ec2795
[ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
...
PHPBB3-6712
2011-05-01 13:38:39 +08:00
Oleg Pudeyev
aa7be58d41
Merge branch 'erikfrerejean/ticket/9961' into develop-olympus
...
* erikfrerejean/ticket/9961:
[ticket/9961] Create log entries when users are activated.
2011-04-30 17:41:04 -04:00
Oleg Pudeyev
8155bc5a9d
[ticket/10067] Clarify language for user activation options in ACP.
...
PHPBB3-10067
2011-04-30 15:39:19 -04:00
Oleg Pudeyev
1e2c19f4b4
[ticket/10003] Delete EOL at EOF for the benefit of 3.0 modifications.
...
PHPBB3-10003
2011-04-29 02:16:02 -04:00
Oleg Pudeyev
85549fad83
[ticket/10003] Ported 1802b9ff9286a7fc24493e71b3432816cbdbfcd8 to db_tools.
...
Most of it was already in db_tools, these changes could have applied to
code that did not exist in db_tools at the time of the commit.
PHPBB3-10003
2011-04-29 02:10:42 -04:00
Oleg Pudeyev
55ff5da70b
[ticket/10003] Ported 5553cfc2ed81ba9eb571804c431def962720b39e to db_tools.
...
The diff in database_update was only partially relevant.
PHPBB3-10003
2011-04-29 02:10:42 -04:00
Oleg Pudeyev
761e3dd36f
[ticket/10003] Ported 023760c8b2402418310a3717db8349cac0342e42 to db_tools.
...
This was painful. Git wanted to patch hunks in wrong places.
Hopefully I got it right.
PHPBB3-10003
2011-04-29 02:10:42 -04:00
Oleg Pudeyev
9f34aa0b79
[ticket/10003] Ported 54c22ae52a0e18232cac8fed342ea52f2e2a793d to db_tools.
...
This diff applied cleanly.
PHPBB3-10003
2011-04-29 02:10:42 -04:00
Oleg Pudeyev
3cb1b90ca6
[ticket/10003] Ported 96a30afcca3ebd832c9b3083bb5c9a9f2a2dc54b to db_tools.
...
This change is somewhat questionable, maybe it should be reviewed.
PHPBB3-10003
2011-04-29 02:10:41 -04:00
Oleg Pudeyev
e6eb11bb11
[ticket/10003] Ported d7d96223e7bae7cd60b13c6e7896d95838c3633c to db_tools.
...
PHPBB3-10003
2011-04-29 02:10:41 -04:00
Igor Wiedler
850741ee16
Merge remote branch 'bantu/ticket/10145' into develop-olympus
...
* bantu/ticket/10145:
[ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
2011-04-26 21:49:21 +02:00
Andreas Fischer
569a4b2091
Merge remote branch 'p/ticket/7941' into develop-olympus
...
* p/ticket/7941:
[ticket/7941] Added @return to generate_board_url docstring.
2011-04-26 19:35:49 +02:00
Andreas Fischer
a3a70e13b5
[ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined.
...
PHPBB3-10145
2011-04-26 12:35:44 +02:00
Andreas Fischer
8a97722464
Merge branch 'ticket/p/10147' into develop-olympus
...
* ticket/p/10147:
[ticket/10147] Corrected a typo in includes/functions_template.php.
2011-04-23 21:51:49 +02:00
Oleg Pudeyev
a8ecd30fe1
[ticket/10147] Corrected a typo in includes/functions_template.php.
...
PHPBB3-10147
2011-04-23 15:36:45 -04:00
Andreas Fischer
bc48fe1704
Merge branch 'ticket/p/10141' into develop-olympus
...
* ticket/p/10141:
[ticket/10141] Save a hash lookup when value is not in cache.
[ticket/10141] Split double-assignment into conditional and unconditional part.
[ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
2011-04-22 11:16:32 +02:00
Andreas Fischer
9cb6a69861
[ticket/10146] Firebird: 1 <= precision <= 18 ==> Cast to DECIMAL(18, 0).
...
PHPBB3-10146
2011-04-22 11:01:07 +02:00
Oleg Pudeyev
0a8893498d
Merge branch 'ticket/bantu/10137' into develop-olympus
...
* ticket/bantu/10137:
[ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
2011-04-22 00:16:21 -04:00
Oleg Pudeyev
ff5274181c
Merge branch 'ticket/bantu/10105' into develop-olympus
2011-04-22 00:03:02 -04:00
Oleg Pudeyev
f49656986c
[ticket/10141] Save a hash lookup when value is not in cache.
...
PHPBB3-10141
2011-04-21 23:15:51 -04:00
Andreas Fischer
8c3cfbb40e
[ticket/10105] Update AIM express link.
...
PHPBB3-10105
2011-04-22 00:42:49 +02:00
Andreas Fischer
78fa3a3b03
[ticket/10105] Update AIM application download link.
...
PHPBB3-10105
2011-04-22 00:41:55 +02:00
Andreas Fischer
6ee6245e5b
[ticket/10137] Remove unintended space at end of PHP_URL_FOPEN_SUPPORT_EXPLAIN.
...
PHPBB3-10137
2011-04-22 00:30:13 +02:00
Andreas Fischer
b1367bce48
[ticket/10141] Split double-assignment into conditional and unconditional part.
...
PHPBB3-10141
2011-04-22 00:20:09 +02:00
Bart van Bragt
11dd4b54fa
[ticket/10141] Use a cache in $auth->_fill_acl() for better performance.
...
Many sequences being converted are the same. Use a local cache to
convert each sequence once, speeding up the function.
PHPBB3-10141
2011-04-21 04:21:09 -04:00
Andreas Fischer
d1f1d8ade7
[ticket/9802] Remove unnecessary htmlspecialchars() call on REMOTE_ADDR.
...
The value in $_SERVER['REMOTE_ADDR'] is either validated to be a valid IP
address or is replaced by our default value. Valid IP addresses do not contain
HTML special characters, thus the htmlspecialchars() call is unnecessary.
PHPBB3-9802
2011-04-19 14:10:23 +02:00
Andreas Fischer
5ca7121ed2
[ticket/9802] Only check for IPv4-mapped address when address is IPv6.
...
PHPBB3-9802
2011-04-19 14:08:23 +02:00
Andreas Fischer
bef2540d9c
[ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR.
...
When $ip is empty() it was assigned to $this->ip.
PHPBB3-9802
2011-04-19 13:46:00 +02:00
Andreas Fischer
fd80535859
[ticket/9802] Remove redundant character class definition from preg_replace.
...
PHPBB3-9802
2011-04-19 13:22:48 +02:00
Andreas Fischer
ee6167879e
[ticket/9802] Fix redundant str_replace call. No need to replace ' ' with ' '.
...
PHPBB3-9802
2011-04-19 13:22:23 +02:00
Erik Frèrejean
1d2201902f
[ticket/9961] Create log entries when users are activated.
...
* Create log entries when a user activates own account without
also changing their password.
* Additionally create admin log entries when an administrator activates
user accounts.
PHPBB3-9961
2011-04-19 13:11:20 +02:00
Oleg Pudeyev
682814180c
[ticket/7941] Added @return to generate_board_url docstring.
...
PHPBB3-7941
2011-04-17 18:46:03 -04:00
Oleg Pudeyev
32bc980ca0
Merge branch 'ticket/nickvergessen/10109' into develop-olympus
...
* ticket/nickvergessen/10109:
[ticket/10109] Fix "Undefined Index" errors when copying a topic.
2011-04-17 03:20:22 -04:00
Oleg Pudeyev
76bc4c24a5
Merge branch 'ticket/rxu/10117' into develop-olympus
...
* ticket/rxu/10117:
[ticket/10117] Add one more missed 'u' modifier, add code comment
[ticket/10117] Make smilies to be correctly parsed within unicode text.
2011-04-17 00:31:24 -04:00