Commit graph

18033 commits

Author SHA1 Message Date
Nils Adermann
d36795b844 Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into develop-ascraeus
* github-nickvergessen/ticket/12371:
  [ticket/12371] Fix language string
  [ticket/12371] Fix typos in comment
  [ticket/12371] Fix redirect link for approve_post and post_in_queue
  [ticket/12371] Delete the approve_post notification when editing a post
  [ticket/12371] Fix language in comment
  [ticket/12371] Reapprove the post and topic again in tests
  [ticket/12371] Correctly set is_starter when editing first post of the topic
  [ticket/12371] Add functional tests for reapproving
  [ticket/12371] Fix query in mcp_sorting()
  [ticket/12371] Rename disapprove and softdelete tests
  [ticket/12371] We do not group quote notifications anymore
  [ticket/12371] Fix SQL query
  [ticket/11772] Do not send out new topic/post notifications when reapproving
  [ticket/12052] Use different visibility when post was edited
  [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
  [ticket/12371] Do not add unlimited users as responders
  [ticket/12371] Do not update the notification entry unneccessarily
  [ticket/12371] Do not delete post related notifications when a post is deleted
  [ticket/12371] Allow notification types to redirect to a different url
  [ticket/12371] Do not group "quote" notifications
2014-05-02 12:11:09 +02:00
Joas Schilling
5c7199f3dd [ticket/12371] Fix language string
PHPBB3-12371
2014-05-02 11:51:40 +02:00
Joas Schilling
2bb12d0d6f [ticket/12371] Fix typos in comment
PHPBB3-12371
2014-05-02 11:51:20 +02:00
Nathaniel Guse
73b950d2f1 Merge remote-tracking branch 'remotes/Crizz0/ticket/12404' into develop-ascraeus
# By Crizzo
# Via Crizzo
* remotes/Crizz0/ticket/12404:
  [ticket/12404] Splits up the line 18 in subsilver2 into more lines
  [ticket/12404] Changes append/prepend to after/before
  [ticket/12404] Adds two new events and changes some places
  [ticket/12404] Adds a new event before and after the Timezone display
2014-05-01 22:24:31 -05:00
Nathaniel Guse
4f393ad096 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12432' into develop-ascraeus
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12432:
  [ticket/12432] Correcting the assertion
  [ticket/12432] Adding unit test
  [ticket/12432] Migrator should not revert custom functions
2014-05-01 22:16:02 -05:00
Nathaniel Guse
f0036d2ac6 Merge remote-tracking branch 'remotes/PayBas/ticket/12442' into develop-ascraeus
# By PayBas
# Via PayBas
* remotes/PayBas/ticket/12442:
  [ticket/12442] More heading classes
  [ticket/12442] Add CSS classes to important headings
2014-05-01 21:55:45 -05:00
Nathaniel Guse
4f236729e4 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12444' into develop-ascraeus
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12444:
  [ticket/12444] Replacing spaces with tabs
  [ticket/12444] Replace spaces with tabs
  [ticket/12444] Adding regression test
  [ticket/12444] The logs message aren't filled correctly
2014-05-01 21:49:18 -05:00
Nathaniel Guse
5c54cd6a45 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into develop-ascraeus
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12445:
  [ticket/12445] Change the formulation
  [ticket/12445] Disapproved post: the name of the poster should be in logs
2014-05-01 21:46:34 -05:00
Nathaniel Guse
621023e4ae Merge remote-tracking branch 'remotes/prototech/ticket/11339' into develop-ascraeus
# By Cesar G
# Via Cesar G
* remotes/prototech/ticket/11339:
  [ticket/11339] Always clear timeout functions on subsequent AJAX calls
2014-05-01 21:35:40 -05:00
PayBas
5ec67ed248 [ticket/12442] More heading classes
I think that about finishes the most important one

PHPBB3-12442
2014-04-30 09:44:28 +02:00
Joas Schilling
1ba6a45a78 Merge pull request #2362 from n-aleha/ticket/12186a
[ticket/12186] Move PM reports below post reports while installing for ascraeus

* n-aleha/ticket/12186a:
  [ticket/12186] Move PM reports below post reports while installing for ascraeus
  [ticket/12186] Move PM reports below post reports while installing
2014-04-29 21:29:18 +02:00
Andreas Fischer
89391dec08 [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.

PHPBB3-12458
2014-04-29 17:51:21 +02:00
Joas Schilling
23b3667978 [ticket/12456] Add , after the last array element
PHPBB3-12456
2014-04-29 16:24:51 +02:00
Joas Schilling
38f05750b7 [ticket/12456] Fix duplicated empty lines in language files
PHPBB3-12456
2014-04-29 15:44:17 +02:00
Joas Schilling
cec060bb9b [ticket/12456] Fix missing new lines at the end of email templates
PHPBB3-12456
2014-04-29 15:43:55 +02:00
Nicofuma
5c33c20186 [ticket/12445] Change the formulation
PHPBB3-12445
2014-04-28 18:44:56 +02:00
n-aleha
ac8ce42a12 [ticket/12186] Move PM reports below post reports while installing for ascraeus
In mcp, move PM reports below post reports while installing.

PHPBB3-12186
2014-04-27 22:44:41 +03:00
n-aleha
edeeaa03c1 Merge branch 'ticket/12186' into ticket/12186a 2014-04-27 22:29:37 +03:00
Joas Schilling
0b6accf1ac Merge pull request #2359 from Nicofuma/ticket/12097
[ticket/12097] Validate_data() should work with class method

* Nicofuma/ticket/12097:
  [ticket/12097] Bug fix and adding unit test
  [ticket/12097] Validate_data() should work with class method
2014-04-27 20:43:03 +02:00
Joas Schilling
42e29daa1f Merge pull request #2325 from n-aleha/ticket/12406
[ticket/12406] Fix variable description of core.viewtopic_modify_page_ti...

* n-aleha/ticket/12406:
  [ticket/12406] Fix variable description of core.viewtopic_modify_page_title
2014-04-26 18:18:18 +02:00
Nicofuma
6ba61785f8 [ticket/12097] Bug fix and adding unit test
PHPBB3-12097
2014-04-26 15:46:50 +02:00
Nicofuma
a29f3c878a [ticket/12097] Validate_data() should work with class method
https://tracker.phpbb.com/browse/PHPBB3-12097

PHPBB3-12097
2014-04-26 14:10:10 +02:00
Nicofuma
595f831589 [ticket/12432] Migrator should not revert custom functions
https://tracker.phpbb.com/browse/PHPBB3-12432

PHPBB3-12432
2014-04-26 12:15:19 +02:00
Andreas Fischer
9eedd45aac Merge pull request #2345 from Nicofuma/ticket/12199
[ticket/12199] Move deprecated functions to functions_compatibility.php

* Nicofuma/ticket/12199:
  [ticket/12199] Move deprecated functions to functions_compatibility.php
2014-04-26 01:41:50 +02:00
Nicofuma
af827bf2b4 [ticket/12199] Move deprecated functions to functions_compatibility.php
Currently 13 functions are marked as deprecated:
functions.php:
function set_var()
function request_var()
function set_config()
function set_config_count()
function tz_select()
function add_log()

functions_admin:
function cache_moderators()
function update_foes()

functions_compatibility:
function get_user_avatar()
function phpbb_hash()
function phpbb_check_hash()
function phpbb_clean_path()

functions_install:
function get_tables()

8 of them are still used in the core:
add_log              Used in many places (~198 calls)
get_tables           Used in install\install_convert::get_convert_settings
			and functions_install.php\connect_check_db
get_user_avatar      Used in phpbb\user_loader:get_avatar
phpbb_hash           Used in phpbb\db\migration\data\v30x\release_3_0_5_rc1
request_var          Used quite everywhere (~997 calls)
set_config           Used in many places (~129 calls)
set_config_count     Used in a few places (~37 calls)
set_var              Used by phpbb_http_login
			and phpbb\auth\provider\apache::autologin

PHPBB3-12199
2014-04-26 01:25:51 +02:00
Nicofuma
5ec9f40b78 [ticket/12445] Disapproved post: the name of the poster should be in logs
https://tracker.phpbb.com/browse/PHPBB3-12445

PHPBB3-12445
2014-04-26 01:18:34 +02:00
Nicofuma
2991918bac [ticket/12444] The logs message aren't filled correctly
https://tracker.phpbb.com/browse/PHPBB3-12444

PHPBB3-12444
2014-04-25 23:31:31 +02:00
Crizzo
df47cbb254 [ticket/12404] Splits up the line 18 in subsilver2 into more lines
PHPBB3-12404
2014-04-25 22:15:13 +02:00
Cesar G
0553d79808 Merge remote-tracking branch 'Nicofuma/ticket/12418' into develop-ascraeus
* Nicofuma/ticket/12418:
  [ticket/12418] Notice displayed for feed.php
2014-04-25 13:03:23 -07:00
Cesar G
5cc0f50d28 [ticket/11339] Always clear timeout functions on subsequent AJAX calls
PHPBB3-11339
2014-04-25 12:10:46 -07:00
Cesar G
fe768d460d Merge remote-tracking branch 'PayBas/ticket/12437' into develop-ascraeus
* PayBas/ticket/12437:
  [ticket/12437] Clean up redundant "clear" elements & "corners"
2014-04-25 10:10:32 -07:00
Andreas Fischer
d7c3cf4700 Merge pull request #2288 from nickvergessen/ticket/12012
[ticket/12012] Correctly drop default value constraints

* nickvergessen/ticket/12012:
  [ticket/12012] Move property to the top
  [ticket/12012] Move MS SQL server comparison into a method
  [ticket/12012] Fix docs in connection manager
  [ticket/12012] Remove duplicated code (only the $sql are different)
  [ticket/12012] Handle begin and commit transactions in tests
  [ticket/12012] Drop and recreate indexes when removing columns
  [ticket/12012] Add a unit test for removing a column with indexes
  [ticket/12012] Add a unit test for changing the column type
  [ticket/12012] Return SQL statements for index drop/create
  [ticket/12012] Fix tools::mssql_get_existing_indexes() for SQL Server 2000
  [ticket/12012] Drop and recreate indexes when changing a column on MSSQL
  [ticket/12012] Fix query layout
  [ticket/12012] Correctly drop default value constraints on MSSQL
2014-04-25 18:54:40 +02:00
Cesar G
b305ec5611 Merge remote-tracking branch 'PayBas/ticket/12389' into develop-ascraeus
* PayBas/ticket/12389:
  [ticket/12389] Change "PM" to "Message"
  [ticket/12389] Moved PM tools to UCP template
  [ticket/12389] Replace email and print icons.
  [ticket/12389] Change language of email friend
  [ticket/12389] Move print topic & email topic icons to topic tools
2014-04-25 07:33:22 -07:00
PayBas
5109d3a12f [ticket/12442] Add CSS classes to important headings
PHPBB3-12442
2014-04-25 12:56:58 +02:00
Joas Schilling
9c689ef8dd [ticket/11917] Replace space with tabs
PHPBB3-11917
2014-04-25 12:45:48 +02:00
Joas Schilling
7324cb051f [ticket/12371] Fix redirect link for approve_post and post_in_queue
PHPBB3-12371
2014-04-25 11:52:29 +02:00
Joas Schilling
40d91a5d6e [ticket/12371] Delete the approve_post notification when editing a post
We need to delete the initial approve notification,
so we can notify the user again, when his post got reapproved.

PHPBB3-12371
2014-04-25 11:52:28 +02:00
Joas Schilling
465aa9c346 [ticket/12371] Fix language in comment
PHPBB3-12371
2014-04-25 11:52:28 +02:00
Joas Schilling
ddbb521e57 [ticket/12371] Correctly set is_starter when editing first post of the topic
PHPBB3-12371
2014-04-25 11:52:26 +02:00
Joas Schilling
70f5686efb [ticket/12371] Fix query in mcp_sorting()
PHPBB3-12371
2014-04-25 11:52:25 +02:00
Joas Schilling
8375c3f789 [ticket/12371] Fix SQL query
PHPBB3-12371
2014-04-25 11:52:23 +02:00
Joas Schilling
5512e62c3c [ticket/11772] Do not send out new topic/post notifications when reapproving
Only add notifications, if we are not reapproving post
When the topic was already approved, but was edited and
now needs re-approval, we don't want to notify the users again.

PHPBB3-11772
2014-04-25 11:52:22 +02:00
Joas Schilling
2ec9c08a2b [ticket/12052] Use different visibility when post was edited
... and needs to be reapproved.

PHPBB3-12052
2014-04-25 11:52:22 +02:00
Cesar G
dac01e8ca5 [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
PHPBB3-12052
2014-04-25 11:52:21 +02:00
Joas Schilling
37751b51f9 [ticket/12371] Do not add unlimited users as responders
We run into the risc that the data is longer then the character limit
of the table column. However as we trim the users list anyway, we can
also just stop adding them and display "many others" instead of "x others"

PHPBB3-12371
2014-04-25 11:52:20 +02:00
Joas Schilling
418747ed34 [ticket/12371] Do not update the notification entry unneccessarily
When the data did not change, we also don't have to run the query at all.

PHPBB3-12371
2014-04-25 11:52:20 +02:00
Joas Schilling
92db22c882 [ticket/12371] Do not delete post related notifications when a post is deleted
When a post is marked edited and therefor marked as softdeleted/unapproved,
we should not delete the notifications, just like we can't delete the emails.
Links are out there anyway and just keeping the notification is fail save.

If we keep the notification we can just continue to update it when more posts
are added. Also when we delete a post, we don't have to go though the table
and find all related notifications to be able to delete them or even update
them, when they have responders set.

PHPBB3-12371
2014-04-25 11:52:19 +02:00
Joas Schilling
e0fadfb4d6 [ticket/12371] Allow notification types to redirect to a different url
This way we can redirect the post and bookmark notification to the first
unread post in the topic

PHPBB3-12371
2014-04-25 11:52:19 +02:00
Joas Schilling
ed40846590 [ticket/12371] Do not group "quote" notifications
Grouping these notification makes no sense, as the user will not find the
posts he is quoted in, when they are spread over multiple pages

PHPBB3-12371
2014-04-25 11:52:18 +02:00
Joas Schilling
d5ea4906ca [ticket/12012] Move property to the top
PHPBB3-12012
2014-04-24 22:57:35 +02:00