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
607761e830
[ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
...
PHPBB3-10327
2011-10-14 17:23:29 +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
Nils Adermann
0ffe494edd
[feature/functional-tests] Configure functional tests through config file
...
The functional tests now also use the test database
PHPBB3-10414
2011-10-14 17:20:54 +02:00
Igor Wiedler
637d8eabe7
[feature/functional-tests] Implementing functional test framework with goutte
...
PHPBB3-10414
2011-10-14 17:20:53 +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
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
Joas Schilling
ab8ecf5b92
[ticket/9956] Display error message if no disapprove reason given
...
PHPBB3-9956
2011-10-14 04:18:44 +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
Igor Wiedler
7fa14e654a
[ticket/10413] Make create_schema_files usable
...
PHPBB3-10413
2011-10-14 03:12:44 +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
Nils Adermann
cd522a11f3
[feature/extension-manager] Properly remove old ACP language loading code
...
PHPBB3-10323
2011-10-14 01:31:24 +02:00
Nils Adermann
4fb9f2101d
[feature/extension-manager] Support extensions in subdirectories of ext/
...
PHPBB3-10323
2011-10-14 01:30:50 +02:00
Nils Adermann
f53892c838
[feature/extension-manager] Add prefix to extension meta data / install classes
...
PHPBB3-10323
2011-10-14 00:52:36 +02:00
Nils Adermann
639e3b9f17
[feature/extension-manager] Support for loading language files from extensions
...
The referenced extension needs to be explicitly specified in an add_lang_ext()
call.
PHPBB3-10323
2011-10-14 00:44:48 +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
Nils Adermann
724f40f0f4
[feature/extension-manager] extension finder now saves ext it found a file in
...
PHPBB3-10323
2011-10-13 21:19:35 +02:00
Andreas Fischer
3ad5c45097
[ticket/10187] XHTML fix for empty groups in UCP.
...
PHPBB3-10187
2011-10-13 21:11:58 +02:00
Igor Wiedler
39f6d58315
[ticket/8616] Rename U_INBOX to U_VIEW_MESSAGE
...
PHPBB3-8616
2011-10-13 19:28:46 +02:00
Alan
f7c1341402
[ticket/8616] Direct links in pm notification emails
...
Import the "Direct links in pm notification emails" modification,
version 1.0.1.
PHPBB3-8616
2011-10-13 19:17:56 +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
Nils Adermann
7b12bba95b
[feature/extension-manager] Allow old non-prefix basenames to work for lookups
...
These module basenames are hardcoded in a bunch of places so they need to
continue to work unless we want to rewrite all of them.
PHPBB3-10323
2011-10-13 17:38:38 +02:00