Nils Adermann
f3588c66ec
Merge branch 'ticket/13262' into prep-release-3.1.1
...
* ticket/13262:
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
2014-11-01 19:14:11 +01:00
Matt Friedman
a269929f0e
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
...
PHPBB3-13262
2014-11-01 19:14:00 +01:00
Nils Adermann
45d054d295
Merge branch 'ticket/13267' into prep-release-3.1.1
...
* ticket/13267:
[ticket/13267] Update Automatic Update instructions to include vendor directory
2014-11-01 19:13:21 +01:00
Patrick Webster
8bdbadabb2
[ticket/13267] Update Automatic Update instructions to include vendor directory
...
PHPBB3-13267
2014-11-01 19:13:09 +01:00
Patrick Webster
c3aca59cfb
[ticket/13268] Properly append ternary result in get_existing_indexes()
...
PHPBB3-13268
2014-11-01 19:12:28 +01:00
Nils Adermann
3f3c8d74e8
[prep-release-3.1.1] Update version number to 3.1.1
2014-11-01 18:47:56 +01:00
Joas Schilling
197fed16bd
[prep-release-3.1.0] Update changelog with final changes
2014-10-28 13:08:52 +01:00
Joas Schilling
71c19f6eb7
Merge pull request #3091 from Nicofuma/ticket/13234-2
...
Ticket/13234 2
2014-10-28 12:56:47 +01:00
Joas Schilling
679559ce18
Merge branch 'naderman-ticket/13232' into prep-release-3.1.0
2014-10-28 10:02:33 +01:00
Nils Adermann
087a5363bb
[ticket/13234-2] Correctly verify that user_id is set in user data array
...
PHPBB3-13234-2
2014-10-27 23:56:20 -07:00
Nils Adermann
3472b6c5bc
[ticket/13234-2] Never allow autologin/remember me to modify the userid
...
Ascraeus version of 64d97d0787
commit
PHPBB3-13234
2014-10-27 19:58:32 -07:00
Nils Adermann
efe3aaaf0b
Merge pull request #3085 from naderman/ticket/13227
...
[ticket/13227] Properly handle curlwrapper headers in remote avatars
2014-10-27 18:58:11 -07:00
Nils Adermann
df1212ce27
Merge pull request #3083 from Nicofuma/ticket/13231
...
[ticket/13231] Update the dependencies of the migration contact_admin_form
2014-10-27 18:51:47 -07:00
rxu
16d78407db
[ticket/13229] Fix overloading memberlist with redundant SQL queries
...
PHPBB3-13229
2014-10-27 17:01:29 -07:00
Nils Adermann
4e4c3de103
[ticket/13227] Properly handle curlwrapper headers in remote avatars
...
Read a bit of the file to ensure header values are populated and then
handle headers in the nested array structure too.
PHPBB3-13227
2014-10-27 16:49:30 -07:00
Joas Schilling
6380aea647
[ticket/13232] Fix more issues with TTL and global cache file
...
PHPBB3-13232
2014-10-28 00:34:51 +01:00
Tristan Darricau
47663a4ad3
[ticket/13231] Update the dependencies of the migration contact_admin_form
...
PHPBB3-13231
2014-10-27 23:45:24 +01:00
Nils Adermann
0cdd071230
[ticket/13232] Fix indentation
...
PHPBB3-13232
2014-10-27 15:45:24 -07:00
Nils Adermann
df5366a5ca
[ticket/13232] Use a cache var with _ to force TTL and shuffle cron tasks
...
PHPBB3-13232
2014-10-27 15:42:26 -07:00
Joas Schilling
aa916fc43f
Merge pull request #3077 from marc1706/ticket/13225
...
[ticket/13225] Use passwords manager instead of phpbb_hash in migration
2014-10-27 23:38:53 +01:00
Marc Alexander
b295fa4f4f
[ticket/13225] Prefix converted passwords with $CP$ in phpBB 3.0.5-RC1
...
PHPBB3-13225
2014-10-27 20:57:31 +01:00
Nils Adermann
d693d91e26
Merge remote-tracking branch 'github-nicofuma/ticket/13226' into prep-release-3.1.0
...
* github-nicofuma/ticket/13226:
[ticket/13226] Add functional test for group ranks
[ticket/13226] Fix the usage of $rank_img
2014-10-27 12:25:18 -07:00
Joas Schilling
47759eb096
[ticket/13230] Add missing globals and missing request object for path helper
...
PHPBB3-13230
2014-10-27 14:54:17 +01:00
Tristan Darricau
9ccb87675d
[ticket/13226] Fix the usage of $rank_img
...
PHPBB3-13226
2014-10-27 10:00:24 +01:00
Marc Alexander
6cc5160d60
[ticket/13225] Use passwords manager instead of phpbb_hash in migration
...
PHPBB3-13225
2014-10-26 17:14:34 -07:00
Nils Adermann
51251293ab
[prep-release-3.1.0] Update CHANGELOG with last minute changes
2014-10-26 12:53:45 -07:00
rxu
5431aa6391
[ticket/13223] Fix USERNAME email template variable in notification
...
admin_activate_user.php notification type is assigning usernames to email
template variables using user_loader->get_username() in 'no_profile' mode,
which in its turn calls get_username_string() function in 'no_profile' mode.
This causes HTML markup in emails for username colour.
PHPBB3-13223
2014-10-26 12:47:57 -07:00
Joas Schilling
0d1d836a89
[ticket/13221] Add bot_update as a dependency to gold
...
PHPBB3-13221
2014-10-26 20:03:46 +01:00
Joas Schilling
79d782c1d5
[ticket/13221] Perform bot updates after user table changes
...
PHPBB3-13221
2014-10-26 19:57:08 +01:00
Nils Adermann
5cee745fc5
[prep-release-3.1.0] Add missing CHANGELOG entries for RC6
2014-10-25 18:10:30 -07:00
Nils Adermann
c789acc091
[prep-release-3.1.0] Add CHANGELOG for 3.1.0
2014-10-25 17:12:14 -07:00
Nils Adermann
f2e9c62a97
[prep-release-3.1.0] Add 3.1.0 gold release migration
2014-10-25 17:03:50 -07:00
Marc Alexander
81ad381263
[ticket/13207] Move default user notifications settings to user_add()
...
PHPBB3-13207
2014-10-25 14:57:01 -07:00
Marc Alexander
18f24a2270
[ticket/13207] Add default subscription options for newly registered users
...
PHPBB3-13207
2014-10-25 14:50:01 -07:00
Andreas Fischer
ad06f6dd71
[ticket/13215] Update Symfony components to v2.3.21.
...
PHPBB3-13215
2014-10-25 21:29:45 +02:00
Nils Adermann
4e952ad443
Merge commit '078e0c1e440f7f906b670348e8da00141e245876' into prep-release-3.1.0
...
* commit '078e0c1e440f7f906b670348e8da00141e245876':
[ticket/13211] Move console migrator output handler back to console folder
[ticket/13211] Also use log wrapper output handler for console migrations
[ticket/13211] Move console migrator output handler to db folder
[ticket/13211] Add log wrapper for writing database updater to log file
[ticket/13126] Add missing use statement
[ticket/13126] Fix tests
[ticket/13126] Change messages verbosity levels
[ticket/13126] Move migrator_output_handler to an interface
[ticket/13126] Extends migrator_output_handler instead of using a closure
[ticket/13126] Improve the feedback when running the migrations
2014-10-25 12:09:20 -07:00
Marc Alexander
078e0c1e44
[ticket/13211] Move console migrator output handler back to console folder
...
PHPBB3-13211
2014-10-25 12:03:13 -07:00
Marc Alexander
8443463006
[ticket/13211] Also use log wrapper output handler for console migrations
...
PHPBB3-13211
2014-10-25 11:55:15 -07:00
Andreas Fischer
a43879fe91
Merge pull request #3061 from Elsensee/ticket/13210
...
[ticket/13210] Use the correct config value
* Elsensee/ticket/13210:
[ticket/13210] Use the correct config value
2014-10-25 19:48:33 +02:00
Oliver Schramm
a9a67b08a5
[ticket/13210] Use the correct config value
...
PHPBB3-13210
2014-10-25 14:28:56 +02:00
Marc Alexander
b27b9a6984
[ticket/13211] Move console migrator output handler to db folder
...
PHPBB3-13211
2014-10-24 13:33:26 -07:00
Marc Alexander
516bd9ea51
[ticket/13211] Add log wrapper for writing database updater to log file
...
PHPBB3-13211
2014-10-24 13:22:56 -07:00
Marc Alexander
14300a1475
Merge remote-tracking branch 'Nicofuma/ticket/13126' into ticket/13211
2014-10-24 13:22:39 -07:00
Joas Schilling
1cd09a03e6
[prep-release-3.1.0] Prepare Changelog
2014-10-23 12:25:52 +02:00
Joas Schilling
80a9c24b6b
[prep-release-3.1.0] Update version to 3.1.0
2014-10-23 12:22:02 +02:00
Joas Schilling
7a90184421
[prep-release-3.1.0-RC6] Update phpBB Version for RC7 development
2014-10-23 02:44:18 +02:00
Joas Schilling
5847a50334
[prep-release-3.1.0-RC6] Add changelog for 3.1.0-RC6
2014-10-23 01:57:59 +02:00
Joas Schilling
1ade9b39e4
[prep-release-3.1.0-RC6] Prepare Changelog
2014-10-23 01:55:48 +02:00
Joas Schilling
4c94e44710
[prep-release-3.1.0-RC6] Add migration for 3.1.0-RC6
2014-10-23 01:50:12 +02:00
Joas Schilling
d640a37984
[prep-release-3.1.0-RC6] Update version to 3.1.0-RC6
2014-10-23 01:48:38 +02:00