mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 03:54:10 +01:00
Code Issues Releases Wiki Activity
13,453 Commits 17 Branches 190 Tags
Commit Graph

325 Commits

Author SHA1 Message Date
Oleg Pudeyev
714fafe106 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
  [ticket/10658] Use get_user_rank() for group ranks on group view.
 2012-04-03 20:57:31 -04:00
Oleg Pudeyev
14e727b834 Merge remote-tracking branch 'bantu/ticket/10658' into develop-olympus 
* bantu/ticket/10658:
  [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used.
  [ticket/10658] Use get_user_rank() for group ranks on group view.
 2012-04-03 20:57:24 -04:00
Oleg Pudeyev
8de8dc916e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10689] Fix "First character"-option in "Find a member"-search
 2012-03-16 06:06:56 -04:00
Joas Schilling
3b7a6a3efa [ticket/10689] Fix "First character"-option in "Find a member"-search 
PHPBB3-10689
 2012-03-12 00:39:12 +01:00
Andreas Fischer
bb7e86c2b1 [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used. 
PHPBB3-10658
 2012-03-08 15:19:15 +01:00
Andreas Fischer
11c5a66213 [ticket/10658] Use get_user_rank() for group ranks on group view. 
The old code was buggy because it did not prefix the path with the phpBB root
path which causes problems with bridges and other URL rewriting.

PHPBB3-10658
 2012-02-18 23:34:22 +01:00
Vjacheslav Trushkin
ad8ab09930 [ticket/10634] Specify module type when viewing profile 
Specify module type when checking for enabled modules when viewing user's profile

PHPBB3-10634
 2012-02-09 01:34:50 +02:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2011-12-31 13:32:52 +00:00
Joas Schilling
179662e949 [ticket/10345] Use the plural function in some more places. 
I added two function avatar_explanation_string() and avatar_error_wrong_size()
for easier handling of the "pixels"-languages, as they are used quite often.

PHPBB3-10345
 2011-11-25 15:10:49 -05: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
Igor Wiedler
d766ee3fe6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers().
  [ticket/10446] Remove leftover $headers parameter from anti_abuse_headers().
  [ticket/10446] RFC2047 encode user/server names in X-AntiAbuse headers.
  [ticket/10446] DRY X-AntiAbuse header addition.

Conflicts:
	phpBB/includes/ucp/ucp_register.php
 2011-11-20 18:45:56 +01:00
Andreas Fischer
37c7668193 [ticket/10446] Pass $config and $user via parameter to anti_abuse_headers(). 
PHPBB3-10446
 2011-11-20 16:35:31 +01:00
Oleg Pudeyev
64d62038cd [ticket/10446] DRY X-AntiAbuse header addition. 
PHPBB3-10446
 2011-11-20 04:15:44 -05:00
Joas Schilling
65a34fd047 [ticket/10410] Add option to display users in their first teampage group 
PHPBB3-10410
 2011-10-28 22:55:26 +02:00
Nils Adermann
d06dcd69e6 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8571] Show age as 0 in birthday list when birthday is in the future.
  [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future.
  [ticket/8571] Also display age on memberlist/viewprofile when age is 0.

Conflicts:
	phpBB/index.php
 2011-08-18 17:46:31 -04:00
Oleg Pudeyev
5fa096aca4 Merge remote-tracking branch 'igorw/ticket/9608' into develop 
* igorw/ticket/9608:
  [ticket/9608] Remove use of references in topic_review
  [ticket/9608] Revert changes to normalizer
  [ticket/9608] Remove blank line
  [ticket/9608] Remove use of references in captcha and other places
 2011-08-14 19:24:27 -04:00
Andreas Fischer
106cf14d27 [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future. 
PHPBB3-8571
 2011-07-20 00:32:00 +02:00
Nils Adermann
a33b67fd1a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10243] Adding a few unit tests for phpbb_gmgetdate().
  [ticket/10243] Call phpbb_gmgetdate() from various places.
  [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
 2011-07-16 22:06:49 -04:00
Nils Adermann
0f86034f03 Merge remote-tracking branch 'github-bantu/ticket/10243' into develop-olympus 
* github-bantu/ticket/10243:
  [ticket/10243] Adding a few unit tests for phpbb_gmgetdate().
  [ticket/10243] Call phpbb_gmgetdate() from various places.
  [ticket/10243] Adding wrapper function for getdate() for UTC timestamps.
 2011-07-16 22:05:03 -04:00
Nils Adermann
6291a37644 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/7291] Use template loop for character list, to avoid double &first_char
 2011-07-16 21:06:49 -04:00
Joas Schilling
91b20ddba5 [ticket/7291] Use template loop for character list, to avoid double &first_char 
PHPBB3-7291
 2011-07-14 22:29:27 +02:00
Igor Wiedler
4bdad7125a [ticket/9608] Remove use of references in captcha and other places 
References are not really needed in PHP due to copy-on-write. Since
PHP5, objects are always passed around as identifiers, which means they
are mutable. So it is no longer required to pass these by reference
either.

PHPBB3-9608
 2011-07-13 11:32:38 +02:00
Andreas Fischer
91fd6df430 [ticket/10243] Call phpbb_gmgetdate() from various places. 
PHPBB3-10243
 2011-07-13 00:01:37 +02:00
Joas Schilling
59d75c1ae6 [ticket/10121] Fix ICQ profile link, leading to a dead web-messenger. 
PHPBB3-10121
 2011-04-03 22:11:13 +02:00
Andreas Fischer
c24408f6ed [ticket/10021] Add comment explaining why we can check -1 as an error value. 
PHPBB3-10021
 2011-03-18 02:51:43 +01:00
Andreas Fischer
65580f7901 [ticket/10021] Check whether gmmktime() returns false before putting it in SQL. 
This prevents SQL errors when large dates are entered.

PHPBB3-10021
 2011-03-07 13:41:24 +01:00
Josh Woody
2a59e6d486 [ticket/9772] Unify permissions for sending email when board_email_form is off 
Sending email via memberlist.php was limited to users having u_sendemail. When
board_email_form is disabled, no such requirement was enforced.  This is now
changed.

PHPBB3-9772
 2010-08-28 15:49:47 -05:00
Andreas Fischer
a16c624d26 Small text corrections. r10393 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10394 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-31 17:32:49 +00:00
Andreas Fischer
771774f09a Remove complex query, add true sorting for viewprofile group list. Related to #31845 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10393 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-31 17:07:34 +00:00
Andreas Fischer
a096b3d981 Fix Bug #31845 - List hidden groups on viewprofile where the viewing user is also a member. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10392 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-31 16:31:57 +00:00
Meik Sievertsen
0382b08fe2 fix whitespaces/tabs in r10256 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10257 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-11-07 15:11:40 +00:00
Henry Sudhof
b35b4063f4 #53655 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10256 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-11-07 13:33:19 +00:00
Joas Schilling
2ad1abe0ee Fix Bug #50475 - Only show "Add friend" and "Add foe" links if the specific module is enabled. 
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10065 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-30 11:56:15 +00:00
Henry Sudhof
2d0d35db48 populate who is online only where required 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9961 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-12 10:30:37 +00:00
Henry Sudhof
d376811e7f require link hash for switchperm 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9915 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-03 13:32:52 +00:00
Joas Schilling
8f60b757b8 Change bug #47425 - IP data lost on pagination 
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9684 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-06-26 11:34:27 +00:00
Chris Smith
11d8d3455a Changes to r9617 Fix a template compilation issue, and reshuffle the code. The added template complexity made it more of a problem to check the variables correctly, hence simplification. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9619 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-06-18 12:59:43 +00:00
Ruslan Uzdenov
a4e817e322 Fix bug #10519 - "View user notes" and "Warn user" links shown even if modules disabled 
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9617 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-06-18 11:43:16 +00:00
Jim Wigginton
f6bb6dda3f Fixed bug #'ers 42585, 35505, 36675, and 42705 
Authorised by: acydburn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9482 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-04-24 17:27:10 +00:00
Henry Sudhof
70c7e59f66 #43665 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9421 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-03-31 15:16:49 +00:00
Chris Smith
41ad04c155 Fix a regression from r9075 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9156 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-12-02 18:48:25 +00:00
Meik Sievertsen
eac61e53f6 do not display ban link for own profile 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9140 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-11-30 17:45:22 +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
127750f89d Do not display COPPA group in memberlist find member dialog if COPPA disabled (Bug #37175) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9075 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-11-22 18:13:18 +00:00
Chris Smith
184d410b80 Fix, small cosmetic issue made in r9004 with sort urls 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9054 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-11-09 15:48:37 +00:00
Chris Smith
b588a36a22 Fix r8929 and #35275 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9004 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-10-11 18:44:53 +00:00
Henry Sudhof
f761a26e8d Make pagination work again, undoing rev8830 to fix #32515 properly 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8929 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-24 11:41:51 +00:00
Henry Sudhof
7fed490277 should make last_active work again 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8928 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-24 11:32:25 +00:00
Meik Sievertsen
4a3db854b7 - Added 'max_recipients' setting for private messages. This setting allows admins to define the maximum number of recipients per private message with a board-wide setting and a group-specific setting. 
- Added new permission setting for sending private messages to groups. Now there are two permissions to define sending private messages to multiple recipients and private messages to groups.


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8911 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-23 13:03:33 +00:00
Chris Smith
d1606c5f78 Do not jump back to page 1 when hiding member search in memberlist. Closes #32515 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8830 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-05 18:54:49 +00:00