mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-19 15:17:16 +01:00
Code Issues Releases Wiki Activity
16,363 Commits 17 Branches 190 Tags
Commit Graph

597 Commits

Author SHA1 Message Date
Andreas Fischer
a97d9d4b89 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11144] Add missing {FORUM_NAME} variable
  [ticket/11144] Add missing {FORUM_NAME} variable

Conflicts:
	phpBB/download/file.php
	phpBB/styles/prosilver/template/login_forum.html
 2013-05-06 22:11:33 +02:00
Gaëtan Muller
eefcdfa54a [ticket/11144] Add missing {FORUM_NAME} variable 
Replace spaces with tabs

PHPBB3-11144
 2013-05-06 21:50:45 +02:00
Gaëtan Muller
828d3b6b68 [ticket/11144] Add missing {FORUM_NAME} variable 
The template variable {FORUM_NAME} was missing from
the login page of a password protected forum

PHPBB3-11144
 2013-05-06 21:31:16 +02: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
917a2fa9a6 [ticket/10880] The m_approve permisson no longer implies f_noapprove. 
PHPBB3-10880
 2012-12-19 22:02:39 -05:00
Nils Adermann
43190ebeca Merge pull request #962 from imkingdavid/feature/add_events 
Feature/add events
 2012-09-01 12:44:23 -07:00
Nils Adermann
790e64433d Merge pull request #921 from imkingdavid/ticket/10444 
[ticket/10444] Do not default to the previous post edit reason.
 2012-09-01 07:05:29 -07:00
David King
02644c02b9 [feature/add_events] Added core.posting_modify_template_vars 
Can be used to set template variables and such, as the template assignment
methods are not available to the modify_posting_paramters event.

PHPBB3-9550
 2012-08-26 15:09:50 -04:00
David King
ca62b1ffb0 [feature/add_events] Added note in modify_posting_parameters 
The template assignment methods do not work until $user->setup() has been run.
This event is called before it, so extensions requiring template methods must
put such calls in a later event.

PHPBB3-9550
 2012-08-25 21:41:04 -04:00
David King
7ee3eb16ac [feature/add_events] Add more parameters to core.modify_posting_parameters 
PHPBB3-9550
 2012-08-23 12:49:09 -04:00
David King
a02bfcc83a [feature/add_events] core.posting_refresh -> core.modify_posting_paramters 
The event now lets extensions modify the posting paramters, not just refresh

PHPBB3-9550
 2012-08-21 11:50:38 -04:00
David King
6613884a60 [feature/add_events] Added core.posting_refresh event 
PHPBB3-9550
 2012-08-20 11:37:27 -04:00
Nathan
67665f5957 [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate 
PHPBB3-10990
 2012-07-22 14:32:03 -05:00
David King
d908d93273 [ticket/10444] Do not default to the previous post edit reason. 
PHPBB3-10444
 2012-07-12 16:02:58 -04:00
David King
5ccd6915e3 [feature/qrpreview] Do not error or show preview if no text is entered 
PHPBB3-10726
 2012-03-31 15:52:16 -04:00
David King
a7045e6572 [feature/qrpreview] Preview from Quick Reply 
PHPBB3-10726
 2012-03-30 21:43:00 -04:00
Unknown
7a04c9048c [ticket/9916] Updating header license and removing Version $Id$ 
PHPBB3-9916
 2011-12-31 13:32:52 +00:00
Andreas Fischer
7d47670c23 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10503] Debug error "Invalid arguments" when previewing edits
 2011-12-04 00:06:14 +01:00
Joas Schilling
f88e89900f [ticket/10503] Debug error "Invalid arguments" when previewing edits 
Empty value of poll_options should be an empty array, so that sizeof() is 0.

PHPBB3-9776
PHPBB3-10503
 2011-11-28 10:35:43 +01: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
Nils Adermann
3df4b83cd3 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9776] Delete poll if no poll options were submitted.
 2011-11-18 20:31:40 +01:00
Joas Schilling
4fae5eef68 [ticket/9776] Delete poll if no poll options were submitted. 
PHPBB3-9776
 2011-11-18 20:29:50 +01: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
Nils Adermann
735cae076a Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/6712] Properly explain result of setting the bump interval to 0.
  [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
  [ticket/6712] Pass $post_data by the value instead of by the reference.
  [ticket/6712] Bump does not create new topic icon on index.

Conflicts:
	phpBB/includes/functions_posting.php
 2011-06-10 00:26:41 +02:00
Nils Adermann
5b701dc3ed Merge branch 'ticket/rxu/6712' into develop-olympus 
* ticket/rxu/6712:
  [ticket/6712] Properly explain result of setting the bump interval to 0.
  [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time
  [ticket/6712] Pass $post_data by the value instead of by the reference.
  [ticket/6712] Bump does not create new topic icon on index.
 2011-06-10 00:24:43 +02:00
rxu
5254ec2795 [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_time 
PHPBB3-6712
 2011-05-01 13:38:39 +08:00
Andreas Fischer
aba31aeff9 [ticket/10047] Do not put session id in URL on posting.php when cookies are on. 
PHPBB3-10047
 2011-02-19 14:30:39 +01:00
RMcGirr83
7a3d6a8168 [ticket/8736] guest can have 255 chars long username 
when you post as a guest (anonymous) you can fill the field username with 255
chars. that will destroy the prosilver and subsilver2 style at viewtopic.
settings for username in ACP: 6-16 Chars

PHPBB3-8736
 2010-12-04 20:04:10 +01:00
rxu
4091f873ea [ticket/6712] Bump does not create new topic icon on index. 
Handle the topic bumping process more properly.

PHPBB3-6712
 2010-10-18 21:25:52 +08:00
Igor Wiedler
07a8d5a3dd [ticket/9162] Prevent notice on unset poll title 
Regression from a81c857c96ee1a2a9be559ff3c9b71ca9514287e

PHPBB3-9162
 2010-10-16 13:55:17 +02:00
Andreas Fischer
20460dc12c Merge branch 'ticket/nickvergessen/9162' into develop-olympus 
* ticket/nickvergessen/9162:
  [ticket/9162] BBCode in poll options is broken, when posting without question.
 2010-09-14 16:47:46 +02:00
Joas Schilling
ffd9437948 [ticket/9820] phpBB Debug Error when trying to post a new topic. 
Regression from aa4519fb44f4ff83e923c6cc4d5bde3f20082340

PHPBB3-9820
PHPBB3-7260
 2010-09-14 15:43:05 +02:00
Joas Schilling
a81c857c96 [ticket/9162] BBCode in poll options is broken, when posting without question. 
PHPBB3-9162
 2010-09-14 13:20:38 +02:00
Joas Schilling
aa4519fb44 [ticket/7260] Don't delete poll if one exists and editing user lacks permission 
PHPBB3-7260
 2010-08-22 19:30:43 +01:00
Nils Adermann
b1f9b39475 Merge branch 'ticket/nickvergessen/9531' into develop-olympus 
* ticket/nickvergessen/9531:
  [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
 2010-05-16 19:13:32 +02:00
Joas Schilling
fe9c5019b6 [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review. 
PHPBB3-9531
 2010-05-16 19:13:22 +02:00
Joas Schilling
e3ba934cd7 [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed. 
PHPBB3-8894
 2010-05-16 16:49:00 +02:00
Cullen Walsh
965ab55394 Parse urls in signature taking into account the allow_sig_links config option introduced in phpBB 3.0.6, per bug #57105 2010-03-02 12:22:11 -08:00
Josh Woody
d49806a043 #57715 - Correct behavior of "force_approved_state" when value is false. 
(Merging r10507 into branches/phpBB-3_0_0)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10508 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-02-18 04:57:23 +00:00
Josh Woody
ad14664a3a - Bug #56255 - Moving topics to a forum where you are on queue 
- Allow some error handling in compress class by returning false if file does not exist. 

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10427 89ea8834-ac86-4346-8a33-228a782c2dd0
 2010-01-18 16:41:21 +00:00
Chris Smith
5a2eb175bb One issue solved possily others, so not closing yet. #55245 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10306 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-08 22:45:39 +00:00
Meik Sievertsen
9c7109d59e This is not perfect... i know, but at least it gives out more information than a simple "this topic/post does not exist". ;) 
Related to r9971

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10253 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-11-03 15:03:14 +00:00
Joas Schilling
de25ce8724 Fix Bug #51835 - editing posts with attachments - regression from r9843 introduced in #48265 
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10186 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-09-25 08:41:47 +00:00
Meik Sievertsen
8da2b69e2b note correct username if post/topic get's removed if user is anonymous 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10170 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-09-20 17:08:16 +00:00
Meik Sievertsen
1b64e41160 although we do not use force_approved_state check it nevertheless for the message displayed to the user - bug #51325 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10166 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-09-20 12:32:27 +00:00
Joas Schilling
139f1d3530 fix r10076 for #48615 - Ability to specify amount of time user is able to delete his last post in topic. 
Authorised by: AcydBurn


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10080 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-31 14:57:04 +00:00
Meik Sievertsen
7ce940680a Do not take edit post time into account for determining permission to delete last post in topic. (Bug #48615) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10076 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-31 12:29:45 +00:00
Henry Sudhof
76fd6026bc erm, on the contrary; can that reset call 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9999 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-16 21:21:04 +00:00
Henry Sudhof
ba3e0831ea erm, on the contrary; can that reset call 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9998 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-16 21:11:17 +00:00