1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

238 Commits

Author SHA1 Message Date
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$
PHPBB3-9916
2011-12-31 13:32:52 +00:00
Joas Schilling
88ae40a4b1 [ticket/10345] Make use of the plural function in some basic places
PHPBB3-10345
2011-11-25 15:10:44 -05:00
Joas Schilling
4c77903129 [ticket/10484] Use variables for sql_build_query() calls
It's easier for mods/extensions to extend the arrays.

PHPBB3-10484
2011-11-21 16:22:07 +01:00
Andreas Fischer
019e43bc2d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10237] Display login-box for guests, when (un)subscribing

Conflicts:
	phpBB/includes/functions_display.php
2011-11-11 22:17:12 +01:00
Andreas Fischer
f3c9133a6c Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympus
* nickvergessen/ticket/10237:
  [ticket/10237] Display login-box for guests, when (un)subscribing
2011-11-11 22:07:11 +01:00
Joas Schilling
1a19388aa3 [ticket/10237] Display login-box for guests, when (un)subscribing
Also initialise $is_watching for PHP Notice: Undefined variable is_watching

PHPBB3-10237
2011-11-06 23:51:29 +01:00
Andreas Fischer
d4cc53dfef Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
2011-11-01 20:08:44 +01:00
Andreas Fischer
0b1199f7b2 Merge remote-tracking branch 'nickvergessen/ticket/9036' into develop-olympus
* nickvergessen/ticket/9036:
  [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
2011-11-01 20:08:17 +01:00
Joas Schilling
da8cac280c [ticket/9036] Add template variable 'S_AUTH_READ' to forumlist
PHPBB3-9036
2011-10-29 16:26:17 +02:00
Joas Schilling
367bc23009 Merge branch 'develop-olympus' into develop
Conflicts:
	phpBB/includes/functions.php
2011-10-13 14:46:16 +02:00
Vjacheslav Trushkin
b38fbc6d25 [ticket/10397] Pagination inconsistency fix
Fixing topic_generate_pagination()

PHPBB3-10397
2011-10-04 12:24:42 +03:00
Vjacheslav Trushkin
830c3f4047 [feature/remove-imagesets] Adjustments to php files
Removing imagesets. Adjustments to php files

PHPBB3-10336
2011-09-04 01:08:00 +03:00
Nils Adermann
73aca1a6fb Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10320] Exclude passworded forums when determining "Most active topic".
  [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
2011-08-25 23:21:09 -04:00
Nils Adermann
0d4089da7f Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympus
* github-bantu/ticket/10320:
  [ticket/10320] Exclude passworded forums when determining "Most active topic".
  [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
2011-08-25 23:20:55 -04:00
Nils Adermann
459570bcca Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9995] Do not run forum SQL query when marking the whole board read.
  [ticket/9995] Always continue when harvesting $forum_ids for markread().
  [ticket/9995] Remove useless statement from display_forums()

Conflicts:
	phpBB/includes/functions_display.php
2011-08-25 23:16:31 -04:00
Andreas Fischer
7ae871dfae [ticket/9995] Do not run forum SQL query when marking the whole board read.
PHPBB3-9995
2011-08-26 03:59:39 +02:00
Andreas Fischer
afc35f610d [ticket/9995] Always continue when harvesting $forum_ids for markread().
PHPBB3-9995
2011-08-26 03:32:36 +02:00
Andreas Fischer
e4e854863f [ticket/9995] Remove useless statement from display_forums()
The $forum_ids array is only used if $mark_read == 'forums'.

When $mark_read == 'forums', we either continue when
$auth->acl_get('f_list', $forum_id) is false or true.

So this statement is never useful.

PHPBB3-9995
2011-08-26 03:29:05 +02:00
Andreas Fischer
4f8bb02a57 [ticket/10320] Exclude passworded forums when determining "Most active topic".
PHPBB3-10320
2011-08-25 17:33:39 +02:00
Nils Adermann
19925ad059 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10237] Also display login-box on subscribing
  [ticket/10237] Handle watching and unwatching the same way.
  [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions

Conflicts:
	phpBB/includes/functions_display.php
2011-07-16 21:57:16 -04:00
Joas Schilling
d60ffdd55c [ticket/10237] Also display login-box on subscribing
PHPBB3-10237
2011-07-11 19:31:11 +02:00
Joas Schilling
773561f862 [ticket/10237] Handle watching and unwatching the same way.
Also add some information to the confirm-box (forum_name / topic title)

PHPBB3-10237
2011-07-11 19:24:40 +02:00
Joas Schilling
b2a65ac76d [ticket/10237] Use confirm-box to handle unwatching a forum/topic actions
PHPBB3-10237
2011-07-07 12:40:35 +02:00
Oleg Pudeyev
7cbbb301e1 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9999] SEARCH_USER_POSTS is also used on viewtopic. Move to common.
  [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
2011-05-09 22:28:35 -04:00
Andreas Fischer
4038091382 [ticket/9999] Remove broken and unused L_FORUM_FOLDER_ALT variable.
L_FORUM_FOLDER_ALT was supposed to be a language variable but the language
variable is never looked up but directly passed as L_FORUM_FOLDER_ALT instead.

Also, the expected functionality is correctly implemented by
FORUM_FOLDER_IMG_ALT.

PHPBB3-9999
2011-05-09 23:11:56 +02:00
Igor Wiedler
cdbb609c20 [ticket/9937] Make sure feed icon only shows for FORUM_POST
This is cleaner, since feed.php only supports FORUM_POST.

PHPBB3-9937
2010-12-21 22:44:10 +01:00
RMcGirr83
3f27cb2ea7 [ticket/9937] The feed icon displays on External links...which we don't want
PHPBB3-9937
2010-12-21 20:44:20 +01:00
Joas Schilling
954b3c3484 [ticket/7720] Fix alternative image-description for unread posts.
Changed the wrong word "new" to "unread" as that is, what we show with the
red-icons, not whether the post is new or not. Language variables were
kept for backwards compatibility.

PHPBB3-7720
2010-07-14 20:55:07 +02:00
Andreas Fischer
6b1f7a2d9d Merge branch 'ticket/bantu/9112' into develop-olympus
* ticket/bantu/9112:
  [ticket/9112] Make sure current user can see most active forum/topic.
2010-06-20 22:45:16 +02:00
Andreas Fischer
e66c089626 [ticket/9112] Make sure current user can see most active forum/topic.
PHPBB3-9112
2010-06-15 20:20:02 +02:00
Mark
cc8d22bed6 [feature/notify_status] Define'd constants for notify_status
define'd constants NOTIFY_YES, NOTIFY_NO to replace magic numbers in
forums_watch table and topics_watch table

PHPBB3-9179
2010-05-16 19:50:35 +02:00
Chris Smith
492063cec6 [bug/59465] Remove start=0 from topic pagination links.
Patch once again by nn-.
2010-03-18 20:28:59 +00:00
Andreas Fischer
0f5856ce5b No longer include subforums in forum feed.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10405 89ea8834-ac86-4346-8a33-228a782c2dd0
2010-01-12 21:15:32 +00:00
Ruslan Uzdenov
3d3e673396 Fix Bug #53285 introduced in r10018 - Mark the first visible forum on index as unread if there's any unread global announcement
Authorised by: Bantu

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10243 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-10-28 16:49:23 +00:00
Meik Sievertsen
5537393f76 Further adjust unread tracking query, should work now for user last mark times less than forum/topic mark times.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10121 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-08 10:36:22 +00:00
Andreas Fischer
d85493ab16 Rename get_unread_topics_list() to get_unread_topics().
Cleanup: Remove some stuff we no longer need.
Related to report #46765

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10120 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-09-08 08:53:01 +00:00
Andreas Fischer
a3c00e88d9 Use comparison instead of arithmetic.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10040 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-21 10:46:58 +00:00
Meik Sievertsen
38fcaaf1d2 instead of only enabling forum feeds in viewforum we set it on every location where forums are shown
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10029 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-20 12:19:48 +00:00
Meik Sievertsen
6d763f7d1e add feed switch to forumrow, so forums can be styled correctly (with an rss icon for example)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10026 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-20 12:04:55 +00:00
Ruslan Uzdenov
d2d5ecef8d Better tracking of global announcements
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10018 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-18 14:51:08 +00:00
Joas Schilling
74ee1405f3 Fix Bug #49615 - Unapproved topic icon has incorrect forum (introduced in r9635 fixing #46865)
Authorised by: ToonArmy

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9990 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-15 10:49:01 +00:00
Ruslan Uzdenov
914687075d Fix bug #15729 - Global announcements marked as read if all new topics in forum are viewed
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9926 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-08-05 12:51:48 +00:00
Meik Sievertsen
050567483f Ability to fetch moderators with get_moderators() even if load_moderators setting is off. (Bug #35955)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9640 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-21 09:36:13 +00:00
Joas Schilling
0d626d77bf Fix bug #46865 - Add unapproved topic icon for moderators on forum list
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9635 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-20 16:51:01 +00:00
Joas Schilling
d85a5ad036 Fix bug #46785 - Hide avatars if type disabled and give global option to turn on/off
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9632 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-06-19 22:03:19 +00:00
Henry Sudhof
53aa37cd66 #44105
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9467 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-04-17 16:10:39 +00:00
Chris Smith
7d848718a4 tiny tiny changes to r9328
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9329 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-15 18:47:00 +00:00
Chris Smith
07523011d2 Allow translation of Custom BBCode help messages.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9328 89ea8834-ac86-4346-8a33-228a782c2dd0
2009-02-15 18:36:14 +00:00
Meik Sievertsen
e02c3e3b4a Only display special ranks to guests; no longer display normal ranks for guests (Bug #36735)
[a bit ugly, but retains backward compatibility]

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9082 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-11-22 20:26:09 +00:00
Meik Sievertsen
253f186322 - Do not show link to user/group profiles if user has no permission to view the linked page and gets a denied message anyway. (Bug #15088)
- Do not display last post link and sort display options for search engines. (Bug #15088)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8987 89ea8834-ac86-4346-8a33-228a782c2dd0
2008-10-09 14:17:02 +00:00