mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
24,393 Commits 17 Branches 190 Tags
Commit Graph

24393 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
ae6a3b03c4 [ticket/13241] Correctly ignore announcements from topics list 
PHPBB3-13241
 2014-10-29 13:42:41 +01:00
Joas Schilling
82aed75b3b [ticket/13241] Add a functional test for viewforum with global announcement 
PHPBB3-13241
 2014-10-29 13:42:41 +01:00
Joas Schilling
e874e1ea47 Merge branch 'develop-ascraeus' into develop 2014-10-28 13:35:34 +01:00
Joas Schilling
3a2ccd079e Merge branch 'prep-release-3.1.0' into develop-ascraeus 2014-10-28 13:35:27 +01:00
Joas Schilling
197fed16bd [prep-release-3.1.0] Update changelog with final changes release-3.1.0 2014-10-28 13:08:52 +01:00
Joas Schilling
d27deeef02 Merge branch 'develop-ascraeus' into develop 2014-10-28 12:58:52 +01:00
Joas Schilling
c57fbe9d0d Merge branch 'prep-release-3.1.0' into develop-ascraeus 2014-10-28 12:58:45 +01:00
Joas Schilling
12033bc499 Merge branch 'develop-olympus' into prep-release-3.1.0 
Conflicts:
	phpBB/phpbb/session.php
 2014-10-28 12:57:38 +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
d2cd24e875 Merge pull request #3090 from Nicofuma/ticket/13234 
Ticket/13234
 2014-10-28 12:56:15 +01:00
Tristan Darricau
9036edd935 [ticket/13234] Merge branch 'ticket/13234' into ticket/13234-2 
* ticket/13234:
  [ticket/13234] Fix conditions and CS

Conflicts:
	phpBB/phpbb/session.php

PHPBB3-13234
 2014-10-28 12:27:16 +01:00
Tristan Darricau
fcc320e385 [ticket/13234] Fix conditions and CS 
PHPBB3-13234
 2014-10-28 12:19:53 +01:00
Joas Schilling
5426e9c700 Merge branch 'develop-ascraeus' into develop 2014-10-28 10:03:09 +01:00
Joas Schilling
0682e5719d Merge branch 'prep-release-3.1.0' into develop-ascraeus 2014-10-28 10:02:53 +01:00
Joas Schilling
679559ce18 Merge branch 'naderman-ticket/13232' into prep-release-3.1.0 2014-10-28 10:02:33 +01:00
Joas Schilling
2e814cc43f [ticket/13232] Fix spaces vs tabs 
PHPBB3-13232
 2014-10-28 10:01:28 +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
e1277c26ca Merge branch 'ticket/13234' into ticket/13234-2 
* ticket/13234:
  [ticket/13234] Never allow autologin/remember me to modify the userid
 2014-10-27 19:57:16 -07:00
Nils Adermann
64d97d0787 [ticket/13234] Never allow autologin/remember me to modify the userid 
This prevents admin relogin with forced user id from overwriting
remember me cookies

PHPBB3-13234
 2014-10-27 19:55:56 -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
b9c08cddd4 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [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:01 -07:00
Nils Adermann
dccbd573e8 [ticket/13232] Ensure prune cron job always gets run in prune test 
The cron scheduler might pick a different task but we don't want to go
through them all to find the one we need. So we just make sure cron is
run at all and then manually run the one we want.

PHPBB3-13232
 2014-10-27 19:00:23 -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
66c23d6855 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13229] Fix overloading memberlist with redundant SQL queries
 2014-10-27 17:02:09 -07:00
Nils Adermann
4c75f013de Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [ticket/13229] Fix overloading memberlist with redundant SQL queries
 2014-10-27 17:01:57 -07:00
Nils Adermann
1f31e8e243 Merge branch 'ticket/13229' into prep-release-3.1.0 
* ticket/13229:
  [ticket/13229] Fix overloading memberlist with redundant SQL queries
 2014-10-27 17:01:46 -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
Nils Adermann
dbaee1a5da Merge pull request #4 from nickvergessen/naderman-ticket/13232 
[ticket/13232] Fix more issues with TTL and global cache file
 2014-10-27 16:36:39 -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
Joas Schilling
91a9d25a38 Merge branch 'prep-release-3.1.0' into develop-ascraeus 2014-10-27 23:40:04 +01: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
Dhruv
505ee586ff [ticket/12962] Rename setup-phpbb-test 
PHPBB3-12962
 2014-10-27 18:36:33 -04: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
d74bf0f370 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13230] Add missing globals and missing request object for path helper
  [ticket/13226] Add functional test for group ranks
  [ticket/13226] Fix the usage of $rank_img
 2014-10-27 12:25:53 -07:00
Nils Adermann
b1d7386075 Merge branch 'prep-release-3.1.0' into develop-ascraeus 
* prep-release-3.1.0:
  [ticket/13230] Add missing globals and missing request object for path helper
  [ticket/13226] Add functional test for group ranks
  [ticket/13226] Fix the usage of $rank_img
 2014-10-27 12:25:41 -07: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
Nils Adermann
decabb62c0 Merge pull request #3079 from nickvergessen/ticket/13230 
[ticket/13230] Add missing globals and missing request object for path helper
 2014-10-27 12:16:12 -07:00
Dhruv
cc82f95c8f [ticket/12962] Use phpVersion in phpunit.xml 
PHPBB3-12962
 2014-10-27 08:13:41 -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
2e5cc62071 [ticket/13226] Add functional test for group ranks 
PHPBB3-13226
 2014-10-27 14:37:51 +01:00
Tristan Darricau
9ccb87675d [ticket/13226] Fix the usage of $rank_img 
PHPBB3-13226
 2014-10-27 10:00:24 +01:00
Dhruv
c6cca9d0d2 [ticket/12962] Functional tests run for php <5.3.19 
PHPBB3-12962
 2014-10-26 21:30:31 -07:00
Dhruv
98554475be [ticket/12962] Clean up composer.json 
PHPBB3-12962
 2014-10-26 20:58:21 -07:00