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

5098 commits

Author SHA1 Message Date
Andreas Fischer
019e43bc2d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10237] Display login-box for guests, when (un)subscribing

Conflicts:
	phpBB/includes/functions_display.php
 2011-11-11 22:17:12 +01:00
Andreas Fischer
f3c9133a6c Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympus 
* nickvergessen/ticket/10237:
  [ticket/10237] Display login-box for guests, when (un)subscribing
 2011-11-11 22:07:11 +01:00
Joas Schilling
1a19388aa3 [ticket/10237] Display login-box for guests, when (un)subscribing 
Also initialise $is_watching for PHP Notice: Undefined variable is_watching

PHPBB3-10237
 2011-11-06 23:51:29 +01:00
Andreas Fischer
d4cc53dfef Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
 2011-11-01 20:08:44 +01:00
Andreas Fischer
0b1199f7b2 Merge remote-tracking branch 'nickvergessen/ticket/9036' into develop-olympus 
* nickvergessen/ticket/9036:
  [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
 2011-11-01 20:08:17 +01:00
Andreas Fischer
589f7ac8e4 Merge remote-tracking branch 'nickvergessen/ticket/10410' into develop 
* nickvergessen/ticket/10410:
  [ticket/10410] Add option to display users in their first teampage group
 2011-11-01 20:04:08 +01:00
Joas Schilling
da8cac280c [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist 
PHPBB3-9036
 2011-10-29 16:26:17 +02:00
Igor Wiedler
72a3bcd048 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9307] Add config variable to installation schema.
  [ticket/9307] Remove hardcoded chunk size of mass emails.

Conflicts:
	phpBB/install/database_update.php
 2011-10-29 13:03:04 +02:00
Igor Wiedler
6d913d3646 Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympus 
* cs278/ticket/9307:
  [ticket/9307] Add config variable to installation schema.
  [ticket/9307] Remove hardcoded chunk size of mass emails.
 2011-10-29 13:01:03 +02:00
Igor Wiedler
5351195dd7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10420] Update includes/startup.php for PHP 5.4.
 2011-10-29 12:37:32 +02:00
Igor Wiedler
319d12bedf Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympus 
* bantu/ticket/10420:
  [ticket/10420] Update includes/startup.php for PHP 5.4.
 2011-10-29 12:37:16 +02:00
Igor Wiedler
189bd6dc9b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
 2011-10-29 12:32:39 +02:00
Igor Wiedler
020106eeb9 Merge remote-tracking branch 'bantu/ticket/10421' into develop-olympus 
* bantu/ticket/10421:
  [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
 2011-10-29 12:32:25 +02:00
Igor Wiedler
735e89c91b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10259] Do not send notifications to user accounts joining free groups.
 2011-10-29 11:43:44 +02:00
Joas Schilling
65a34fd047 [ticket/10410] Add option to display users in their first teampage group 
PHPBB3-10410
 2011-10-28 22:55:26 +02:00
Oleg Pudeyev
83d71ecb88 Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop 
* VSEphpbb/ticket/10390:
  [ticket/10390] Revert back to escaped script tags inside document.write
  [ticket/10390] Fix wording: fallback should be fall back
  [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
  [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
  [ticket/10390] Drop http protocol for Microsoft's CDN option
  [ticket/10390] Reword the language for jQuery host/server options
  [ticket/10390] Fix a type-o - captialize AJAX
  [ticket/10390] Improve the jQuery CDN url generation function
  [ticket/10390] Move jQuery version definition
  [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Conflicts:
	phpBB/install/database_update.php
 2011-10-20 20:46:48 -04:00
Andreas Fischer
ba1464b6e0 [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php 
PHPBB3-10421
 2011-10-18 21:25:27 +02:00
Andreas Fischer
cd184e4912 [ticket/10420] Update includes/startup.php for PHP 5.4. 
PHP 5.4 dropped support for register globals and magic quotes.

Calling set_magic_quotes_runtime() on PHP 5.4 actually results in an
E_CORE_ERROR error.

PHPBB3-10420
 2011-10-18 21:16:42 +02:00
Andreas Fischer
8f6cfc77d2 [ticket/10259] Do not send notifications to user accounts joining free groups. 
It does not make sense to send notifications to users joining a freely open
group. They already know that they were added to the group, because they
triggered the actual join.

PHPBB3-10259
 2011-10-17 19:10:41 +02:00
Andreas Fischer
c6e370d33a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9525] Minimum post length 0 is accepted but not working.
 2011-10-17 16:44:08 +02:00
Andreas Fischer
cfb5135805 Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympus 
* nickvergessen/ticket/9525:
  [ticket/9525] Minimum post length 0 is accepted but not working.
 2011-10-17 16:43:58 +02:00
Nils Adermann
95fed7806d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10377] Do not allow all moderators to sticky posts
 2011-10-14 17:56:46 +02:00
Nils Adermann
7813135365 Merge remote-tracking branch 'github-igorw/ticket/10377' into develop-olympus 
* github-igorw/ticket/10377:
  [ticket/10377] Do not allow all moderators to sticky posts
 2011-10-14 17:56:38 +02:00
Igor Wiedler
99d6f00d51 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
 2011-10-14 17:50:53 +02:00
Igor Wiedler
cafefe9379 Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympus 
* bantu/ticket/10327:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
 2011-10-14 17:50:08 +02:00
Nils Adermann
8a82ec95a5 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8240] Add ability to get a list of columns of a tables to db_tools.
  [ticket/8240] Add ability to get a list of tables to db_tools.
 2011-10-14 17:48:15 +02:00
Igor Wiedler
27279afa1e [ticket/10377] Do not allow all moderators to sticky posts 
In the mcp the change_topic_type does not properly check permissions,
allowing moderators to make any post sticky or announced by visiting the
correct URL.

PHPBB3-10377
 2011-10-14 17:37:12 +02:00
Nils Adermann
a3928bf82d [feature/functional-tests] Generate config correctly and install only once 
PHPBB3-10414
 2011-10-14 17:23:31 +02:00
Andreas Fischer
7e18d2b861 [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE. 
PHPBB3-10327
 2011-10-14 17:23:21 +02:00
Andreas Fischer
4effe8fb8b [ticket/8240] Add ability to get a list of columns of a tables to db_tools. 
PHPBB3-8240
 2011-10-14 16:35:14 +02:00
Andreas Fischer
234edf674c [ticket/8240] Add ability to get a list of tables to db_tools. 
PHPBB3-8240
 2011-10-14 16:35:07 +02:00
Joas Schilling
e40abfbde9 [ticket/9525] Minimum post length 0 is accepted but not working. 
PHPBB3-9525
 2011-10-14 15:19:47 +02:00
Igor Wiedler
37d9e7e30c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
 2011-10-14 14:35:21 +02:00
Igor Wiedler
1657339e6d Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympus 
* bantu/ticket/10327:
  [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL.
 2011-10-14 14:34:44 +02:00
Andreas Fischer
d86fccf9c9 [ticket/10327] Change CREATE INDEX to ALTER TABLE table ADD INDEX for MySQL. 
* CREATE INDEX is internally mapped to an ALTER INDEX statement.
* CREATE INDEX requires the INDEX permission.
* ALTER TABLE requires the (more powerful) ALTER permission.
* We require the ALTER permission anyway for operation.
* Changing CREATE INDEX to ALTER TABLE thus removes dependency on the INDEX
  permission which is good because some management software does not give
  out the INDEX permission by default.

http://dev.mysql.com/doc/refman/5.0/en/create-index.html

PHPBB3-10327
 2011-10-14 14:30:51 +02:00
Igor Wiedler
14636f61d5 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too

Conflicts:
	phpBB/includes/auth/auth_db.php
 2011-10-14 03:56:55 +02:00
Nils Adermann
768932a3f2 [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too 
PHPBB3-10212
 2011-10-14 03:41:52 +02:00
Nils Adermann
d68b815690 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10074] Change default value of 'Set as special rank' to No
 2011-10-14 02:55:21 +02:00
Nils Adermann
d16b160d5c Merge remote-tracking branch 'github-nickvergessen/ticket/10074' into develop-olympus 
* github-nickvergessen/ticket/10074:
  [ticket/10074] Change default value of 'Set as special rank' to No
 2011-10-14 02:55:05 +02:00
Nils Adermann
c5ee92c3f2 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
 2011-10-14 02:49:15 +02:00
Nils Adermann
dda1e13126 Merge remote-tracking branch 'github-bantu/ticket/10278' into develop-olympus 
* github-bantu/ticket/10278:
  [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
  [ticket/10278] Also timeout when receiving data over a slow connection.
  [ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
  [ticket/10278] Return with a timeout error when fread() or fgets() time out.
  [ticket/10278] Also set timeout on stream in get_remote_file().
 2011-10-14 02:47:45 +02:00
Joas Schilling
1f677d5de3 [ticket/10074] Change default value of 'Set as special rank' to No 
PHPBB3-10074
 2011-10-14 02:41:37 +02:00
Nils Adermann
bb616b4135 [ticket/10412] Replace memory_get_usage with memory_get_peak_usage 
PHPBB3-10412
 2011-10-14 02:02:17 +02:00
Andreas Fischer
85407986ea Merge remote-tracking branch 'nickvergessen/ticket/10300' into develop 
* nickvergessen/ticket/10300:
  [ticket/10300] Always set group attributes for teampage and legend
 2011-10-13 23:48:45 +02:00
Andreas Fischer
301f9d42f7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10307] Add a test for PHPBB3-10307
  [ticket/10307] Return false in mysqli sql_fetchrow on empty result
 2011-10-13 23:45:04 +02:00
Andreas Fischer
4e69fe6859 Merge remote-tracking branch 'igorw/ticket/10307' into develop-olympus 
* igorw/ticket/10307:
  [ticket/10307] Add a test for PHPBB3-10307
  [ticket/10307] Return false in mysqli sql_fetchrow on empty result
 2011-10-13 23:44:42 +02:00
Andreas Fischer
1dc1583b92 [ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT. 
PHPBB3-10278
 2011-10-13 18:23:33 +02:00
Andreas Fischer
091119605a [ticket/10278] Also timeout when receiving data over a slow connection. 
PHPBB3-10278
 2011-10-13 18:03:02 +02:00
Andreas Fischer
d5cd49f276 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10304] Fix URL for ICQ while view private messages
 2011-10-13 17:07:39 +02:00
Andreas Fischer
4c1bde350a Merge remote-tracking branch 'nickvergessen/ticket/10304' into develop-olympus 
* nickvergessen/ticket/10304:
  [ticket/10304] Fix URL for ICQ while view private messages
 2011-10-13 17:07:28 +02:00