1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-23 11:28:33 +01:00

117 Commits

Author SHA1 Message Date
Joas Schilling
23b3667978 [ticket/12456] Add , after the last array element
PHPBB3-12456
2014-04-29 16:24:51 +02:00
Joas Schilling
d43645adfa [ticket/9657] Fix english language :(
PHPBB3-9657
2013-07-11 22:46:34 -04:00
Joas Schilling
bdb7ec0ceb Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission
* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  ...

Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
2013-07-11 11:41:48 +02:00
asperous
9f545a7f6b [ticket/9975] Moved a few E_USER_ERROR errors to /language
There were a few error messages that a user could experience that would, previously, be without any the ability to be localized. There are some more E_USER_ERRORs that I did not change to a constant, for example the error message that is displayed if there aren't any folders in /language.

PHPBB3-9975
2013-04-23 09:55:36 -07:00
Joas Schilling
8b24ccb894 [ticket/9657] Fix some language problems and inconsistences
PHPBB3-9657
2013-03-11 12:13:59 +01:00
Joas Schilling
45d1558b7e [feature/soft-delete] Add missing language strings
PHPBB3-9657
2012-12-18 15:41:36 +01:00
Joas Schilling
269330749f [feature/soft-delete] Fix naming of soft delete (we wont use that in the UI)
PHPBB3-9567
2012-11-03 23:37:35 +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
e7a137820b [feature/soft-delete] Use correct language when restoring topics in MCP
PHPBB3-9567
2012-10-21 22:30:20 +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
b1ce8a8c13 [feature/soft-delete] Add checkbox to restoring posts like on approve
PHPBB3-9567
2012-10-15 15:19:32 +02:00
Joas Schilling
7c2cc9cfef [feature/soft-delete] Turn restore_post() into a method and add the docs
PHPBB3-9567
2012-10-15 14:02:16 +02: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
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
Senky
3741e99aab [ticket/10161] all "e-mail" strings in language files changed to "email"
according to Oleg's comment:
email is preferred by RFCs and probably the way of the future

PHPBB3-10161
2012-04-15 20:10:51 +02:00
David King
26a999c83c Merge remote-tracking branch 'brunoais/ticket/10705' into develop 2012-03-31 13:49:49 -04:00
Bruno Ais
28fac32742 [ticket/10705] Change WARNINGS_ZERO_TOTAL in en language
Located the WARNINGS_ZERO_TOTAL in the language and replaced it with
NO_WARNINGS

PHPBB3-10705
2012-03-29 15:51:06 +01:00
Joas Schilling
33dce916e2 [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
PHPBB3-10690
2012-03-14 22:22:22 +01:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Joas Schilling
3788326d71 [ticket/10345] Remove more useless 0-cases
PHPBB3-10345
2011-11-25 15:10:51 -05:00
Joas Schilling
88ae40a4b1 [ticket/10345] Make use of the plural function in some basic places
PHPBB3-10345
2011-11-25 15:10:44 -05:00
Andreas Fischer
09776d2302 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
2011-05-23 23:56:55 +02:00
Oleg Pudeyev
c651948cb3 [ticket/9630] Make language for moving posts clearer in quickmod/mcp.
PHPBB3-9630
2011-05-02 23:54:35 -04:00
Joas Schilling
283ad368eb Bug #54745 - Fix language string for PM-Reports refering to post-data.
Authorised by: jelly_doughnut

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10455 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-26 14:06:00 +00:00
Chris Smith
8362c3b6b7 Missing PM report language entries added. #55095
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10320 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-12-11 21:01:31 +00:00
Nils Adermann
801ac58bcf I manage to get a one line commit wrong ...
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9854 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-25 18:06:25 +00:00
Nils Adermann
5d0616af0f missing lang var for PM reports
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9853 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-25 18:01:15 +00:00
Nils Adermann
a2f7072196 missing language variable
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9832 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-22 15:45:46 +00:00
Nils Adermann
00e81e704d fix mcp sorting for pm_reports, and some minor language changes
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9830 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-22 13:33:54 +00:00
Nils Adermann
6e4a7c03d1 Users can report PMs to moderators which are then visible in a new MCP module
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9814 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-07-21 20:59:11 +00:00
Chris Smith
b9cd8f2966 Add links to the post and forum when viewing a report from the MCP. #33795, #33805
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8940 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-26 11:25:04 +00:00
Chris Smith
40ae0658f0 Adjust language key SPLIT_AFTER to make the action clearer.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8926 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-09-23 21:39:59 +00:00
Meik Sievertsen
325ff1fa1b One commit for those fixes having a very tiny impact (mostly only whitespaces or forgotten spans, etc.)
Although i somehow mistakingly got #20445 and #15249 into it. :/

Removing s_watching_img from watch_topic_forum() function (Bug #20445)
Changing order for post review if more than one post affected (Bug #15249)
Language typos/fixes (Bug #20425, #15719, #15429, #14669, #13479)
Style/Template fixes (Bug #20065, #19405, #19205, #15028, #14934, #14821, #14752, #14497, #13707, #14738)
Tiny code fixes (Bug #20165, #20025, #19795, #14804)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8350 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-01-30 16:01:15 +00:00
Meik Sievertsen
7d84cac202 #14621
#14596
info file changes


git-svn-id: file:///svn/phpbb/trunk@8135 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-10-04 15:08:22 +00:00
Meik Sievertsen
529980ab79 language fixes and template adjustements for the whois facility...
git-svn-id: file:///svn/phpbb/trunk@8093 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-09-20 15:36:00 +00:00
Meik Sievertsen
75a5162945 again, a lot of bug fixes
git-svn-id: file:///svn/phpbb/trunk@7909 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-07-19 20:38:38 +00:00
Meik Sievertsen
455536773f ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
git-svn-id: file:///svn/phpbb/trunk@7736 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-09 11:11:20 +00:00
Henry Sudhof
ed17471e0c Changing the stance we take towards flash. (DelvarWorld, NeoThermic)
fixing a few smaller bugs.

#12007
#12003


git-svn-id: file:///svn/phpbb/trunk@7715 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-06-06 14:00:52 +00:00
Meik Sievertsen
60000cec97 Some fixes...
@translators: please note the split of SEND_EMAIL ;)


git-svn-id: file:///svn/phpbb/trunk@7672 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-24 16:18:04 +00:00
David M
3899e337e6 #11255
#11259
#11291
#11335
#11457
#11473
#11475
#11511
#11523
#11527


git-svn-id: file:///svn/phpbb/trunk@7663 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-22 21:32:26 +00:00
Meik Sievertsen
c1a738ce5f punctuation changes in language files
git-svn-id: file:///svn/phpbb/trunk@7524 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-10 15:31:35 +00:00
Meik Sievertsen
f7b51337c5 some language-specific adjustements
fix prune users (adding the list of users to the confirmation page)
tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element)


git-svn-id: file:///svn/phpbb/trunk@7455 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-05-03 14:29:22 +00:00
Nils Adermann
dc747b8d99 - * wildcard in a search query should cause \w+ in highlighting, not \w* [Bug #10031]
- display a warning that the search index is not converted from phpBB2 to phpBB3 [Bug #9761]
- forgot to add : to reg_name when deleting userinfo from the url regex constructor [Bug #9868]
- magic urls should work after ">"
- fixed sorting in mcp_reports/mcp_queue [Bug #9882]
- display a "Report has already been closed" message, if a post is accessed in mcp_reports which has a closed report (might occur if two moderators want to process it at the same time)
- convertor: old forum path should have the trailing slash removed
- subsilver2 will come bundled with phpBB3, but it will not be installed by default (if admins want to use it they can, but it's not a default option for users)
- prosilver was missing the topic-only mode in mcp_reports/mcp_queue


git-svn-id: file:///svn/phpbb/trunk@7428 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-29 20:56:46 +00:00
Meik Sievertsen
fc295f5f0e checking in some fixes. ;) Most of them are really minor, including:
- correctly enter report notification into db
- fix double-quote pm issue


git-svn-id: file:///svn/phpbb/trunk@7409 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-26 18:41:26 +00:00
Meik Sievertsen
550f270a00 #10005, #10003, #10001, #9999, #9945, #9965, #9909, #9906, #9877, #9861, #9831, #9830, #9815, #9665, #9624
prosilver adjustments for important announcements in ucp - #9995
MCP fixes for user notes/warnings - #9981
Preserving imageset values on save/edit
find a member link for Mass PM's - #9925
syndicate window.onload events where necessary - #9878
Duplicate topics in forums with announcements - #9840
Email template for forced re-activation - #9808
Topic pagination adjustment - #9763
Changed compose message layout in UCP - #9706, #9702
Fixed inline attachment font size (hopefully)


git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-22 15:27:40 +00:00
Nils Adermann
c76a2cdfe8 - viewtopic/forum search boxes should also use search config option and u_search permission [Bug #9850]
- mcp_reports was still using some of the mcp_queue post_id logic, changed enough to report_id logic to make it work properly now. I hope I didn't miss any external places referring to mcp_reports which send it a post_id_list. I really wonder whether people don't test the MCP at all? Good that I noticed this myself when fixing an incorrect language string (No reports selected) message [Bug #9741]
- forgot to check in the changed mcp/info file for mcp_warn with global m_warn option
- mcp_post.html was missing a submit button for changing the poster in prosilver [Bug #9771]
- language variables in javascript in templates should use LA_ not L_ for proper escaping of single quotes


git-svn-id: file:///svn/phpbb/trunk@7361 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-15 21:40:25 +00:00
Nils Adermann
fb24543144 - m_warn is no longer a local moderation permission
- magic urls should properly use html entities
- speed up posting on big boards, MAX(post_id) query can be simplified a lot in certain cases
- user IP list should be labelled with "Other users" [Bug #9707]


git-svn-id: file:///svn/phpbb/trunk@7355 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-15 10:59:26 +00:00
Meik Sievertsen
e70cea16b9 checking in some fixes... also added "previous/next pm in history" links to prosilvers private message view; dhn, you may want to have a look at the placement. :)
git-svn-id: file:///svn/phpbb/trunk@7322 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-10 20:50:14 +00:00
Jonathan Stanley
105f75016c Dur?
git-svn-id: file:///svn/phpbb/trunk@7269 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-02 21:23:24 +00:00
Nils Adermann
e6dab93a02 - urlencoded usernames don't need htmlspecialchars [Bug #8794]
- fulltext_mysql still used synonyms/ignore words [Bug #5405]
- merge tool extend to allow merging complete topics via quickmod and mcp_forum [Bug #5293]
- renamed "fork" to "copy" (was already called "copy" in some places)
- Copied posts should not increase post count, and should also not decrease it on deletion [Bug #8072]


git-svn-id: file:///svn/phpbb/trunk@7261 89ea8834-ac86-4346-8a33-228a782c2dd0
2007-04-01 22:15:59 +00:00