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
17451e0842
Merge remote-tracking branch 'dellsystem/ticket/olympus/10430' into develop-olympus
...
* dellsystem/ticket/olympus/10430:
[ticket/10430] Fix typos/etc in coding guidelines
2011-10-29 12:22:02 +02:00
Igor Wiedler
5e3f73c498
Merge remote-tracking branch 'bantu/ticket/10259' into develop-olympus
...
* bantu/ticket/10259:
[ticket/10259] Do not send notifications to user accounts joining free groups.
2011-10-29 11:43:28 +02:00
Igor Wiedler
983b3d7f64
Merge remote-tracking branch 'bantu/ticket/10166' into develop-olympus
...
* bantu/ticket/10166:
[ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
2011-10-29 11:38:57 +02:00
Joas Schilling
219bdbaf70
[ticket/8996] Correctly apply BBCodes in IE6-9 when applying with accesskey
...
PHPBB3-8996
2011-10-29 01:27:12 +02:00
Andreas Fischer
2e9e0a7d78
[ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
...
It does not make much sense to say "the username you received in a previous
e-mail" when the message itself contains the username.
PHPBB3-10166
2011-10-29 00:32:38 +02:00
Andreas Fischer
fa23def774
[ticket/10190] Do not show hint about permissions when editing forum settings.
...
PHPBB3-10190
2011-10-29 00:16:30 +02:00
dellsystem
8b99f04943
[ticket/10430] Fix typos/etc in coding guidelines
...
Mainly minor changes to correct errors and improve readability.
* "overcroud" --> "overcrowd"
* "concentinations" --> "concatenations"
* "SQL Statements", "SQL Formatting" - unnecessary capitalisation removed
* "keep a very close eye to it" --> "keep a very close eye on it"
* Fixed some fragmented sentences under the SQL Quotes section
* Added capitalisation of "sql", "select", "select distinct"
* "noticable" --> "noticeable"
* "outputed" --> "outputted"
* Added a missing "it" on the line about append_sid()
* And some other grammatical/stylistic changes, not worth listing them all
PHPBB3-10430
2011-10-28 10:27:38 -04:00
Callum Macrae
8795362879
[ticket/10402] Fixed a formatting issue with report details.
...
Line returns were being removed and links weren't being made clickable.
This commit adds a line (contributed by AmigoJack) to retain the link
breaks and make links clickable.
PHPBB3-10402
2011-10-22 23:03:49 +01: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
Vjacheslav Trushkin
c8399b8e30
[ticket/10422] Invalid "if" in viewtopic_body.html
...
Fixing incorrect "IF" in viewtopic_body.html
PHPBB3-10422
2011-10-18 21:37:51 +03:00
rxu
88b31c2ab3
[ticket/10419] Add mbstring PHP ini parameters checks to ACP
...
PHPBB3-10419
2011-10-18 02:09:08 +08: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
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
Igor Wiedler
ff0839e76b
Merge remote-tracking branch 'bantu/ticket/10416' into develop-olympus
...
* bantu/ticket/10416:
[ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
2011-10-17 02:40:44 +02:00
Andreas Fischer
cc227cc6f6
Merge remote-tracking branch 'igorw/ticket/10413' into develop-olympus
...
* igorw/ticket/10413:
[ticket/10413] Fix CS
[ticket/10413] Make create_schema_files usable
2011-10-16 20:16:12 +02:00
Andreas Fischer
fa1d9a4571
[ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
...
PHPBB3-10416
2011-10-16 20:10:37 +02:00
Igor Wiedler
8d33dea2cd
[ticket/10413] Fix CS
...
PHPBB3-10413
2011-10-16 19:30:33 +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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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