Oleg Pudeyev
d3b5df2548
Merge branch 'ticket/erikfrerejean/9581' into develop-olympus
...
* ticket/erikfrerejean/9581:
[ticket/9581] Fix missing index
[ticket/9581] Slightly tweaked queries
[ticket/9581] Make banlist table select optional
[ticket/9581] Mass e-mail to banned users
2011-04-10 11:58:29 -04:00
rxu
804a11074b
[feature/attachment-management-no-reassignment] Fix minor flaws in the code.
...
Thanks to Oleg for inspection.
PHPBB3-9721
2011-04-10 12:06:07 +08:00
rxu
97864d69ee
[feature/attachment-management-no-reassignment] Attachments management
...
This feature allows to manage attachments in posts and PMs via ACP.
PHPBB3-9721
2011-04-10 12:06:06 +08:00
Andreas Fischer
8a54d88509
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10084] Add smilie/icon errors out when file is missing
2011-04-08 12:24:59 +02:00
Joas Schilling
851bb9fcd8
[ticket/10084] Add smilie/icon errors out when file is missing
...
PHPBB3-10084
2011-04-07 20:36:11 +02:00
Joas Schilling
a72fe8acaf
[ticket/10109] Fix "Undefined Index" errors when copying a topic.
...
PHPBB3-10109
2011-04-07 14:53:47 +02:00
Joas Schilling
712a51caea
[ticket/9684] Fix Forum/Topic-Tracking for global announcements
...
Should be ready for intensive testing now.
PHPBB3-9684
2011-04-07 13:47:08 +02:00
Joas Schilling
27fdcb4c7e
[ticket/9684] Remove code in some more files especially includes/
...
Topic-Tracking is still missing.
PHPBB3-9684
2011-04-07 13:47:06 +02:00
Joas Schilling
3352141264
[ticket/9684] Remove code for global announcement in root-files
...
PHPBB3-9684
2011-04-07 13:45:44 +02:00
Andreas Fischer
7074d19c40
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10121] Fix missing urlencode() for ICQ-number in viewtopic.php
[ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
2011-04-05 00:31:42 +02:00
Joas Schilling
59d75c1ae6
[ticket/10121] Fix ICQ profile link, leading to a dead web-messenger.
...
PHPBB3-10121
2011-04-03 22:11:13 +02:00
rxu
b8adad0d48
[ticket/10117] Add one more missed 'u' modifier, add code comment
...
PHPBB3-10117
2011-04-03 15:28:00 +08:00
rxu
6ddb92c41e
[ticket/10115] Switch UTF-8 mode on for the rest of BBCodes
...
PHPBB3-10115
2011-04-03 08:33:33 +08:00
rxu
d1bd5962c7
[ticket/6712] Pass $post_data by the value instead of by the reference.
...
PHPBB3-6712
2011-04-03 01:00:21 +08:00
rxu
25ae46b8df
[ticket/10117] Make smilies to be correctly parsed within unicode text.
...
PHPBB3-10117
2011-04-03 00:53:00 +08:00
rxu
646d3e10d2
[ticket/10115] Make some text oriented BBCodes to properly handle unicode.
...
[quote], [b], [i], [size], [color], [u], [list] are affected.
PHPBB3-10115
2011-04-02 19:19:30 +08:00
Andreas Fischer
ebc338b9f3
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.
[ticket/9751] Compare $password with empty string instead of casting it to bool
[ticket/9751] Use a switch/case block without break for password complexity.
[ticket/9751] Password requirement "Must contain letters and numbers" fails
2011-04-01 15:11:55 +02:00
Andreas Fischer
f392f55d9b
Merge branch 'ticket/bantu/9751' into develop-olympus
...
* ticket/bantu/9751:
[ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.
[ticket/9751] Compare $password with empty string instead of casting it to bool
[ticket/9751] Use a switch/case block without break for password complexity.
[ticket/9751] Password requirement "Must contain letters and numbers" fails
2011-04-01 15:11:10 +02:00
Andreas Fischer
4dce53628c
[ticket/9751] Add shortcut logic for pass_complex == PASS_TYPE_ANY.
...
Add shortcut logic for pass_complex because this is the default value phpBB
ships with and there is nothing to do in that function in that case.
PHPBB3-9751
2011-04-01 15:10:29 +02:00
Andreas Fischer
7cc32d3843
[ticket/9751] Compare $password with empty string instead of casting it to bool
...
PHPBB3-9751
2011-04-01 15:10:29 +02:00
Andreas Fischer
dba8cf12fd
[ticket/9751] Use a switch/case block without break for password complexity.
...
PHPBB3-9751
2011-04-01 15:10:29 +02:00
rxu
a835189823
[ticket/9751] Password requirement "Must contain letters and numbers" fails
...
PHPBB3-9751
2011-04-01 15:10:29 +02:00
Igor Wiedler
a40bc114c0
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10112] Replaced a couple occurrences of count() with sizeof()
2011-03-31 20:32:11 +02:00
Igor Wiedler
564ce6c7f6
Merge remote branch 'callumacrae/ticket/10112' into develop-olympus
...
* callumacrae/ticket/10112:
[ticket/10112] Replaced a couple occurrences of count() with sizeof()
2011-03-31 20:31:58 +02:00
Igor Wiedler
ec5ca9df6b
Merge branch 'ticket/haklop/10110' into develop-olympus
...
* ticket/haklop/10110:
[ticket/10110] Remove tab from empty lines
[ticket/10110] Enable the serialization and add a constant for defined the database
[ticket/10110] Update comments with a link to the phpredis extension
[ticket/10110] Add Redis ACM backend
2011-03-31 20:23:30 +02:00
Eric
ddda094d3a
[ticket/10110] Remove tab from empty lines
...
PHPBB3-10110
2011-03-31 20:16:53 +02:00
Eric
9891f5a8d2
[ticket/10110] Enable the serialization and add a constant for
...
defined the database
PHPBB3-10110
2011-03-31 20:16:53 +02:00
Eric
f18d93756c
[ticket/10110] Update comments with a link to the phpredis extension
...
PHPBB3-10110
2011-03-31 20:16:53 +02:00
Eric
fad7333e72
[ticket/10110] Add Redis ACM backend
...
PHPBB3-10110
2011-03-31 20:16:52 +02:00
Callum Macrae
657971754b
[ticket/10112] Replaced a couple occurrences of count() with sizeof()
...
As per the coding guidlines, sizeof() should be used instead of count().
PHPBB3-10112
2011-03-30 11:30:27 +01:00
Eric
30193fdc7e
[feature/redis] Add Redis cache driver using phpredis extension
...
PHPBB3-10110
2011-03-30 11:29:11 +08:00
Erik Frèrejean
83ca730544
[ticket/9581] Fix missing index
...
Add `u.user_lang` to the select statement to prevent "undefined
index" errors.
PHPBB3-9581
2011-03-24 10:44:36 +01:00
Andreas Fischer
3a0a18ee25
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9946] Allow storage of data >4kB on Oracle again
2011-03-24 09:22:36 +01:00
Andreas Fischer
6ac93d8a00
Merge branch 'ticket/jellydoughnut/9946' into develop-olympus
...
* ticket/jellydoughnut/9946:
[ticket/9946] Allow storage of data >4kB on Oracle again
2011-03-24 09:22:12 +01:00
Igor Wiedler
c63676e802
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10033] "Disallow usernames" does not check already disallowed names.
2011-03-23 23:21:36 +01:00
Joas Schilling
1564c01c38
[ticket/10033] "Disallow usernames" does not check already disallowed names.
...
PHPBB3-10033
2011-03-23 22:48:22 +01:00
Oleg Pudeyev
352ed5acf8
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10101] Add test case for native phpass hashes
[ticket/10101] Add support for native phpass hashes
2011-03-22 21:25:14 -04:00
Oleg Pudeyev
200c7e3c44
Merge branch 'ticket/igorw/10101' into develop-olympus
...
* ticket/igorw/10101:
[ticket/10101] Add test case for native phpass hashes
[ticket/10101] Add support for native phpass hashes
2011-03-22 21:25:00 -04:00
Igor Wiedler
df8b852709
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10100] Update rand_seed_last_update before rand_seed in unique_id().
2011-03-18 00:06:53 +01:00
Igor Wiedler
f8384b7302
[ticket/10101] Add support for native phpass hashes
...
phpass (the hashing library we use) adds a hash identifier to every
hash. By default this identifier is '$P$'. For some reason we have
changed it to '$H$'.
This patch allows both of them to be used for authentication, so that a
third party system could create users with '$P$' hashes.
PHPBB3-10101
2011-03-17 23:59:38 +01:00
Andreas Fischer
48ba841be0
[ticket/10100] Update rand_seed_last_update before rand_seed in unique_id().
...
Update $config['rand_seed_last_update'] before updating $config['rand_seed'] in
unique_id() to mitigate a race condition and unnecessary updates on heavily
busy boards.
PHPBB3-10100
2011-03-17 23:07:35 +01:00
Andreas Fischer
0e9b755667
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/9685] Buffer posts for search indexing when using mssqlnative.
2011-03-15 02:00:04 +01:00
Andreas Fischer
784132d7e8
Merge branch 'ticket/naderman/9685' into develop-olympus
...
* ticket/naderman/9685:
[ticket/9685] Buffer posts for search indexing when using mssqlnative.
2011-03-15 01:59:47 +01:00
Nils Adermann
91b3195255
[ticket/9685] Buffer posts for search indexing when using mssqlnative.
...
To have a generic solution there is now a sql_buffer_nested_transaction()
which indicates that the given SQL driver requires buffering to run a
transaction while iterating over another result set.
PHPBB3-9685
2011-03-15 01:41:16 +01:00
Andreas Fischer
7588b43526
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10096] Fixed whitespace in functions.php.
[ticket/10078] Avoid \n in strings given to echo for portability.
[ticket/10092] Ignore overlength comment lines in commit-msg hook.
2011-03-14 13:58:57 +01:00
Oleg Pudeyev
64657ee366
[ticket/10096] Fixed whitespace in functions.php.
...
PHPBB3-10096
2011-03-13 23:12:52 -04:00
Igor Wiedler
cfede1db83
Merge branch 'ticket/bantu/10046-develop' into develop
...
* ticket/bantu/10046-develop:
[ticket/10046] Remove register_shutdown_function() in cron.php from develop.
2011-03-12 18:17:25 +01:00
Igor Wiedler
a27a39ebed
Merge branch 'develop-olympus' into develop
...
* develop-olympus:
[ticket/10046] Do not link bots to cron.php.
[ticket/10046] No longer change $phpbb_root_path to an absolute path for cron.
[ticket/10046] Call flush() in cron.php
[ticket/10046] Remove calls to register_shutdown_function() in cron.php
Conflicts:
phpBB/cron.php
phpBB/includes/functions.php
2011-03-12 18:16:10 +01:00
Andreas Fischer
a627133b15
[ticket/10046] Remove register_shutdown_function() in cron.php from develop.
...
PHPBB3-10046
2011-03-12 15:07:31 +01:00
Oleg Pudeyev
9a48045254
[ticket/10046] Do not link bots to cron.php.
...
Bots, generally speaking, will not request cron.php immediately,
thus telling them to request it is pointless.
PHPBB3-10046
2011-03-12 14:57:34 +01:00