makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-13 06:48:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
29713 commits 18 branches 192 tags 206 MiB
Commit graph

10537 commits

Author SHA1 Message Date
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
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
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
rxu
16d78407db [ticket/13229] Fix overloading memberlist with redundant SQL queries 
PHPBB3-13229
 2014-10-27 17:01:29 -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
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
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
Andreas Fischer
e4277525a0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13193] Swap ternary condition members
  [ticket/13193] Make template more readable
  [ticket/13193] Add load_search config check
  [ticket/13193] Add link to post count in PMs
 2014-10-26 14:20:34 +01:00
Andreas Fischer
69cf5782d4 Merge pull request #3054 from Senky/ticket/13193 
[ticket/13193] Post count in PMs not a link

* Senky/ticket/13193:
  [ticket/13193] Swap ternary condition members
  [ticket/13193] Make template more readable
  [ticket/13193] Add load_search config check
  [ticket/13193] Add link to post count in PMs
 2014-10-26 14:20:33 +01:00
Jakub Senko
79274e904c [ticket/13193] Swap ternary condition members 
PHPBB3-13193
 2014-10-26 08:44:21 +01:00
Nils Adermann
7a4b404af7 [develop-ascraeus] Update version number to 3.1.1-RC1-dev 2014-10-25 20:28:46 -07:00
Nils Adermann
33d0872a18 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13207] Add notification manager mock to user_add method in tests
  [ticket/13207] Move default user notifications settings to user_add()
  [ticket/13207] Add default subscription options for newly registered users
 2014-10-25 16:56:26 -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
Joas Schilling
80a9c24b6b [prep-release-3.1.0] Update version to 3.1.0 2014-10-23 12:22:02 +02: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
7a90184421 [prep-release-3.1.0-RC6] Update phpBB Version for RC7 development 2014-10-23 02:44:18 +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
Joas Schilling
acf6eaf8a8 Merge branch 'develop-ascraeus' into develop 2014-10-23 01:38:54 +02:00
Joas Schilling
e4c8e4905c Merge pull request #3 from phpbb/ticket/security-161 
[ticket/security-161] Add form token to styles management form.
 2014-10-23 01:38:12 +02:00
Cesar G
4d30633cd4 [ticket/security-161] Add form token to styles management form. 
SECURITY-161
 2014-10-22 15:46:00 -07:00
Marc Alexander
378fef022f Merge branch 'develop-ascraeus' into develop 2014-10-22 17:42:51 -05:00
Marc Alexander
6a0727acdc Merge pull request #3058 from naderman/ticket/13205 
[ticket/13205] Add a mark all messages read link to PM folders
 2014-10-22 17:39:13 -05:00
Nils Adermann
df72846b89 [ticket/13205] Explicitly cast ids to integers and reformat SQL 
PHPBB3-13205
 2014-10-22 18:35:07 -04:00
Nils Adermann
b5594371ab [ticket/13205] Remove superfluous newline 
PHPBB3-13205
 2014-10-22 18:31:29 -04:00
Nils Adermann
00c57ed122 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/security-159] Only show first 8 characters of login keys in UCP
 2014-10-22 18:21:12 -04:00
Nils Adermann
48dc4c02ae [ticket/13205] Add a mark all messages read link to PM folders 
PHPBB3-13205
 2014-10-22 18:02:43 -04:00
Marc Alexander
f796f92058 [ticket/security-159] Only show first 8 characters of login keys in UCP 
SECURITY-159
 2014-10-22 16:21:16 -05:00
Marc Alexander
a623868f20 [ticket/13192] Pass correct parameters and rename method to get_valid_page 
PHPBB3-13192
 2014-10-21 22:38:03 -05:00
Marc Alexander
ce8c09f51f [ticket/13192] Use get_valid_user_page in confirm_box() and cleanup globals 
The $request global existed twice and the $phpEx global is not being used
in confirm_box().

PHPBB3-13192
 2014-10-21 22:17:48 -05:00
Marc Alexander
c381ad2002 [ticket/13192] Use get_valid_user_page method in build_url function 
PHPBB3-13192
 2014-10-21 22:17:24 -05:00
Marc Alexander
7c4b7f63fc Merge branch 'develop-ascraeus' into develop 2014-10-21 18:58:06 -05:00
Marc Alexander
faec26b873 Merge pull request #3053 from Senky/ticket/13194 
[ticket/13194] BBCode isn't parsed when issuing a warning for a post
 2014-10-21 18:57:43 -05:00
Jakub Senko
0dcfcf5854 [ticket/13193] Add load_search config check 
PHPBB3-13193
 2014-10-21 22:53:59 +02:00
Jakub Senko
92f077a4e9 [ticket/13193] Add link to post count in PMs 
PHPBB3-13193
 2014-10-21 22:32:57 +02:00
Jakub Senko
defeb1a56f [ticket/13194] Use correct array to access bbcode_bitfield 
PHPBB3-13194
 2014-10-21 22:21:48 +02:00
Nils Adermann
b7386c0c82 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13189] Do not use confirm box for marking all notifications read
 2014-10-21 09:49:42 -04:00
Marc Alexander
293d64e122 [ticket/13189] Do not use confirm box for marking all notifications read 
We already use a token for preventing CSRF when marking notifications read.
Making a user confirm the marking read action serves no real purpose. No
information will be lost by just marking the notifications read but it will
prevent users from always having to confirm this action.

PHPBB3-13189
 2014-10-20 21:55:36 -05:00
Andreas Fischer
a16f185413 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
 2014-10-20 23:20:43 +02:00
Andreas Fischer
b71cf56bda Merge pull request #3047 from Elsensee/ticket/13168 
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility

* Elsensee/ticket/13168:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
 2014-10-20 23:20:42 +02:00
Andreas Fischer
afada9ed40 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
 2014-10-20 23:20:42 +02:00
Oliver Schramm
53f166274a [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility 
PHPBB3-13168
 2014-10-20 16:47:52 +02:00
Oliver Schramm
30213816ae [ticket/13100] Display only confirmation buttons when deleting shadow topic 
PHPBB3-13100
 2014-10-20 00:24:16 +02:00
Marc Alexander
c6d65b051c Merge branch 'develop-ascraeus' into develop 2014-10-18 21:47:36 -04:00
Marc Alexander
c939f1b2c7 Merge pull request #3030 from Senky/ticket/13164 
[ticket/13164] data sent to core.submit_post_end event does not include fresh post_visibility
 2014-10-18 21:47:15 -04:00
Marc Alexander
6216771ac0 Merge branch 'develop-ascraeus' into develop 2014-10-18 18:00:38 -04:00
Oliver Schramm
f049fcd604 [ticket/11863] Display warning to user because of activation method 
PHPBB3-11863
 2014-10-17 15:42:11 +02:00