makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-22 11:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
19105 commits 18 branches 192 tags 207 MiB
Commit graph

19105 commits

This branch
This branch
All branches
Author SHA1 Message Date
Oleg Pudeyev
60d9538b14 [ticket/11157] get_captcha_types is an instance method. 
It is specific to a particular captcha factory implementation,
instantiate a captcha factory to invoke it.

PHPBB3-11157
 2012-10-29 14:48:42 -04:00
Oleg Pudeyev
dc8052b5c0 Merge PR #1021 branch 'p/ticket/11156' into develop 
* p/ticket/11156:
  [ticket/11156] Delete "Misc" tab of forum based permissions + move items
 2012-10-29 08:10:56 -04:00
RMcGirr83
a9b59bfe03 [ticket/11156] Delete "Misc" tab of forum based permissions + move items 
PHPBB3-11156
 2012-10-29 08:01:16 -04:00
Joas Schilling
ed602857e6 [feature/soft-delete] Correctly increase topics post counts when posting 
PHPBB3-9567
 2012-10-28 22:37:00 +01:00
Nathan Guse
eddb56f842 [ticket/11103] Working on default notifications on install/update 
PHPBB3-11103
 2012-10-27 12:03:11 -05: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
3d56261621 [feature/soft-delete] Incorrect integer value: '' for column 'post_delete_time' 
PHPBB3-9567
 2012-10-24 18:03:57 +02:00
Joas Schilling
5c6a3d8845 [feature/soft-delete] Revert doc fix from b8c55291 
It should be fixed separately

PHPBB3-9567
 2012-10-24 09:48:22 +02:00
Joas Schilling
b2b5dbed26 [feature/soft-delete] Field 'forum_parents' doesn't have a default value 
PHPBB3-9567
 2012-10-24 00:00:15 +02:00
Joas Schilling
b3d5f2b4e4 [feature/soft-delete] Fix unit tests for delete_posts() 
PHPBB3-9567
 2012-10-23 23:37:25 +02:00
Joas Schilling
3236229188 [feature/soft-delete] Update unit tests to new table structure 
PHPBB3-9567
 2012-10-23 23:35:50 +02:00
Joas Schilling
727759c4d8 [feature/soft-delete] Fix disapproving posts/topics in queue 
PHPBB3-9567
 2012-10-23 22:47:57 +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
Oleg Pudeyev
6bf60ac5cb Merge PR #971 branch 'nickvergessen/ticket/11018' into develop 
* nickvergessen/ticket/11018:
  [ticket/11014] Fix old pagination assignment
  [ticket/11018] Fix several paginations in ACP
  [ticket/11014] Fix IF statements for new template pagination
  [ticket/11014] Fix text for previous/next links in Subsilver2
  [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968
  [ticket/11018] Always display previous/next links if we can display one
  [ticket/11014] Restore template vars for next/previous links
  [ticket/11018] Swap prev/next links on pagination to the old order
  [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same
  [ticket/11018] Fix minor issues with CSS in prosilver
  [ticket/11018] Attempt to fix li.pagination alignment issue
 2012-10-22 17:44:34 -04: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
0a07635329 [feature/soft-delete] Fix convertor and one mcp issue 
PHPBB3-9567
 2012-10-22 17:21:56 +02:00
Joas Schilling
90154db1db [feature/soft-delete] Fix submit_post() topic_replies* usage 
PHPBB3-9567
 2012-10-22 16:38:53 +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
168dd29f24 [feature/soft-delete] Fix sync() and some more functions to use the new fields 
PHPBB3-9567
 2012-10-22 14:22:56 +02:00
Joas Schilling
9945561b4b [feature/soft-delete] Correctly calculate the number of replies everywhere 
PHPBB3-9567
 2012-10-22 11:14:00 +02:00
Joas Schilling
6c39563e9f [feature/soft-delete] Add a function to calculate the actual post/topic count 
PHPBB3-9567
 2012-10-21 23:38:55 +02:00
Joas Schilling
2fafa54107 [feature/soft-delete] Update the new fields while updating the board. 
PHPBB3-9567
 2012-10-21 23:38:29 +02:00
Joas Schilling
9c5482317e [feature/soft-delete] Add new fields for topic/post counts for softdelete 
We can not use the replies vs replies_real anymore, as we need to be able to
determinate whether the posts are unapproved or softdeleted. So we need to add
a new field and there by change the second one for consistency.
We also add the posts_* fields for forums, which are a missing feature.

PHPBB3-9567
 2012-10-21 22:33:28 +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
Nathan Guse
4874226b6e [ticket/11103] Re-add notify method to the UCP preferences 
I've noticed that this is used in other areas still in phpBB, so it should
not be removed.

PHPBB3-11103
 2012-10-20 22:11:41 -05:00
Nathan Guse
bc18e368c3 [ticket/11103] Correct the test case 
Fix a bug that broke it and make sure to set the needed config/auth settings

PHPBB3-11103
 2012-10-20 21:55:58 -05:00
Nathan Guse
7e6f31b51d [ticket/11103] Correct the comments on the notification classes 
PHPBB3-11103
 2012-10-20 21:45:15 -05:00
Nathan Guse
f62e55091a [ticket/11103] PM notifications are not available if users cannot read them 
PHPBB3-11103
 2012-10-20 21:28:37 -05:00
Nathan Guse
de7e17b732 [ticket/11103] Notifications for subscriptions/bookmarks must obey ACP options 
If bookmarks/subscriptions are disabled, they should not be listed in the UCP

PHPBB3-11103
 2012-10-20 21:22:06 -05:00
Nathan Guse
94d682f774 [ticket/11103] Use the full class name as the item_type/method 
This is going to require you recreate the db tables.

PHPBB3-11103
 2012-10-20 20:58:53 -05:00
Nathan Guse
6861af22ee [ticket/11103] Message of no notifications if you have none 
PHPBB3-11103
 2012-10-20 19:19:26 -05:00
Nathan Guse
52bb4a1bd6 [ticket/11103] Do not have empty queue in the interface 
This is not needed as it is not public.

PHPBB3-11103
 2012-10-20 19:00:37 -05:00
Nathan Guse
0ac9079d1c [ticket/11103] Replace $email_template with get_email_template() 
PHPBB3-11103
 2012-10-20 18:55:13 -05:00
Nathan Guse
a93067eb41 [ticket/11103] Create common.js for subsilver2, move added JS code there 
PHPBB3-11103
 2012-10-19 16:00:37 -05:00
Nathan Guse
471ca5e7dc [ticket/11103] Change is_disabled to is_enabled 
If you're following along and would like to update your DB, you can run
the following queries to do so:

ALTER TABLE phpbb_notifications CHANGE `is_disabled` `is_enabled`
TINYINT( 1 ) NOT NULL DEFAULT  '1';

UPDATE `phpbb_notifications` SET is_enabled = 1;

PHPBB3-11103
 2012-10-19 15:50:32 -05:00
Nathan Guse
c7c3ab07c6 [ticket/11103] Brackets on their own lines 
PHPBB3-11103
 2012-10-18 19:24:08 -05:00
Nathan Guse
2c06c2bd36 [ticket/11103] Declare $ for jQuery, check for instance of, newlines at eof 
PHPBB3-11103
 2012-10-18 19:20:54 -05:00
Nathan Guse
f96dac3352 [ticket/11103] Interface docblocks 
PHPBB3-11103
 2012-10-18 19:13:47 -05:00
Nathan Guse
eb07b3ad9c [ticket/11103] Expand class vars and use docblocks for phpBB classes 
PHPBB3-11103
 2012-10-18 18:50:04 -05:00
Nathan Guse
ae670cc87d [ticket/11103] Remove unnecessary comments 
Comments that are not needed because the actions are completely
self-explanatory

PHPBB3-11103
 2012-10-18 18:32:13 -05:00
Nathan Guse
883a961720 [ticket/11103] Use e.preventDefault(); 
PHPBB3-11103
 2012-10-18 18:25:26 -05:00
Nathan Guse
3f27890a5e Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/includes/functions.php
 2012-10-18 18:23:22 -05:00
Andreas Fischer
b3fdf8a046 Merge remote-tracking branch 'EXreaction/ticket/8796' into develop 
* EXreaction/ticket/8796:
  [ticket/8796] Prevent setting post_time greater than time() in markread
  [ticket/8796] Fix a few issues with the previous commits
  [ticket/8796] Mark read links updated to include time() in url
  [ticket/8796] Revert changes to $user->data['lastmark']
  [ticket/8796] Make function markread obey the $post_time argument
 2012-10-18 16:43:46 +02:00
Andreas Fischer
4f3f4a40d6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10848] Move include up.
  [ticket/10848] Add phpbb_ prefix.
  [ticket/10848] Redirect from adm to installer correctly.

Conflicts:
	phpBB/includes/functions.php
 2012-10-18 16:34:59 +02:00
Andreas Fischer
c84268d2f9 Merge remote-tracking branch 'p/ticket/10848' into develop-olympus 
* p/ticket/10848:
  [ticket/10848] Move include up.
  [ticket/10848] Add phpbb_ prefix.
  [ticket/10848] Redirect from adm to installer correctly.
 2012-10-18 16:26:54 +02:00
Oleg Pudeyev
b283df8241 [ticket/10848] Move include up. 
PHPBB3-10848
 2012-10-17 22:35:36 -04:00
Oleg Pudeyev
0a260f80af Merge PR #918 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
 2012-10-17 22:31:35 -04:00