mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-17 21:10:00 +02:00
Code Issues Releases Wiki Activity
18,932 Commits 18 Branches 192 Tags
Commit Graph

149 Commits

Author SHA1 Message Date
Andreas Fischer
2050a39da7 [feature/plupload/integration] Integration of Plupload 
This commit is a highly-refactored and up-to-date version of Fyorl's work
which was part of his Google Summer of Code 2012 project "Attachment
Improvements".

PHPBB3-10929
 2013-10-11 17:40:16 +02:00
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
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
01045a6bb0 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11233] prohibit selecting anonymous user as a PM recipient
 2013-01-31 00:32:39 +01:00
Dhruv
36b7d7560e [ticket/11233] prohibit selecting anonymous user as a PM recipient 
While composing pm, it should not be allowed to add
anonymous user as a PM recipient

PHPBB3-11233
 2013-01-30 21:46:15 +05:30
Andreas Fischer
83179e07ff [ticket/10780] Use colon from language in ucp_pm_compose.php where possible. 
PHPBB3-10780
 2012-11-10 00:23:03 +01:00
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
Senky
d0a1c7bf0a [ticket/10568] adding MESSAGE_EDITED to ucp.php and compose_pm 
PHPBB3-10568
 2012-08-02 20:08:49 +02:00
Nathan
67665f5957 [ticket/10990] Use $user->lang['COMMA_SEPARATOR'] when appropriate 
PHPBB3-10990
 2012-07-22 14:32:03 -05: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
Nils Adermann
a30ec6e052 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10158] Remove some code duplication from generating the message.
  [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
  [ticket/10158] Only view "Return to" links if they are useful.
  [ticket/10158] Add return-link to folder, when the user replied from a folder.
  [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
 2011-06-05 01:58:52 +02:00
Nils Adermann
6b6705b852 [ticket/10158] Remove some code duplication from generating the message. 
PHPBB3-10158
 2011-06-05 01:58:03 +02:00
Joas Schilling
67449f8f1b [ticket/10158] Only view "Return to" links if they are useful. 
PHPBB3-10158
 2011-05-23 12:03:04 +02:00
Joas Schilling
437013194a [ticket/10158] Add return-link to folder, when the user replied from a folder. 
PHPBB3-10158
 2011-05-09 12:46:34 +02:00
Joas Schilling
65d956bd81 [ticket/10158] Add "Return to Inbox"-link to "PM send"-message. 
PHPBB3-10158
 2011-05-05 10:49:54 +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
Joas Schilling
f593ae1f35 [Fix] Use correct BBCode parseoptions in signatures when previewing PMs. 
Authorised by: bantu



git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10325 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-12-12 00:06:01 +00:00
Meik Sievertsen
7d4a25e73f Fix Bug #53505 (related to Bug #52515 and r10208) - i fixed this the "do not break other things" way, usually the fix would be using !$submit here 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10251 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-11-03 14:40:25 +00:00
Meik Sievertsen
e9c1c03ca6 Fix bug #52515 (wrong bbcode uid assigned if error triggered and quote/forward PM) - still not entirely sure if this will break things, but the correct uid should also be assigned if there is an error triggered somewhere, this does not change the content or the actions assigned. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10208 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-10-04 18:03:19 +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
bf1621c05d Style authors are now able to define the default submit button used for form submission on ENTER keypress on forms using more than one. Prosilver uses this for the posting page(s) and registration screen. 
(we further test this at phpbb.com)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10069 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-30 17:50:11 +00:00
Meik Sievertsen
6cd6a907c7 Separate PM Reply and PM Reply to all in prosilver. 
Style changes by dhn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9919 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-08-04 14:15:13 +00:00
Joas Schilling
780854818b Fix bug #48265 - Correctly set attachment flag for topics, posts and pms after deleting attachments - Patch by WorldWar and nickvergessen 
Authorised by: AcydBurn


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9843 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-07-24 09:01:29 +00:00
Ruslan Uzdenov
4991cae3a1 Fixed Bug #39625 - QUOTE-string not included when replying to pm's 
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9725 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-07-07 12:55:34 +00:00
Joas Schilling
89ddc4543f Fix bug #38395 - Loading draft removes recipients when replying to PM 
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9685 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-06-26 11:38:29 +00:00
Meik Sievertsen
2547ca9635 Bug #44525 - do not try to fetch existing username var in cookie set by external applications on pm'ing 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9494 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-04-28 16:16:24 +00:00
Meik Sievertsen
cee46c7941 force non-relative date for pm forwards (thanks chris. :)) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9456 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-04-17 13:19:29 +00:00
Chris Smith
0d4a76a875 Hide font size options which are bigger than the allowed size in the editor. #42615 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9365 89ea8834-ac86-4346-8a33-228a782c2dd0
 2009-03-11 17:11:10 +00:00
Meik Sievertsen
866e4196f4 every second commit an pre/post-commit error... :/ 
Ask for forum password if post within passworded forum quoted in private message (Reported by nickvergessen)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9168 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-12-03 16:48:06 +00:00
Meik Sievertsen
7d1e8ed70e Fix header list build for replying oldest PM in PM history (Bug #37275) 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9072 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-11-22 17:53:27 +00:00
Meik Sievertsen
43940870f6 additionally to the default "reply to all" behaviour, increase max_recipients to the number of people within the list if they exceed the limit. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9045 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-11-02 15:28:00 +00:00
Meik Sievertsen
b4d2641a59 Separate display of posted attachments in posting screen and switch for template to indicate adding attachments are allowed. Related to Bug #13871 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8976 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-10-06 13:53:18 +00:00
Chris Smith
a75fd80305 A fix for the fix in r8934. #34525 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8936 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-24 19:08:14 +00:00
Chris Smith
0cd7d50fb9 We want our PM spam back. Fix a regression introduced in r8913, preventing users from sending PMs. #34525 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8934 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-24 18:39:50 +00:00
Meik Sievertsen
c5b88e8481 - Automatically add users/groups to the PM recipient list, if entered or selected. 
- Reply to PM now includes all previous recipients and not only the original sender.
+some changes required to implement max_recipient feature and new permission

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8913 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-23 13:04:27 +00:00
Meik Sievertsen
b91b43d22c remove duplicate statement 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8883 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-18 15:05:51 +00:00
Meik Sievertsen
6e3aadae80 #18175 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8868 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-09-17 15:51:22 +00:00
Meik Sievertsen
49235d6ed5 not unsetting message_parser - a mod or site may want to re-use it. 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8620 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-06-08 10:39:44 +00:00
Henry Sudhof
c16d34f995 #19675 
and
#19675

Language changes, so take care.

I guess it's time to close up shop :)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8326 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-01-22 15:29:58 +00:00
Meik Sievertsen
a7984e660d Correctly check empty subjects/messages (Bug #17915) 
Do not check usernames against word censor list. Disallowed usernames is already checked and word censor belong to posts. (Bug #17745)
Additionally include non-postable forums for moderators forums shown within the teams list. (Bug #17265)


git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8306 89ea8834-ac86-4346-8a33-228a782c2dd0
 2008-01-05 16:10:10 +00:00
Meik Sievertsen
e2e56acca9 some further fixes 
- re-introduce grabbing random number from /dev/urandom


git-svn-id: file:///svn/phpbb/trunk@8241 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-11-17 20:04:49 +00:00
Meik Sievertsen
7de5bb3498 dumdidum... sorry. ;) 
git-svn-id: file:///svn/phpbb/trunk@8147 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-05 14:36:34 +00:00
Henry Sudhof
4defd8a830 Ok, here comes a big one. Poor updater. Also requires testing. 
#i91
#i92
#i93
#i94
#i95
#i96


git-svn-id: file:///svn/phpbb/trunk@8120 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-10-03 15:05:54 +00:00
Meik Sievertsen
dc5206aedd #14556 
git-svn-id: file:///svn/phpbb/trunk@8110 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-09-26 13:57:47 +00:00
Meik Sievertsen
e3882844ec #i62 - #i65 
gone through every javascript invocation and making sure we adhere to our coding guidelines.


git-svn-id: file:///svn/phpbb/trunk@8099 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-09-22 18:31:50 +00:00
Meik Sievertsen
685282c2cb - some language tweaks suggested by John 
- some bug fixes
- finally adding db_tools...


git-svn-id: file:///svn/phpbb/trunk@8088 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-09-13 15:01:15 +00:00
Meik Sievertsen
c9dcf849b9 - two new packages... diff and utf 
- only 60 chars for topic title if new post (please see changelog for explanation)
- change utf8_wordwrap (had some bugs david and nils spotted - was not really functional, sorry for this. :D)


git-svn-id: file:///svn/phpbb/trunk@8034 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-08-16 11:28:58 +00:00
Meik Sievertsen
e9188d4e05 Some changes... non-invasive... 
git-svn-id: file:///svn/phpbb/trunk@8025 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-08-13 12:14:07 +00:00
Henry Sudhof
1a54132759 #13800 
git-svn-id: file:///svn/phpbb/trunk@7958 89ea8834-ac86-4346-8a33-228a782c2dd0
 2007-07-27 14:55:48 +00:00