1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-10-24 21:26:24 +02:00
Commit Graph

1016 Commits

Author SHA1 Message Date
Joas Schilling
63f3cd45bb [feature/soft-delete] Add delete information to approve deatils page
PHPBB3-9657
2012-12-18 15:08:05 +01:00
Joas Schilling
4300d06a17 [feature/soft-delete] Add "Restore" to the mcp forum quick moderation
PHPBB3-9657
2012-12-18 14:51:05 +01:00
Joas Schilling
b917e5a4bb [feature/soft-delete] Use new custom template system for AJAX confirm_box
PHPBB3-9657
2012-12-18 13:57:58 +01:00
Joas Schilling
b30a608f35 [feature/soft-delete] Remove the "Deleted by" message when restoring a post
PHPBB3-9567
2012-12-10 21:32:45 +01:00
Joas Schilling
948bfcbe77 Merge remote-tracking branch 'remotes/phpbb/develop' into feature/softdelete-merge-develop
# By Oleg Pudeyev (45) and others
# Via Oleg Pudeyev (42) and others
* remotes/phpbb/develop: (289 commits)
  [ticket/10865] Use code tags for install/database_update.php.
  [ticket/10865] Should have been a slash.
  [ticket/10780] Use L_COLON on LDAP page.
  [ticket/10780] Use L_COLON on search backend ACP pages.
  [ticket/10780] Use L_COLON for "download all attachments".
  [ticket/10780] Use colon from language in ucp_pm_compose.php where possible.
  [ticket/10780] Replace colons in phpBB/adm/style/acp_ext_details.html.
  [ticket/10780] Replace colon usage in adm template output with {L_COLON}
  [ticket/10780] Replace colon usage in template output with {L_COLON}
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus]
  [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)
  [ticket/10172] Show prosilver birthday list even if there are no birthdays.
  [ticket/11050] make all properties protected in all search backends
  [ticket/11050] get_common_words() returns empty array for sphinx
  [ticket/11050] fix tidied search query docblock language
  [ticket/11050] fix min/max length docblock language
  [ticket/11050] multi sentences separated by period in docblocks
  [ticket/11050] fix separated spelling in docblock
  [ticket/11050] fix split words doc block language
  [ticket/11050] remove class word from docblocks
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/install/schemas/mssql_schema.sql
	phpBB/language/en/acp/permissions_phpbb.php
	phpBB/styles/prosilver/template/posting_editor.html
2012-11-10 12:27:19 +01:00
Joas Schilling
03821ad2a2 [feature/soft-delete] Use a beautiful recycle icon for softdeleted topics
PHPBB3-9567
2012-11-10 12:16:45 +01:00
Joas Schilling
6e93fee9d2 [feature/soft-delete] Link to delete_topics module when the topic is deleted
PHPBB3-9567
2012-11-10 11:55:06 +01:00
Andreas Fischer
d87904ae76 [ticket/10780] Use L_COLON for "download all attachments".
PHPBB3-10780
2012-11-10 00:27:37 +01:00
Nathan Guse
6e7e70a18a [ticket/10780] Replace colon usage in template output with {L_COLON}
Replace all the instances (I could find) where the colon is displayed
to the user with {L_COLON} so it can be localised.

PHPBB3-10780
2012-11-10 00:23:03 +01:00
Andreas Fischer
5ae546e02f [ticket/10172] Show prosilver birthday list even if there are no birthdays.
PHPBB3-10172
2012-11-09 17:41:53 +01:00
Joas Schilling
1c584ef8ba [feature/soft-delete] Use JS to display softdeleted/ignored posts
PHPBB3-9567
2012-11-09 11:46:17 +01:00
Oleg Pudeyev
17c43fcd70 Merge PR #717 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10661] Added   to enumerated recipients (prosilver)
2012-11-06 20:34:01 -05:00
Oleg Pudeyev
c08b7385c2 Merge PR #717 branch 'NeoAdonis/ticket/10661' into develop-olympus
* NeoAdonis/ticket/10661:
  [ticket/10661] Added   to enumerated recipients (prosilver)
2012-11-06 20:33:48 -05:00
Oleg Pudeyev
f941a5cc2d Merge PR #858 branch 'callumacrae/ticket/10947' into develop
* callumacrae/ticket/10947:
  [ticket/10947] Fixed quickmod autosubmit functionality.
2012-11-06 12:00:39 -05:00
Joas Schilling
dfcfccf537 [feature/soft-delete] Fix deleting via post editing
PHPBB3-9567
2012-11-03 22:53:54 +01:00
Joas Schilling
bed82bf2bd [feature/soft-delete] Invert the logic on confirm box
Permanent delete is now the checkbox rather then softdelete.

PHPBB3-9567
2012-11-01 22:23:35 +01:00
Joas Schilling
8d05dad634 [feature/soft-delete] Display message when the posts are already soft deleted
PHPBB3-9567
2012-10-31 21:28:06 +01:00
Joas Schilling
18dec1026a [feature/soft-delete] Fix restoring/approving posts with mcp moderation
PHPBB3-9567
2012-10-31 14:09:23 +01:00
Joas Schilling
f0e2d21f8c [feature/soft-delete] Allow to soft delete posts in the MCP quick moderation
PHPBB3-9567
2012-10-30 21:46:04 +01:00
Joas Schilling
4a8d38aab1 [feature/soft-delete] Allow soft deleting/restoring topics via quickmoderation
PHPBB3-9567
2012-10-27 17:12:34 +02:00
Joas Schilling
7b3d794cad [feature/soft-delete] Display post delete reason if one is given
PHPBB3-9567
2012-10-24 19:58:28 +02:00
Joas Schilling
f21fd469bc [feature/soft-delete] Handle soft deleting via Delete Icon
PHPBB3-9567
2012-10-24 19:52:16 +02:00
Joas Schilling
e7a137820b [feature/soft-delete] Use correct language when restoring topics in MCP
PHPBB3-9567
2012-10-21 22:30:20 +02:00
Joas Schilling
ada2d4c91b [ticket/11018] Always display previous/next links if we can display one
PHPBB3-11018
2012-10-17 23:33:19 +02:00
Joas Schilling
a51aa9b47c [ticket/11018] Fix minor issues with CSS in prosilver
PHPBB3-11018
2012-10-17 23:30:56 +02:00
Drae
e76fd6a395 [ticket/11018] Attempt to fix li.pagination alignment issue
This is somewhat kludgy fix for the vertical alignment issue
for pagination contained within a linklist parented li element.
Tested and doesn't seem to impact anything else negatively. May
need further browser testing.

PHPBB3-11018
2012-10-17 23:30:56 +02:00
Joas Schilling
33073fafbe [feature/soft-delete] Add module for soft deleted topics
Unapproved/soft deleted posts are posts, that have a different visibility than
the topic. All others will be hidden from the posts list and can be managed
with the topic modules.

PHPBB3-9567
2012-10-15 15:53:32 +02:00
Joas Schilling
18f77020e5 [feature/soft-delete] Fix several problems in the forum mcp
PHPBB3-9567
2012-10-10 23:10:46 +02:00
Andreas Fischer
a38de9a232 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11135] Full replacement of credit link to https

Conflicts:
	phpBB/install/convertors/convert_phpbb20.php
2012-10-06 06:15:01 +02:00
Vinny
95d02d74ac [ticket/11135] Full replacement of credit link to https
PHPBB3-11135
2012-10-05 21:18:59 -03:00
Andreas Fischer
9a92c45ad3 Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Fix the language changes that were lost previously
2012-09-15 18:31:13 +02:00
Nathan Guse
9e5505933a [ticket/11021] Fix the language changes that were lost previously
Change U_HOME to U_SITE_HOME

PHPBB3-11021
2012-09-15 11:28:58 -05:00
Andreas Fischer
5dc7aba18f Merge remote-tracking branch 'EXreaction/ticket/11021' into develop
* EXreaction/ticket/11021:
  [ticket/11021] Remove unnecessary line spacing in functions.php
  [ticket/11021] Use L_SITE_HOME instead of L_HOME
  [ticket/11021] Better language strings for site home url/text
  [ticket/11021] subsilver2 support
  [ticket/11021] Add the option to specify a Site home URL and text
2012-09-15 17:48:51 +02:00
Nathan Guse
7a47013994 [ticket/11021] Use L_SITE_HOME instead of L_HOME
Check site home url against !== '', not empty

PHPBB3-11021
2012-09-15 10:44:18 -05:00
Nathan Guse
0c56bd45ef [ticket/11021] Better language strings for site home url/text
Correct the logo title to be {L_HOME} if {U_HOME} is used.

Check if the Home text is instead of just equal to false when
outputting it to the template

PHPBB3-11021
2012-09-15 10:28:37 -05:00
Joas Schilling
8a036fa3e4 [feature/soft-delete] Update restoring feature to use ajax if requested.
Also fixes the mcp as a hole:
- displayes a success message
- gives a link to the post, if only one was restored

PHPBB3-9657
2012-08-29 18:42:14 +02:00
Joas Schilling
910f1602cd [feature/soft-delete] Fix displaying of "deleted post" note in viewtopic
PHPBB3-9657
2012-08-29 17:50:14 +02:00
Joas Schilling
9300ff4c6e [feature/soft-delete] Remove imageset/ which was created by merge conflict
We don't have imagesets in 3.1 anymore.

PHPBB3-9657
2012-08-29 17:50:13 +02:00
Josh Woody
1ab41f8dc6 [feature/soft-delete] Fix some small bugs
To wit: using non-existing constant POST_DELETED in posting.php; first test
post was initially unapproved; soft delete checkbox appeared at post time
Links pointing to the wrong place.

PHPBB3-9657
2012-08-29 17:50:12 +02:00
Josh Woody
6739375135 [feature/soft-delete] Add unit tests for the phpbb_visibility class
Add unit tests for the phpbb_visibility class.  Adjust the phpbb_visibility class to pass those unit tests.  The changes are pretty small, actually.

PHPBB3-9657
2012-08-29 17:50:11 +02:00
Josh Woody
fb13ab83e4 [feature/soft-delete] Implement the ability to soft-delete and restore posts
The soft delete feature seems to work.  Tests are pending.  A real icon is pending.  Add the permissions and the interface to soft-delete posts.  Also able to restore posts via the MCP queue

PHPBB3-9657
2012-08-29 17:50:11 +02:00
Andreas Fischer
1128ff1e58 Merge remote-tracking branch 'mvinny/ticket/11065' into develop
* mvinny/ticket/11065:
  [ticket/11065] Close li tag on topic display options at MCP
2012-08-27 01:35:46 +02:00
Vinny
7cf49a810f [ticket/11065] Close li tag on topic display options at MCP
PHPBB3-11065
2012-08-26 20:24:53 -03:00
Andreas Fischer
d0ce637251 Merge remote-tracking branch 'Fyorl/feature/attach-dl' into develop
* Fyorl/feature/attach-dl: (75 commits)
  [feature/attach-dl] Removed the use of some abbreviations
  [feature/attach-dl] Changed $files_added checks
  [feature/attach-dl] Renamed $post_id to $post_msg_id
  [feature/attach-dl] Fixed a comment
  [feature/attach-dl] Optimised an sql query
  [feature/attach-dl] Fixed the logic in an sql statement
  [feature/attch-dl] $forum_id cast to int
  [feature/attach-dl] Fixed $file_added to $files_added
  [feature/attach-dl] Moved definition of $archive_name
  [feature/attach-dl] Swapped the order of an if statement
  [feature/attach-dl] Cast variables to int
  [feature/attach-dl] Added $archive_path
  [feature/attach-dl] Used COMMA_SEPARATOR instead of actual comma
  [feature/attach-dl] Renamed $count to $files_added
  [feature/attach-dl] Removed sprintf() use
  [feature/attach-dl] Removed need for array_keys()
  [feature/attach-dl] Added multiple attachment downloads to PMs
  [feature/attach-dl] Removed reliance on current($row)
  [feature/attach-dl] Renamed to phpbb_download_handle_forum_auth
  [feature/attach-dl] Moved PM authentication handling into own function
  ...
2012-08-26 18:56:09 +02:00
Fyorl
e1a4aa3ea2 [feature/attach-dl] Removed the use of some abbreviations
PHPBB3-11042
2012-08-20 21:52:42 +01:00
Fyorl
39676d513e [feature/attach-dl] Added multiple attachment downloads to PMs
PHPBB3-11042
2012-08-14 13:21:00 +01:00
Dhruv Goel
2ba1cef5b0 [ticket/10943] displays searched query in search result
Search backend displays an additional normalized search query just above
the ignored words.

PHPBB3-10943
2012-08-11 02:26:46 +05:30
Andreas Fischer
4b8eac02f0 Merge remote-tracking branch 'mvinny/ticket/11046' into develop
* mvinny/ticket/11046:
  [ticket/11046] Add border-radius for UCP message colours block
2012-08-08 09:30:57 +02:00
Vinny
e716c8fe83 [ticket/11047] Close TOTAL_MESSAGES at ucp_pm_viewfolder.html
This problem only occurs in prosilver
With the variable unclosed, the language key isnt displayed

PHPBB3-11047
2012-08-07 21:20:18 -03:00
Vinny
321b1f1a39 [ticket/11046] Add border-radius for UCP message colours block
PHPBB3-11046
2012-08-07 20:59:34 -03:00