mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-28 18:23:00 +02:00
Code Issues Releases Wiki Activity
35,494 Commits 18 Branches 192 Tags
Commit Graph

222 Commits

Author SHA1 Message Date
Joas Schilling
54012dfb2f [ticket/9657] Initialise variable outside of the loop 
PHPBB3-9657
 2013-07-11 18:04:56 -04:00
Joas Schilling
9aed758c13 [ticket/9657] Use the service instead of the static class 
PHPBB3-9657
 2013-07-11 14:24:07 +02:00
Joas Schilling
e34b8ed094 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission-rebase 
* 'develop' of https://github.com/phpbb/phpbb3: (544 commits)
  [feature/events] Fix improperly named event in documentation
  [feature/events] Fix alphabetization of events
  [feature/events] Put events in alphabetical order
  [feature/events] Make EVENTS.md lowercase
  [ticket/11285] Use more granularity in dependency checks in compress test
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.
  [ticket/10803] Show failure message until user dismisses it
  [ticket/10954] Add missing semi-colon
  [ticket/10954] Make sure to mark subforums unread and add small fixes
  [feature/events] Use ` to escape HTML tags in markdown
  [feature/events] Remove HTML tags from markdown so they don't get parsed
  [ticket/10954] Miscellaneous coding fixes
  [feature/events] Remove extraneous space
  [feature/events] Add markdown template event documentation file
  [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
  [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
  [feature/events] Fix typo in event name
  [ticket/10763] Use self when calling get_extension() in filespec class
  [feature/events] Fix more subsilver2 events
  [feature/events] Fix some subsilver2 events
  ...

Conflicts:
	phpBB/install/database_update.php
	phpBB/posting.php
 2012-12-20 22:51:38 +01:00
Joas Schilling
4498c5aaeb [feature/soft-delete] Split deleting soft-deleted posts from unapproving posts 
PHPBB3-9657
 2012-12-20 19:23:26 +01:00
Joas Schilling
293b070efb [feature/soft-delete] Fix a problem with the "only softdeleted posts" logic 
PHPBB3-9657
 2012-12-18 14:50:00 +01:00
Oleg Pudeyev
da2f0757d7 Merge PR #1140 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8610] Update comment
  [ticket/8610] Do not use requests to submit posts except in posting_test.php
  [ticket/8610] Move posting helpers to separate file
  [ticket/8610] Create helper functions to create topic/post in functional tests
  [ticket/8610] Use phpbb_update_rows_avoiding_duplicates
  [ticket/8610] Revert some funky merging I did from rebase
  [ticket/8610] Add some comments
  [ticket/8610] Update Bookmarks and Subscriptions when splitting topics
  [ticket/8610] Update Bookmarks when merging posts into another topic
  [ticket/8610] Update Bookmarks when forking topics
  [ticket/8610] Update Bookmarks when merging topics
 2012-12-16 16:48:15 -05:00
Nathan Guse
5c614ff624 [ticket/8610] Revert some funky merging I did from rebase 
PHPBB3-8610
 2012-12-13 20:32:43 -06:00
Nathan Guse
71bcc58fee [ticket/8610] Add some comments 
PHPBB3-8610
 2012-12-13 20:23:04 -06:00
Nathaniel Guse
8dd2a151cc [ticket/8610] Update Bookmarks when forking topics 
Update bookmarks to the new topic when forking topics using
the mcp_fork_topic function.

PHPBB3-8610
 2012-12-13 20:19:26 -06:00
Joas Schilling
f77a6eaab5 [feature/soft-delete] Fix the rest of *_approved and the delete_post unit test 
PHPBB3-9567
 2012-11-10 11:24:52 +01:00
Joas Schilling
9c2a58eff4 [feature/soft-delete] Append _approved to *_posts and *_topics column names 
PHPBB3-9567
 2012-11-09 13:37:53 +01:00
Joas Schilling
8512543cf4 [feature/soft-delete] Use request object instead of direct access 
PHPBB3-9567
 2012-11-09 12:32:27 +01:00
Joas Schilling
6999d776d4 [feature/soft-delete] Correctly manage soft deleting via MCP 
PHPBB3-9567
 2012-11-02 14:23:17 +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
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
43e6b3a921 [feature/soft-delete] Fix some more topic/post count handling 
Only disapproving in queue is missing.

PHPBB3-9567
 2012-10-23 16:59:33 +02:00
Joas Schilling
fec72c4b78 [feature/soft-delete] Fix mcp_move_topic() topic/post count handling 
PHPBB3-9567
 2012-10-23 12:52:31 +02:00
Joas Schilling
5925a17894 [feature/soft-delete] Fix some more uses of topic_replies_real 
PHPBB3-9567
 2012-10-22 14:55:10 +02:00
Joas Schilling
1935568c3e [feature/soft-delete] Fix typo in column name topic_visibility 
PHPBB3-9657
 2012-08-29 17:50:13 +02:00
Josh Woody
b8c55291ed [feature/soft-delete] Lay the groundwork for a soft-delete feature 
So far, I've added no new functionality.  The biggest change here is adjusting the DB column names to "visibility" rather than "approved".  Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :)

PHPBB3-9657
 2012-08-29 17:49:37 +02:00
Dhruv
7c406e1e81 [ticket/11052] update search backend constructor everywhere 
PHPBB3-11052
 2012-08-15 22:05:26 +05:30
Vjacheslav Trushkin
1d72a47ea6 [ticket/10637] Leftovers from implementation of extensions in mcp_main 
Replacing code in includes/mcp/mcp_main.php that was missed in ticket 10323

PHPBB3-10637
 2012-02-09 22:13:13 +02:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2011-12-31 13:32:52 +00:00
Nils Adermann
95fed7806d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10377] Do not allow all moderators to sticky posts
 2011-10-14 17:56:46 +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
Oleg Pudeyev
8c5a9979ad Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10109] Fix "Undefined Index" errors when copying a topic.
 2011-04-17 11:09:17 -04:00
Joas Schilling
a72fe8acaf [ticket/10109] Fix "Undefined Index" errors when copying a topic. 
PHPBB3-10109
 2011-04-07 14:53:47 +02:00
Chris Smith
b73d45ffc8 [ticket/7972] Copying topics in the MCP now indexes the new topic. 
PHPBB3-7972
 2010-08-20 13:59:21 -04:00
Josh Woody
ad14664a3a - Bug #56255 - Moving topics to a forum where you are on queue 
- Allow some error handling in compress class by returning false if file does not exist. 

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10427 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-18 16:41:21 +00:00
Meik Sievertsen
d657c05ed5 Fix Bug #52125, regression from r9678 for Bug #46225 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10196 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-09-29 14:51:58 +00:00
Meik Sievertsen
2958890439 Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9905 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-01 12:28:50 +00:00
Chris Smith
21094ac790 Copy poll options properly when copying topic. #39065 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9797 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-07-19 11:34:01 +00:00
Meik Sievertsen
0f085848a6 Correct calculation of source/target forum statistics if mass moving topics with global announcements (Bug #44545) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9491 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-04-28 09:35:36 +00:00
Meik Sievertsen
e461162847 Fix race condition for updating post/topic/etc. counter. (reported by BartVB) 
please do not try such fixes at home - the correct solution would be to create a second config table with integer columns. ;)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9398 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-03-19 17:01:59 +00:00
Jim Wigginton
2e50df9e1a Fixed bug #'ers 41295, 41385, 41955, 41705 and 41985 
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9342 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-02-26 23:46:46 +00:00
Chris Smith
6cfc56a650 Better return links when deleting topics through the MCP. #34655 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8950 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-27 10:59:25 +00:00
Chris Smith
7e0ae65c68 * Use a distinct log message for shadow topic deletions to differentiate between normal topic deletions. #34635 
* Fix a small typo in r8942


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8945 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-26 18:29:20 +00:00
Chris Smith
c0f6538cf6 Duplicate log messages for deleting a topic ('LOG_TOPIC_DELETED' has been deprecated in favour of 'LOG_DELETE_TOPIC'). 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8942 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-26 12:42:47 +00:00
Chris Smith
687da94982 Log the forum name that topics are moved into. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8908 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-23 12:01:26 +00:00
Meik Sievertsen
fbbc5ef04f Do not display reported topic icon for shadow topics. (Bug #13970) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8853 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-16 12:50:11 +00:00
Henry Sudhof
6f7dbcde88 #27325 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8631 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-09 12:36:06 +00:00
Meik Sievertsen
9640f5b108 remove the _f_ portion from redirect urls now they no longer exist 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8520 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-04-21 13:17:30 +00:00
Meik Sievertsen
7de5bb3498 dumdidum... sorry. ;) 
git-svn-id: file:///svn/phpbb/trunk@8147 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-05 14:36:34 +00:00
Henry Sudhof
72f2e11091 #14416 - thanks primehalo 
git-svn-id: file:///svn/phpbb/trunk@8085 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-09-11 12:03:36 +00:00
Henry Sudhof
98f885ebc3 err, maybe don't display it quite so often. 
git-svn-id: file:///svn/phpbb/trunk@7970 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-28 13:56:23 +00:00
Henry Sudhof
465c15f084 #11611 
git-svn-id: file:///svn/phpbb/trunk@7969 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-28 12:15:14 +00:00
Meik Sievertsen
acf0c0ddeb err, forgot to commit 
git-svn-id: file:///svn/phpbb/trunk@7961 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-27 17:33:27 +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