makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-23 18:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
25966 commits 18 branches 192 tags 209 MiB
Commit graph

22280 commits

Author SHA1 Message Date
Marc Alexander
7461536459 [ticket/13263] Make sure default style exists and clean up code 
PHPBB3-13263
 2014-11-01 23:53:58 +01:00
Marc Alexander
d1f85f0de3 [ticket/13263] Only install/set prosilver if no style available 
Users that have a nonexistent style selectd will revert back to the default
style.

PHPBB3-13263
 2014-11-01 23:53:53 +01:00
Marc Alexander
be8b5a41c8 [ticket/13263] Use prosilver as default style if user's style doesn't exist 
If prosilver is not installed for whatever reason, it will be installed by
the newly added migration.

PHPBB3-13263
 2014-11-01 23:53:48 +01:00
Marc Alexander
f534503a66 [ticket/security-164] Correctly format page_name 
SECURITY-164
 2014-11-01 22:43:28 +01:00
Marc Alexander
28ef238a5c [ticket/security-164] Sanitize all global variables in symfony_request class 
SECURITY-164
 2014-11-01 22:43:18 +01:00
Marc Alexander
d9c868d0f5 [ticket/13248] Correctly pass provider name 
PHPBB3-13248
 2014-11-01 21:54:27 +01:00
Marc Alexander
a9249bce5e [ticket/13248] Always use provider collection for getting provider 
PHPBB3-13248
 2014-11-01 21:54:21 +01:00
Marc Alexander
c3f5dc75be [ticket/13248] Allow specifying different auth provider in provider collection 
PHPBB3-13248
 2014-11-01 21:54:14 +01:00
Marc Alexander
6b057e026c [ticket/13248] Use auth provider collection for getting provider 
PHPBB3-13248
 2014-11-01 21:54:06 +01:00
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
Jakub Senko
4522db7624 [ticket/13266] Enable twig dump function 
PHPBB3-13266
 2014-11-01 12:31:58 +01:00
Marc Alexander
a61299a940 Merge pull request #3098 from VSEphpbb/ticket/13262 
[ticket/13262] Mention htaccess file when updating from 3.0 to 3.1
 2014-11-01 09:10:34 +01:00
Matt Friedman
416577f3dc [ticket/13262] Mention htaccess file when updating from 3.0 to 3.1 
PHPBB3-13262
 2014-10-31 13:08:36 -07:00
Cesar G
65c3f2a8f1 [ticket/13253] Fix MCP queue link in active topics search. 
PHPBB3-13253
 2014-10-30 22:47:51 -07:00
Andreas Fischer
17928563a2 Merge pull request #3093 from nickvergessen/ticket/13241 
[ticket/13241] Fix pagination of viewforum with global announcements

* nickvergessen/ticket/13241:
  [ticket/13241] Remove sleep() and change flood interval instead
  [ticket/13241] Remove sleep() since the method takes care of this now
  [ticket/13241] Sleep for 1 second when posting twice in the same second
  [ticket/13241] Fix pagination with global announcements
  [ticket/13241] Correctly ignore announcements from topics list
  [ticket/13241] Add a functional test for viewforum with global announcement
 2014-10-29 15:10:39 +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
9ee177573d [ticket/13241] Fix pagination with global announcements 
PHPBB3-13241
 2014-10-29 13:42:42 +01:00
Joas Schilling
ae6a3b03c4 [ticket/13241] Correctly ignore announcements from topics list 
PHPBB3-13241
 2014-10-29 13:42:41 +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 2014-10-28 13:08: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
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
fcc320e385 [ticket/13234] Fix conditions and CS 
PHPBB3-13234
 2014-10-28 12:19:53 +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
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
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
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
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
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
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
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
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
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
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