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

16072 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Oleg Pudeyev
bd44088757 Merge PR #918 branch 'Senky/ticket/10568' into develop-olympus 
* Senky/ticket/10568:
  [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm
 2012-10-17 22:10:49 -04:00
Joas Schilling
b0bfe724fb [ticket/11014] Fix old pagination assignment 
PHPBB3-11014
 2012-10-17 23:34:37 +02:00
Joas Schilling
99dd73aac7 [ticket/11018] Fix several paginations in ACP 
PHPBB3-11018
 2012-10-17 23:34:37 +02:00
Joas Schilling
7ce43d49d8 [ticket/11014] Fix IF statements for new template pagination 
PHPBB3-11014
 2012-10-17 23:34:37 +02:00
Joas Schilling
7675d72622 [ticket/11014] Fix text for previous/next links in Subsilver2 
PHPBB3-11014
 2012-10-17 23:34:37 +02:00
Joas Schilling
ceb5a40eec [ticket/11023] Fix additional whitespaces that were added by PHPBB3-10968 
PHPBB3-11023
 2012-10-17 23:34:37 +02:00
Joas Schilling
ada2d4c91b [ticket/11018] Always display previous/next links if we can display one 
PHPBB3-11018
 2012-10-17 23:33:19 +02:00
Joas Schilling
5ea662f649 [ticket/11014] Restore template vars for next/previous links 
They were dropped while the function was refactored:

If the block_var_name is a nested block, we will use the last (most inner)
block as a prefix for the template variables. If the last block name is
pagination, the prefix is empty. If the rest of the block_var_name is not
empty, we will modify the last row of that block and add our pagination items.

PHPBB3-11014
 2012-10-17 23:33:18 +02:00
Joas Schilling
fa5753de70 [ticket/11018] Swap prev/next links on pagination to the old order 
In the old pagination Prev was left of the pagination and Next right of the
pagination. While moving these blocks, I also removed the whitespaces, which
were introduced.

PHPBB3-11023
PHPBB3-11018
 2012-10-17 23:33:18 +02:00
Joas Schilling
43a713ea83 [ticket/11067] Copy prosilver CSS to adm, so the pagination looks the same 
PHPBB3-11067
PHPBB3-11018
 2012-10-17 23:30:57 +02:00
Joas Schilling
a51aa9b47c [ticket/11018] Fix minor issues with CSS in prosilver 
PHPBB3-11018
 2012-10-17 23:30:56 +02:00
Drae
e76fd6a395 [ticket/11018] Attempt to fix li.pagination alignment issue 
This is somewhat kludgy fix for the vertical alignment issue
for pagination contained within a linklist parented li element.
Tested and doesn't seem to impact anything else negatively. May
need further browser testing.

PHPBB3-11018
 2012-10-17 23:30:56 +02:00
Oleg Pudeyev
bb09cd9c8e [ticket/10848] Add phpbb_ prefix. 
PHPBB3-10848
 2012-10-17 15:13:35 -04:00
Oleg Pudeyev
c630480ca1 [ticket/10848] Redirect from adm to installer correctly. 
PHPBB3-10848
 2012-10-17 15:08:09 -04:00
Nathan Guse
4b3264d9bb Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103 
Conflicts:
	phpBB/includes/functions_posting.php
	phpBB/language/en/email/forum_notify.txt
	phpBB/language/en/email/newtopic_notify.txt
	phpBB/language/en/email/topic_notify.txt
 2012-10-16 23:33:57 -05:00
Nathan Guse
77bc12d334 [ticket/11103] Add author name output to post/topic email templates 
For a recent merge:
https://github.com/phpbb/phpbb3/pull/624

PHPBB3-11103
 2012-10-16 23:27:49 -05:00
Oleg Pudeyev
51cd1129be Merge PR #890 branch 'nickvergessen/ticket/10982' into develop 
* nickvergessen/ticket/10982:
  [ticket/10982] Correctly check, whether data-overlay is set
  [ticket/10982] Remove overlay on first up/down move of forums in ACP
  [ticket/10982] Allow setting dimming control overlay also as data-overlay
 2012-10-16 21:47:13 -04:00
Oleg Pudeyev
d5325e6934 Merge PR #624 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8743] Include poster´s name in mail notifications
 2012-10-16 21:21:03 -04:00
Oleg Pudeyev
f0544c884f Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus 
* nickvergessen/ticket/8743:
  [ticket/8743] Include poster´s name in mail notifications
 2012-10-16 21:20:58 -04:00
Oleg Pudeyev
ad2feb917f Merge PR #917 branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10967] adding $root_path to posting_get_topic_icons
 2012-10-16 20:31:03 -04:00
Oleg Pudeyev
bef3f9c7e7 Merge PR #917 branch 'Senky/ticket/10967' into develop-olympus 
* Senky/ticket/10967:
  [ticket/10967] adding $root_path to posting_get_topic_icons
 2012-10-16 20:30:45 -04:00
Nathan Guse
0d098ae5e5 [ticket/11103] Return false to prevent appending # to the URL 
PHPBB3-11103
 2012-10-16 18:14:06 -05:00
Nathan Guse
92b533aad3 [ticket/11103] Do not notify yourself when you close your own report 
PHPBB3-11103
 2012-10-16 17:49:54 -05:00
Nathan Guse
230e9d2e32 [ticket/11103] Do not send PM received notifications to the author 
(you won't be notified if you PM yourself)

PHPBB3-11103
 2012-10-16 17:47:27 -05:00
Nathan Guse
3839fe6902 [ticket/11103] Use report text for report notification, never notify reporter 
PHPBB3-11103
 2012-10-16 17:44:46 -05:00
Nathan Guse
3557b39115 [ticket/11103] Hide notifications flyout on a click outside of the list. 
PHPBB3-11103
 2012-10-16 17:31:48 -05:00
Nathan Guse
a080af4b05 [ticket/11103] Add title/view all link to subsilver2 
PHPBB3-11103
 2012-10-16 17:28:45 -05:00
Nathan Guse
901739b0c6 [ticket/11103] Fix some style code I missed in prosilver 
PHPBB3-11103
 2012-10-16 17:28:08 -05:00
Nathan Guse
ee00688829 [ticket/11103] Restyling notifications list for prosilver 
PHPBB3-11103
 2012-10-16 16:47:45 -05:00
Nathan Guse
61a1467c90 [ticket/11103] U_VIEW_ALL_NOTIFICATIONS Link 
PHPBB3-11103
 2012-10-16 16:47:18 -05:00
Nathan Guse
25ef4d6f91 [ticket/11103] Correct some CSS 
PHPBB3-11103
 2012-10-16 11:14:51 -05:00
Nathaniel Guse
c8b66a26ef [ticket/11103] Mark read link if notification has no URL to view it 
Other style stuff

PHPBB3-11103
 2012-10-16 10:51:07 -05:00
Andreas Fischer
60acba81d1 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
 2012-10-16 14:40:25 +02:00
Andreas Fischer
0348950ff1 Merge branch 'ticket/russellwwest/11093' into develop-olympus 
* ticket/russellwwest/11093:
  [ticket/11093] acp_users_overview.html has a wrongly placed </dd>
 2012-10-16 14:40:10 +02:00
westr
d376348acf [ticket/11093] acp_users_overview.html has a wrongly placed </dd> 
Amended the closing dd tag to the appropriate line: line 145 instead of 141

PHPBB3-11093
 2012-10-16 14:39:32 +02:00
Andreas Fischer
72f0e2dd79 Merge remote-tracking branch 'mvinny/ticket/11139' into develop 
* mvinny/ticket/11139:
  [ticket/11139] Adding the $phpbb_admin_path variable
  [ticket/11139] Fix fatal error on colour swatch window
 2012-10-15 19:49:28 +02:00
Vinny
571d352eed [ticket/11139] Adding the $phpbb_admin_path variable 
PHPBB3-11139
 2012-10-15 14:32:49 -03:00
Nathaniel Guse
a2d6e40f1b [ticket/11103] If no avatar, do not display an empty box in subsilver2 
PHPBB3-11103
 2012-10-15 09:27:01 -05:00
Nathan Guse
077c526f15 [ticket/11103] ss2 - do not include footer bar if no pagination 
PHPBB3-11103
 2012-10-14 14:30:05 -05:00
Nathan Guse
4e3abdb7c5 [ticket/11103] subsilver2 ucp_notifications.html 
PHPBB3-11103
 2012-10-14 14:28:28 -05:00
Nathan Guse
c1f8c96bd7 [ticket/11103] subsilver2 overall_header.html 
PHPBB3-11103
 2012-10-14 13:46:15 -05:00
Nathan Guse
2284a14813 [ticket/11103] If notification display is disabled, show PM Info in header 
PHPBB3-11103
 2012-10-14 13:45:00 -05:00
Nathan Guse
6ded18b6e2 [ticket/11103] subsilver2 ucp_prefs_personal.html edits 
PHPBB3-11103
 2012-10-14 13:26:33 -05:00
Nathan Guse
fa6d604016 [ticket/11103] Remove todo comments that are no longer todo 
PHPBB3-11103
 2012-10-14 12:49:09 -05:00
Nathan Guse
31502cdd6c [ticket/11103] Fix comma usage 
https://github.com/phpbb/phpbb3/pull/992#discussion_r1837084

PHPBB3-11103
 2012-10-14 12:45:04 -05:00
Nathan Guse
0d5d328c81 [ticket/11103] Spacing consistency 
PHPBB3-11103
 2012-10-14 12:42:18 -05:00
Nathan Guse
a48f090338 [ticket/11103] Make sure notifications are marked read when clicking them 
How do we do this? If an item is unread, the URL to view that item will
be the URL to mark it as read (index.php?mark_notification=$id). When the
URL is visited it marks the item as read and redirects them to the correct
URL for the item.

If the item is read, the URL is directly to the item.

Prettify the html output

PHPBB-11103
 2012-10-14 12:35:35 -05:00
Nathan Guse
716635c834 [ticket/11103] Fix some language strings 
Newlines at end of email files

PHPBB3-11103
 2012-10-14 10:58:23 -05:00
Nathan Guse
c5f280351a [ticket/11103] UCP Notification option grouping 
Also add the ability to specify an _EXPLAIN text for the notification option

PHPBB3-11103
 2012-10-13 23:52:49 -05:00