1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-04 13:35:13 +02:00

4935 Commits

Author SHA1 Message Date
Oleg Pudeyev
f0544c884f Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus
* nickvergessen/ticket/8743:
  [ticket/8743] Include poster´s name in mail notifications
2012-10-16 21:20:58 -04:00
Oleg Pudeyev
bef3f9c7e7 Merge PR #917 branch 'Senky/ticket/10967' into develop-olympus
* Senky/ticket/10967:
  [ticket/10967] adding $root_path to posting_get_topic_icons
2012-10-16 20:30:45 -04:00
Senky
d434672dde [ticket/10967] adding $root_path to posting_get_topic_icons
PHPBB3-10967
2012-10-11 20:38:24 +02:00
Senky
1f89fc9cb6 [ticket/11112] updating links to phpbb.com to use SSL
PHPBB3-11112
2012-10-01 15:38:16 +02:00
David King
4dd1bbc587 [task/functional] Fixed DEBUG_TEST related issues
PHPBB3-10758
2012-09-01 10:53:01 -04:00
David King
7dfe26dd78 [task/functional] Allow tests to bypass certain restrictions with DEBUG_TEST
PHPBB3-10758
2012-09-01 10:37:44 -04:00
Jordan Rogers
73cd044f5c [ticket/11066] Remove debug code error_reporting(E_ALL) from mssqlnative.php
For some reason, all errors are just flipped on before connecting to the
database, despite the system as a whole having a different setting for
displayable errors. Had to add & ~E_STRICT in PHP 5.4.5 to suppress Strict
Standards messages, but I would assume that the db piece shouldn't be involved
with setting error_reporting at all.

PHPBB3-11066
2012-08-23 15:41:57 +02:00
Senky
d0a1c7bf0a [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
PHPBB3-10568
2012-08-02 20:08:49 +02:00
Andreas Fischer
60acd63c70 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
2012-07-23 23:39:58 +02:00
Nils Adermann
296fadfca4 [ticket/10965] Profile data is only grabbed when show_novalue is enabled
PHPBB3-10965
2012-07-23 23:35:48 +02:00
Andreas Fischer
27d9e3133b Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
2012-07-23 22:56:47 +02:00
Nils Adermann
2f5692d4bb [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
PHPBB3-10965
2012-07-23 22:38:38 +02:00
Andreas Fischer
7b98e75ec3 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
2012-07-23 15:48:53 +02:00
Nils Adermann
10172887fd [ticket/10965] Introduce a new profile field option to display no value
By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
2012-07-23 15:45:57 +02:00
Nils Adermann
29bee5b01a Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 16:15:32 +02:00
Nils Adermann
3dfcb212dc Merge remote-tracking branch 'github-nickvergessen/ticket/10950' into prep-release-3.0.11
* github-nickvergessen/ticket/10950:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 15:21:26 +02:00
Joas Schilling
3036db481a [ticket/10950] Fix grammar in comments
PHPBB3-10950
2012-07-20 18:03:06 +02:00
Joas Schilling
a3517232f9 [ticket/10950] Delete PMs for users that have not yet read the pm
PHPBB3-10950
2012-07-20 17:11:20 +02:00
Patrick Webster
ae07e80a65 [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
PHPBB3-10995
2012-07-17 20:53:29 +02:00
Joas Schilling
d9a32ce614 [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
PHPBB3-10950
2012-07-16 17:22:10 +02:00
Joas Schilling
e68c1fb9e4 [ticket/10950] Use database count() and group by instead of doing that in php
PHPBB3-10950
2012-07-11 12:58:57 +02:00
Oleg Pudeyev
a7da376004 Merge PR #856 branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
2012-07-07 16:43:28 -04:00
Oleg Pudeyev
36a568fd56 Merge PR #856 branch 'bantu/ticket/10937' into prep-release-3.0.11
* bantu/ticket/10937:
  [ticket/10937] Update documentation to say which comment styles are removed.
  [ticket/10937] Comment removal functions: Restore backward compatibility
2012-07-07 16:43:24 -04:00
Joas Schilling
338d29072f [ticket/10950] Check $delete_ids to be not empty
PHPBB3-10950
2012-07-04 13:14:19 +02:00
Joas Schilling
5c8c7b1352 [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
- Get delete_ids, pms of the user as receipt
- Get undelivered_msg, pms of the user as sender
- Delete undelivered_msg, if there are only NO_BOX, OUTBOX and SENTBOX links
- Correct the _new and _unread user values for the receipts
- Delete delete_ids, if there are no links to them anymore
- Reset _new and _unread values for the user we delete

PHPBB3-10950
2012-07-04 13:10:15 +02:00
Andreas Fischer
2c12f31cdf [ticket/10937] Update documentation to say which comment styles are removed.
PHPBB3-10937
2012-07-03 01:02:42 +02:00
Andreas Fischer
81d5327e44 [ticket/10937] Comment removal functions: Restore backward compatibility
PHPBB3-10937
2012-07-03 01:02:42 +02:00
Andreas Fischer
49afc1f2dc [ticket/10950] Correct comment for the second query.
Only undelivered messages are handled.

PHPBB3-10950
2012-06-23 11:16:38 +02:00
Andreas Fischer
30475856c4 [ticket/10950] Add empty line to make unset() call more visible.
PHPBB3-10950
2012-06-23 10:47:26 +02:00
Andreas Fischer
fce385e5bc [ticket/10950] Select the correct columns in SQL queries.
PHPBB3-10950
2012-06-23 10:45:36 +02:00
Andreas Fischer
9c2930178f [ticket/10950] Use a variable for the private message id.
PHPBB3-10950
2012-06-23 10:43:43 +02:00
Andreas Fischer
a50d1a3576 [ticket/10950] Move array initialisation to the front.
PHPBB3-10950
2012-06-23 10:32:16 +02:00
Andreas Fischer
2a76b7e869 [ticket/10950] Remove redundant if statement.
We already know author_id and folder_id.

PHPBB3-10950
2012-06-23 10:30:09 +02:00
Andreas Fischer
35b18676cd [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
PHPBB3-10950
2012-06-23 10:28:13 +02:00
Andreas Fischer
ac8ebfabc7 [ticket/10950] Use proper ' in order to fix comment.
PHPBB3-10950
2012-06-23 10:26:48 +02:00
Andreas Fischer
80180a6a20 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10935] Limit number of PM rules per user to 5000
2012-06-21 10:30:56 +02:00
Joas Schilling
80fafdeb1a [ticket/10935] Limit number of PM rules per user to 5000
PHPBB3-10935
2012-06-20 14:29:48 +02:00
Nils Adermann
08763ac99e Merge remote-tracking branch 'github-dhruvgoel92/ticket/9551' into develop-olympus
* github-dhruvgoel92/ticket/9551:
  [ticket/9551] uncomment line and change length to 255
2012-06-19 20:09:23 +02:00
Dhruv Goel
bbd3204a9c [ticket/9551] uncomment line and change length to 255
incase of partial collation change post_subject field will be changed back
to the default collation and length 255.

PHPBB3-9551
2012-06-19 20:03:57 +05:30
Andreas Fischer
118c5d90da [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus. 2012-05-31 22:07:34 +02:00
Andreas Fischer
2011085c29 [develop-olympus] Bump version numbers for 3.0.11-RC1 release. 2012-05-31 22:07:02 +02:00
Nils Adermann
f616c4e7a0 Merge remote-tracking branch 'github-bantu/ticket/10790' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10790:
  [ticket/10790] Remove a (kind of) dead code section from submit_pm().
2012-05-31 15:50:19 +02:00
Nils Adermann
7eaedcc8de Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10550:
  [ticket/10550] Sort not installed styles list in the styles section of the ACP.
2012-05-31 15:43:09 +02:00
Nils Adermann
b10757ef14 Merge remote-tracking branch 'github-bantu/ticket/10611' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10611:
  [ticket/10611] Filter out not existing database tables when making a backup.
  [ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
  [ticket/10611] Generate db_tools instance in acp_database module.
2012-05-31 15:34:48 +02:00
Nils Adermann
f6f300d3f9 Merge remote-tracking branch 'github-bantu/ticket/10162' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10162:
  [ticket/10162] Increase maximum length of email address TLD from 6 to 63.
  [ticket/10162] Add test cases for top level domain names longer than 6 chars.
2012-05-31 15:29:33 +02:00
Nils Adermann
b789758f1b Merge remote-tracking branch 'github-bantu/ticket/10751' into develop-olympus
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10751:
  [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
  [ticket/10751] Add sql_lower_text() to database abstraction layer.
2012-05-31 15:27:32 +02:00
Andreas Fischer
9ab5ad2986 [ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
PHPBB3-10751
2012-05-31 12:15:46 +02:00
Andreas Fischer
643a86504a [ticket/10751] Add sql_lower_text() to database abstraction layer.
On MSSQL, LOWER() can only be called on bounded strings (i.e. varchar or char).
So, in order to use it on a text column, we have to convert it to an
appropriate type. We do so using the SUBSTRING function.

PHPBB3-10751
2012-05-31 12:15:46 +02:00
Andreas Fischer
0261a9acff Merge remote-tracking branch 'naderman/ticket/10908' into develop-olympus
* naderman/ticket/10908:
  [ticket/10908] Document that 0 filesize configuration means limited by PHP
  [ticket/10908] Download files only up to max_upload_filesize if limit is 0
2012-05-31 11:54:58 +02:00
Andreas Fischer
037b95eccc [ticket/10162] Increase maximum length of email address TLD from 6 to 63.
Increase maximum length of email address top level domains from 6 to 63.

PHPBB3-10162
2012-05-30 21:11:17 +02:00