makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-20 18:28:55 +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
00d8f944da [ticket/11285] Use more granularity in dependency checks in compress test 
Some of the tests can be run without zlib or bz2 extensions present.

PHPBB3-11285
 2012-12-20 13:20:05 -05:00
Joas Schilling
24e1881ea1 [feature/soft-delete] Split up on the initial switch instead of a second one 
Also fixing some documentation issues

PHPBB3-9657
 2012-12-20 15:23:29 +01:00
Andreas Fischer
3fefa5bb13 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.

Conflicts:
	phpBB/posting.php
 2012-12-20 14:28:01 +01:00
Andreas Fischer
dabe88bb3a Merge remote-tracking branch 'p/ticket/10880' into develop-olympus 
* p/ticket/10880:
  [ticket/10880] The m_approve permisson no longer implies f_noapprove.
 2012-12-20 14:26:46 +01:00
Oleg Pudeyev
5c81728983 [ticket/10758] Add deprecated tags. 
PHPBB3-10758
 2012-12-20 05:10:57 -05:00
Oleg Pudeyev
e50f69187f [ticket/11037] Eliminate global $db usage in cache drivers. 
The only time $db is needed in cache drivers is to navigate the
result set in sql_save. Pass it as a parameter in that function.

PHPBB3-11037
 2012-12-20 04:35:30 -05:00
Oleg Pudeyev
69e373c1af [ticket/10758] Add compat functions. 
PHPBB3-10758
 2012-12-20 00:00:15 -05:00
Andreas Fischer
917a2fa9a6 [ticket/10880] The m_approve permisson no longer implies f_noapprove. 
PHPBB3-10880
 2012-12-19 22:02:39 -05:00
Oleg Pudeyev
f9cee47003 [ticket/10758] Admin is not working yet. 
PHPBB3-10758
 2012-12-19 21:50:35 -05:00
Oleg Pudeyev
3327a4676c [ticket/10758] Test moderator and admin permissions. 
PHPBB3-10758
 2012-12-19 21:50:35 -05:00
Oleg Pudeyev
ac3e69cb08 [ticket/10758] Check that acl was changed in the test. 
PHPBB3-10758
 2012-12-19 21:50:35 -05:00
Oleg Pudeyev
9a1df948c6 [ticket/10758] Extract obtain_user_data for the benefit of tests. 
PHPBB3-10758
 2012-12-19 21:50:35 -05:00
Oleg Pudeyev
3701d83ecb Merge PR #1133 branch 'marc1706/ticket/10954' into develop 
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/10954:
  [ticket/10954] Add missing semi-colon
  [ticket/10954] Make sure to mark subforums unread and add small fixes
  [ticket/10954] Miscellaneous coding fixes
  [ticket/10954] Use quotes in attribute selectors and reduce use of each
  [ticket/10954] Change currentObject to $this for consistency
  [ticket/10954] Use function for closing alert popup
  [ticket/10954] Simplify marking forums read and fix topic marking
  [ticket/10954] Join array of class names instead of creating a string
  [ticket/10954] Fix coding guidelines infractions
  [ticket/10954] Change behavior of marking topics/forums
  [ticket/10954] Fix scope of current_object
  [ticket/10954] Only call $(this) once and reduce number of DOM traversals
  [ticket/10954] Modify is_ajax check for consistency
  [ticket/10954] Mark topics read without popup
  [ticket/10954] Mark forums read without popup or page refresh
 2012-12-19 21:05:33 -05:00
Joas Schilling
f0c780a453 [ticket/11278] Fix not running queries from db tools in database update 
The db_tools class is running in return mode, which means that the queries
are not run, but just returned. Therefor the broken tables were not
removed from the database.

PHPBB3-11278
 2012-12-19 13:38:16 +01:00
Joas Schilling
6028068841 [feature/soft-delete] Actually run schema changing queries in database update 
$db_tools is running in return statement mode, so all queries are not
actually run, but just created.

PHPBB3-9657
 2012-12-19 12:33:00 +01:00
Joas Schilling
73e59ac544 [feature/soft-delete] Make update file runnable again 
This should not really be a problem, as if the column does not exist, all
topics should be localised before anyway. If not, the user created an
old global announcement, after updating it.

PHPBB3-9657
 2012-12-19 11:47:08 +01:00
Oleg Pudeyev
e444f5bf2a Merge PR #1150 branch 'marc1706/ticket/10803' into develop 
# By Marc Alexander
# Via Marc Alexander
* marc1706/ticket/10803:
  [ticket/10803] Show failure message until user dismisses it
 2012-12-18 18:48:51 -05:00
Marc Alexander
693778fa07 [ticket/10803] Show failure message until user dismisses it 
PHPBB3-10803
 2012-12-18 23:42:14 +01:00
Marc Alexander
daf9de689a [ticket/10954] Add missing semi-colon 
PHPBB3-10954
 2012-12-18 16:24:58 +01:00
Joas Schilling
45d1558b7e [feature/soft-delete] Add missing language strings 
PHPBB3-9657
 2012-12-18 15:41:36 +01:00
Joas Schilling
6435b481c5 [feature/soft-delete] Fix a problem with "delete topics" in mcp 
PHPBB3-9657
 2012-12-18 15:32:13 +01:00
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
293b070efb [feature/soft-delete] Fix a problem with the "only softdeleted posts" logic 
PHPBB3-9657
 2012-12-18 14:50:00 +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
0d7f61dc7a [ticket/11166] Use provided custom templates on AJAX confirm box 
PHPBB3-11166
 2012-12-18 13:50:56 +01:00
Oleg Pudeyev
3af5531d0d Merge PR #1147 branch 'marc1706/ticket/10763' into develop 
* marc1706/ticket/10763:
  [ticket/10763] Use self when calling get_extension() in filespec class
  [ticket/10763] Make functions for remote avatars static
 2012-12-18 04:11:56 -05:00
Marc Alexander
55b5336b02 [ticket/10954] Make sure to mark subforums unread and add small fixes 
PHPBB3-10954
 2012-12-18 09:55:22 +01:00
David King
a740ae9c22 [feature/events] Use ` to escape HTML tags in markdown 
PHPBB3-9550
 2012-12-17 19:44:30 -05:00
David King
736b8e4456 [feature/events] Remove HTML tags from markdown so they don't get parsed 
PHPBB3-9550
 2012-12-17 19:16:10 -05:00
Marc Alexander
fb60f603ba [ticket/10954] Miscellaneous coding fixes 
Remove obsolete or unneeded code. Also fix the behavior of removing
icon_topic_newest by actually removing the link to the first unread post
instead of just removing the icon.

PHPBB3-10954
 2012-12-18 00:48:50 +01:00
David King
a686e66c85 [feature/events] Remove extraneous space 
PHPBB3-9550
 2012-12-17 18:16:39 -05:00
David King
52cd0b8a6d [feature/events] Add markdown template event documentation file 
PHPBB3-9550
 2012-12-17 18:00:47 -05:00
David King
636227491d [feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2) 
PHPBB3-9550
 2012-12-17 17:59:41 -05:00
David King
8d6a4559ba [feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2) 
PHPBB3-9550
 2012-12-17 17:48:15 -05:00
David King
3667ba7a09 [feature/events] Fix typo in event name 
PHPBB3-9550
 2012-12-17 17:39:25 -05:00
Marc Alexander
4ae0c78782 [ticket/10763] Use self when calling get_extension() in filespec class 
PHPBB3-10763
 2012-12-17 19:17:32 +01:00
David King
4ad2747ccf [feature/events] Fix more subsilver2 events 
PHPBB3-9550
 2012-12-17 11:59:23 -05:00
David King
d25dffbb2d [feature/events] Fix some subsilver2 events 
PHPBB3-9550
 2012-12-17 11:57:18 -05:00
David King
8526dc14f0 [feature/events] Append "_append" to viewtopic_print_head 
PHPBB3-9550
 2012-12-17 11:52:37 -05:00
David King
cb3db020f0 [feature/events] ucp_pm_viewmessage_print_head_append 
PHPBB3-9550
 2012-12-17 11:51:07 -05:00
Marc Alexander
54d96dfac7 [ticket/10763] Make functions for remote avatars static 
fileupload::image_types() and filespec::get_extension() are called
statically while submitting the form for the remote avatar. Make them
static as described in the ticket in order to prevent a PHP notice.
Also change the tests to use the static functions.

PHPBB3-10763
 2012-12-17 17:42:13 +01:00
David King
d3db491e09 [feature/events] simple_footer_end -> simple_footer_after 
PHPBB3-9550
 2012-12-17 11:40:42 -05:00
David King
d22f171ad0 [feature/events] Append "_prepend" to posting_editor_options 
PHPBB3-9550
 2012-12-17 11:38:16 -05:00
David King
c6f9e4522b [feature/events] Fix events in prosilver overall_header.html 
PHPBB3-9550
 2012-12-17 11:38:00 -05:00
David King
9015a76cf6 [feature/events] Fix events in prosilver overall_footer.html 
PHPBB3-9550
 2012-12-17 11:37:46 -05:00
David King
37ac2c9aae [feature/events] Rename index_body_info_blocks: index_body_stat_blocks_before 2012-12-17 11:37:45 -05:00
David King
11035eb4c4 [feature/events] Append "_append" to acp_simple_header_head 
PHPBB3-9550
 2012-12-17 11:37:44 -05:00
David King
4e8ee1e6b9 [feature/events] acp_simple_footer_end -> acp_simple_footer_after 
PHPBB3-9550
 2012-12-17 11:37:43 -05:00
David King
79ea26409b [feature/events] Append "_append" to acp_overall_header_head 
PHPBB3-9550
 2012-12-17 11:37:42 -05:00