1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-13 19:15:20 +02:00

149 Commits

Author SHA1 Message Date
Andreas Fischer
56ee5973bc Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11864] Do not call exit after display_progress_bar in acp_forums
2013-09-26 16:01:01 +02:00
Marc Alexander
c654e9d247 [ticket/11864] Do not call exit after display_progress_bar in acp_forums
The progress bar is called with the method display_progress_bar() in the
acp_forums files. This method then call adm_page_footer() which also calls
exit_handler(). Therefore, the exit; in acp_forums after
$this->display_progress_bar() is obsolete and shouldn't exist in the first
place.

PHPBB3-11864
2013-09-25 13:35:08 +02:00
Nils Adermann
b95fdacdd3 [ticket/11700] Move all recent code to namespaces
PHPBB3-11700
2013-09-16 00:25:27 +02:00
Joas Schilling
42c062cedf Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/softdelete-1-permission
* 'develop' of https://github.com/phpbb/phpbb3: (480 commits)
  [ticket/6723] Show info that message has been deleted before delivery
  [ticket/11385] Fix issue with migration module tool not getting extension module info
  [ticket/11386] Fix failing tests from constructor changes
  [ticket/11386] Fix circular reference error & serialize error
  [ticket/11386] Remove tests that check if finder cache is working
  [ticket/11386] Forgot to get the migration classes
  [ticket/11386] Update tests with new constructors for ext.manager/migrator
  [ticket/11386] Use finder to find migration files
  [ticket/11363] Fix to make get_module_infos get from all extensions
  [ticket/11381] Make finder able to search in all available extensions
  [ticket/11103] Revert whitespace changes
  [ticket/11103] Few more minor language things
  [ticket/11103] Don't call generate_board_url many times
  [ticket/11103] Case time in queries as an int
  [ticket/11103] Fix effectively installed check
  [ticket/11103] Remove padding from notifications for now.
  [ticket/11363] Fix a couple bugs and throw errors if the file not found
  [ticket/11372] Migrator should only check if effectively installed if not
  [ticket/11363] Load module info files for extensions too
  [ticket/11103] Notifications Migration file
  ...

Conflicts:
	phpBB/includes/functions_posting.php
	phpBB/includes/mcp/mcp_queue.php
	phpBB/includes/search/fulltext_mysql.php
	phpBB/includes/search/fulltext_native.php
	phpBB/includes/search/fulltext_postgres.php
	phpBB/includes/search/fulltext_sphinx.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ajax.js
2013-03-03 20:06:52 +01:00
Oleg Pudeyev
5c496674f6 [ticket/10758] Dependency inject parameters into cache_moderators.
Also add phpbb prefix since the signature is being changed anyway.

PHPBB3-10758
2012-12-15 16:50:28 -05: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
eb9c39971b [feature/soft-delete] Fix forum syncing in ACP and deleting posts
PHPBB3-9567
2012-10-22 17:34:37 +02:00
Joas Schilling
9441774288 [feature/soft-delete] Topic visibility is already synced by sync('topic')
PHPBB3-9567
2012-10-09 11:55:31 +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
Joas Schilling
90ed6e734d [feature/php-events] Fix acp_manage_forums_update_data_before and is_new_forum
PHPBB3-9550
2012-08-18 20:32:58 +02:00
Joas Schilling
b32d5a3edf [feature/php-events] Fix core.acp_manage_forums_update_data_after vars
PHPBB3-9550
2012-08-18 20:25:11 +02:00
Joas Schilling
cdcadf72c4 [feature/php-events] Add event core.acp_manage_forums_move_content
PHPBB3-9550
2012-08-08 13:22:21 +02:00
Joas Schilling
43d17b2337 [feature/php-events] Fix doc and naming of core.acp_manage_forums_move_children
PHPBB3-9550
2012-08-08 13:22:20 +02:00
Joas Schilling
70c90bea4f [feature/php-events] Fix doc and naming of acp_manage_forums_update_data_after
PHPBB3-9550
2012-08-08 13:22:20 +02:00
Joas Schilling
cfd5fcbe26 [feature/php-events] Add new event core.acp_manage_forums_update_data_before
Allows you to remove data from forum_data_sql before we update/create the forum

PHPBB3-9550
2012-08-08 13:01:39 +02:00
Joas Schilling
caf76b4ceb [feature/php-events] Fix naming and doc of core.acp_manage_forums_validate_data
PHPBB3-9550
2012-08-08 12:50:47 +02:00
Joas Schilling
3beda0cbab [feature/php-events] Fix naming and doc of core.acp_manage_forums_display_form
PHPBB3-9550
2012-08-08 12:44:28 +02:00
Joas Schilling
38ba09e707 [feature/php-events] Fix naming and doc of acp_manage_forums_initialise_data
PHPBB3-9550
2012-08-08 12:38:23 +02:00
Joas Schilling
e3a9bf0376 [feature/php-events] Fix doc and naming of core.acp_forums_request_forum_data
PHPBB3-9550
2012-08-08 12:35:26 +02:00
Joas Schilling
b1582ece91 [feature/php-events] Proper name for request forum data to avoid confusion
PHPBB3-9550
2012-08-01 10:18:52 +02:00
Joas Schilling
2e5a7ae4dd [feature/php-events] Add additional events to acp_forums.php
PHPBB3-9550
2012-08-01 10:18:52 +02:00
Joas Schilling
0f78b4699a [feature/php-events] Replace core.acp_forums_add_forum_data
Add missing global $phpbb_dispatcher, add $action and name the event better

PHPBB3-9550
2012-08-01 10:18:49 +02:00
Michael Cullum
3f1b4e83ae [feature/events] Removing the third trigger_event parameter
PHPBB3-9550
2012-08-01 10:18:44 +02:00
Michael Cullum
8af7d225ef [feature/events] Change to use the new method of adding events
PHPBB3-9550
2012-08-01 10:18:44 +02:00
Michael Cullum
19a3164e80 [feature/events] Fixing core.acp_forums_add_forum_data
PHPBB3-9550
2012-08-01 10:18:38 +02:00
Michael Cullum
eb7a04d324 [feature/events] Add core.acp_foruns_add_forum_data ledge
PHPBB3-9550
2012-08-01 10:18:38 +02:00
Callum Macrae
7a933bdb5a [ticket/10328] Renamed the JSON class, also now using autoloading.
It is no longer static, and uses autoloading. It has also been renamed
from JSON to phpbb_json_response.

PHPBB3-10328
2012-03-31 02:09:14 +02:00
Callum Macrae
dce38f44de [ticket/10328] Added a JSON class.
The JSON class adds a consistent way to send JSON to the client, making
it perfect for AJAX (jQuery automatically parses it).

PHPBB3-10328
2012-03-31 02:09:13 +02:00
Callum Macrae
94172b54dd [ticket/10271] Changed AJAX functions to $request->is_ajax().
PHPBB3-10271
2012-03-31 02:09:13 +02:00
Callum Macrae
bb7a03f738 [ticket/10281] AJAXified reordering forums in the ACP.
PHPBB3-10281
2012-03-31 02:09:12 +02:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Igor Wiedler
ac8db51c47 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10190] Do not show hint about permissions when editing forum settings.
2011-11-13 16:09:12 +01:00
Andreas Fischer
fa23def774 [ticket/10190] Do not show hint about permissions when editing forum settings.
PHPBB3-10190
2011-10-29 00:16:30 +02:00
Andreas Fischer
9fbe4e34ab Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10400] Allow forum name to be '0'
2011-10-13 17:05:53 +02:00
Joas Schilling
cacb9f2ec5 [ticket/10400] Allow forum name to be '0'
PHPBB3-10400
2011-10-07 09:44:31 +02:00
Josh Woody
68744484c8 Merge branch 'ticket/bantu/9167' into develop-olympus
* ticket/bantu/9167:
  [ticket/9167] Detect and remove any dead left over shadow topics on update.
  [ticket/9167] Remove shadow topics from remaining forums when deleting a forum

Conflicts:
	phpBB/install/database_update.php
2010-08-19 10:09:32 -05:00
Joas Schilling
0db657381b [ticket/9697] Backlink broken when the select parent forum does not exist.
PHPBB3-9697
2010-07-02 12:28:06 +02:00
Andreas Fischer
30891ffb46 [ticket/9167] Remove shadow topics from remaining forums when deleting a forum
including posts.

The function delete_topic_shadows() had to be reimplemented.
It was there but it was completly broken and hasn't been used at all.

PHPBB3-9167
2010-06-11 21:50:08 +02:00
Joas Schilling
4746a60d22 [ticket/9094] Hide "Copy permissions" message, when permissions were copied.
When creating a forum, you afterwards read "Forum created successfully. Now you are able to set permissions for this forum.", also when you already copied the permissions from another forum.

PHPBB3-9094
2010-05-27 15:17:03 +02:00
Nils Adermann
b308cfe5ea Merge branch 'ticket/bantu/9547' into develop-olympus
* ticket/bantu/9547:
  [ticket/9547] Use separate constants for display/enable active topics.
2010-05-16 18:58:15 +02:00
Andreas Fischer
d555e83b80 [ticket/9547] Use separate constants for display/enable active topics.
Split S_DISPLAY_ACTIVE_TOPICS into S_DISPLAY_ACTIVE_TOPICS and
S_ENABLE_ACTIVE_TOPICS so we have correct default values when changing the
forum type.

PHPBB3-9547
2010-05-16 18:54:48 +02:00
Josh Woody
e6b9178c44 [ticket/9510] Unable to copy permissions from and to forums you cannot see
This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010).  It also rolls back the changes from branch "bug/58415", which are no longer needed.

PHPBB3-9510
2010-05-16 18:20:54 +02:00
Andreas Fischer
9ce0873bd1 [ticket/9514] Correctly delete big datasets when deleting a forum including topics/posts on non-MySQL databases.
PHPBB3-9514
2010-05-14 02:10:50 +02:00
Josh Woody
144effd74c Allow setting parent forums regardless of permission settings. (Bug #58415) 2010-03-17 10:04:07 -05:00
Meik Sievertsen
b39f618001 Fix Bug #53435 - unneccessary error on forum creation screen, actually, this code is no longer even executed since RC4
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10258 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-11-08 11:17:32 +00:00
Meik Sievertsen
6d1c40f6e6 Fix Bug #53175 (forum_options cleared if editing forum) - regression from r10024
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10233 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-25 09:03:05 +00:00
Meik Sievertsen
80bc2d8dc9 Disable copy forum permissions screen in forums creation/update workflow - also fixes Bug #52035
We will revisit this one later

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10198 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-30 14:51:43 +00:00
Andreas Fischer
66038cde5b Fix bug #51905 - Only check whether forum image exists if forum image is specified.
Related to bug #39005.
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10184 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-24 12:37:39 +00:00
Meik Sievertsen
0e130c107b forgot to add display active flag to forum data in r10169 for bug #19135
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10171 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-20 17:52:06 +00:00