mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
11,939 Commits 17 Branches 190 Tags
Commit Graph

11939 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joas Schilling
8f6e99740b Merge branch 'develop-olympus' into develop 2011-10-14 04:39:20 +02:00
Joas Schilling
893469c652 Merge remote-tracking branch 'remotes/igorw/ticket/10189' into develop-olympus 2011-10-14 04:38:42 +02:00
Igor Wiedler
c3f3435228 [ticket/10189] Get rid of $id$ from schema files 
PHPBB3-10189
 2011-10-14 04:29:28 +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
Igor Wiedler
3100b9bb7c Merge remote-tracking branch 'naderman/ticket/10212' into develop-olympus 
* naderman/ticket/10212:
  [ticket/10212] Return a CAPTCHA on incorrect username for ip limited users too
 2011-10-14 03:55:23 +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
Igor Wiedler
8cf22f5529 [ticket/10189] Add "automatically generated" comment into schema-files 
PHPBB3-10189
 2011-10-14 03:41:02 +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
e11caec2a0 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10187] XHTML fix for empty groups in UCP.
 2011-10-14 02:51:32 +02:00
Nils Adermann
cdacbd07f8 Merge remote-tracking branch 'github-bantu/ticket/10187' into develop-olympus 
* github-bantu/ticket/10187:
  [ticket/10187] XHTML fix for empty groups in UCP.
 2011-10-14 02:51:12 +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
Joas Schilling
52b2ee5a06 Merge remote-tracking branch 'remotes/igorw/feature/remove-imagesets' into develop 2011-10-14 02:17:20 +02:00
Igor Wiedler
5d055747d1 Merge pull request #415 from naderman/ticket/10412 
[ticket/10412] Replace memory_get_usage with memory_get_peak_usage
 2011-10-13 17:06:42 -07: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
Igor Wiedler
7f42970ba0 [feature/remove-imagesets] Fix create_schema_files, get rid of imagesets 
PHPBB3-10336
 2011-10-14 02:00:46 +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
5cae822594 Merge remote-tracking branch 'nickvergessen/ticket/10409' into develop 
* nickvergessen/ticket/10409:
  [ticket/10409] Running database_update.php multiple times breaks the update
 2011-10-13 23:48:24 +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
Joas Schilling
1df2148bf4 [ticket/10409] Running database_update.php multiple times breaks the update 
PHPBB3-10409
 2011-10-13 23:29:52 +02:00
Andreas Fischer
3ad5c45097 [ticket/10187] XHTML fix for empty groups in UCP. 
PHPBB3-10187
 2011-10-13 21:11:58 +02:00
Andreas Fischer
8c7be51bcc Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10246] Move coding guidelines VCS section to wiki
 2011-10-13 18:30:08 +02:00
Andreas Fischer
e43b7813a5 Merge remote-tracking branch 'igorw/ticket/10246' into develop-olympus 
* igorw/ticket/10246:
  [ticket/10246] Move coding guidelines VCS section to wiki
 2011-10-13 18:29:17 +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
Igor Wiedler
75ef0fde82 [ticket/10246] Move coding guidelines VCS section to wiki 
The VCS section can now be found at:
* http://wiki.phpbb.com/Git#Branches

PHPBB3-10246
 2011-10-13 17:43:59 +02:00
Andreas Fischer
e9677e6980 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8094] Remove ambiguity of "phpBB has no categories"
 2011-10-13 17:25:19 +02:00
Andreas Fischer
b957639abb Merge remote-tracking branch 'igorw/ticket/8094' into develop-olympus 
* igorw/ticket/8094:
  [ticket/8094] Remove ambiguity of "phpBB has no categories"
 2011-10-13 17:25:10 +02:00
Andreas Fischer
563fb56c4a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10275] Remove incorrect password information from FAQ
 2011-10-13 17:21:02 +02:00
Andreas Fischer
8017469e59 Merge remote-tracking branch 'igorw/ticket/10275' into develop-olympus 
* igorw/ticket/10275:
  [ticket/10275] Remove incorrect password information from FAQ
 2011-10-13 17:20:52 +02:00
Andreas Fischer
bfe621d7b5 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9898] Encourage patches in README
 2011-10-13 17:16:31 +02:00
Andreas Fischer
57d157a723 Merge remote-tracking branch 'igorw/ticket/9898' into develop-olympus 
* igorw/ticket/9898:
  [ticket/9898] Encourage patches in README
 2011-10-13 17:16:20 +02:00
Andreas Fischer
baf09125ab Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
 2011-10-13 17:10:38 +02:00
Andreas Fischer
3a92623dfa Merge remote-tracking branch 'nickvergessen/ticket/10408' into develop-olympus 
* nickvergessen/ticket/10408:
  [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP
 2011-10-13 17:09:48 +02:00
Igor Wiedler
ee91656968 [ticket/10275] Remove incorrect password information from FAQ 
FAQ contains instructions to find the password in the registration
e-mail. We no longer send the password on registration. So let's just
remove this incorrect piece of information from the FAQ.

PHPBB3-10275
 2011-10-13 17:09:34 +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
Andreas Fischer
9fbe4e34ab Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10400] Allow forum name to be '0'
 2011-10-13 17:05:53 +02:00
Andreas Fischer
4b42646f36 Merge remote-tracking branch 'nickvergessen/ticket/10400' into develop-olympus 
* nickvergessen/ticket/10400:
  [ticket/10400] Allow forum name to be '0'
 2011-10-13 17:05:01 +02:00
Igor Wiedler
6d9e9d1901 [ticket/10307] Add a test for PHPBB3-10307 
PHPBB3-10307
 2011-10-13 16:57:42 +02:00
Igor Wiedler
3cd8c2507d [ticket/10307] Return false in mysqli sql_fetchrow on empty result 
PHPBB3-10307
 2011-10-13 16:43:11 +02:00
Igor Wiedler
6698a9cbd6 [ticket/8094] Remove ambiguity of "phpBB has no categories" 
PHPBB3-8094
 2011-10-13 16:25:41 +02:00
Joas Schilling
88aacd0f2c [ticket/10408] Layout of topics/attachments list is broken in UCP and MCP 
PHPBB3-10408
 2011-10-13 15:52:12 +02:00
Joas Schilling
367bc23009 Merge branch 'develop-olympus' into develop 
Conflicts:
	phpBB/includes/functions.php
 2011-10-13 14:46:16 +02:00
Joas Schilling
b515f5462e Merge remote-tracking branch 'remotes/cyberalien/ticket/10397' into develop-olympus 2011-10-13 14:37:45 +02:00
Joas Schilling
f94f872624 [ticket/10304] Fix URL for ICQ while view private messages 
PHPBB3-10304
 2011-10-13 13:59:39 +02:00
Igor Wiedler
d4bbfae0d5 [ticket/9898] Encourage patches in README 
PHPBB3-9898
 2011-10-13 11:53:25 +02:00