mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-31 11:39:37 +02:00
Code Issues Releases Wiki Activity
24,412 Commits 18 Branches 192 Tags
Commit Graph

1708 Commits

Author SHA1 Message Date
Marc Alexander
6b057e026c [ticket/13248] Use auth provider collection for getting provider 
PHPBB3-13248
 2014-11-01 21:54:06 +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
Andreas Fischer
ae55db6da4 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12703] Only query database for subscription types once
 2014-10-29 15:09:55 +01:00
Andreas Fischer
bb4f65d743 Merge pull request #3076 from marc1706/ticket/12703 
[ticket/12703] Only query database for subscription types once

* marc1706/ticket/12703:
  [ticket/12703] Only query database for subscription types once
 2014-10-29 15:09:55 +01:00
Joas Schilling
d27deeef02 Merge branch 'develop-ascraeus' into develop 2014-10-28 12:58: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
5426e9c700 Merge branch 'develop-ascraeus' into develop 2014-10-28 10:03:09 +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 64d97d0787a63b3c646f89237574ac566ed89c50 commit

PHPBB3-13234
 2014-10-27 19:58:32 -07:00
Nils Adermann
2438bfbfc6 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13227] Properly handle curlwrapper headers in remote avatars
  [ticket/13231] Update the dependencies of the migration contact_admin_form
 2014-10-27 19:04:13 -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
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
120bdf9364 Merge branch 'develop-ascraeus' into develop 2014-10-27 23:40:19 +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
Marc Alexander
6cc5160d60 [ticket/13225] Use passwords manager instead of phpbb_hash in migration 
PHPBB3-13225
 2014-10-26 17:14:34 -07:00
Marc Alexander
cb65cd363a [ticket/12703] Only query database for subscription types once 
PHPBB3-12703
 2014-10-26 13:56:34 -07:00
Nils Adermann
10251b43db Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13223] Fix USERNAME email template variable in notification
 2014-10-26 12:48:35 -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
Nils Adermann
a686ed3df0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13221] Add bot_update as a dependency to gold
  [ticket/13221] Perform bot updates after user table changes
 2014-10-26 12:43:33 -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
76cdc2d891 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [prep-release-3.1.0] Add 3.1.0 gold release migration
 2014-10-25 17:05:13 -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
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
Nils Adermann
d9f84da577 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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:04:58 -07:00
Nils Adermann
6308a442d1 Merge pull request #3060 from marc1706/ticket/13211 
[ticket/13211] Add log wrapper for writing database updater to log file
 2014-10-25 12:04:29 -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
d3026bd895 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13210] Use the correct config value
 2014-10-25 19:50:34 +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
947ab91473 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	build/build.xml
	phpBB/includes/constants.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg
 2014-10-23 02:45:54 +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
Nils Adermann
d08a47d857 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13203] Fix passwords manager tests
  [ticket/13203] Use string_compare method in passwords drivers
  [ticket/13203] Add method for byte by byte comparison to drivers helper
 2014-10-22 16:58:50 -04:00
Marc Alexander
0bc04a4df0 [ticket/13203] Use string_compare method in passwords drivers 
PHPBB3-13203
 2014-10-22 14:54:55 -05:00
Marc Alexander
2b47ef1266 [ticket/13203] Add method for byte by byte comparison to drivers helper 
PHPBB3-13203
 2014-10-22 14:54:22 -05:00
Tristan Darricau
fdece6cdf3 [ticket/13126] Add missing use statement 
PHPBB3-13126
 2014-10-22 15:25:50 +02:00
Joas Schilling
7c2ed57a99 Merge branch 'develop-ascraeus' into develop 2014-10-20 22:19:43 +02:00
Joas Schilling
75b6545bc2 Merge pull request #3040 from nickvergessen/ticket/13138-asc 
[3.1] Ticket/13138 Only use cookie data when we do not force a user_id

Conflicts:
	phpBB/phpbb/session.php
 2014-10-20 22:19:25 +02:00
Nils Adermann
79d6f67e81 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13188] Correctly format string concatenation
  [ticket/13188] Add missing where clause to post_id query in sphinx index
 2014-10-20 15:31:06 -04:00
Nils Adermann
973dfbf868 Merge pull request #3048 from naderman/ticket/13188 
[ticket/13188] Add missing where clause to post_id query in sphinx index
 2014-10-20 15:30:08 -04:00
Nils Adermann
ee97b92e5d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13138] Do not use cookie data and autologin while forcing a user_id
 2014-10-20 14:53:52 -04:00