Joas Schilling 
							
						 
					 
					
						
						
							
						
						34ad665c8b 
					 
					
						
						
							
							Merge branch 'ticket/8319' into ticket/8319-develop2  
						
						... 
						
						
						
						* ticket/8319:
  [ticket/8319] Do not repeat the replacement
  [ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
  [ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
  [ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
  [ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
Conflicts:
	phpBB/install/database_update.php 
						
						
					 
					
						2013-07-10 17:24:49 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						6206d4aa4e 
					 
					
						
						
							
							[ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL  
						
						... 
						
						
						
						The explanation now states that links are prefixed with the board URL.
PHPBB3-8319 
						
						
					 
					
						2013-06-03 12:37:58 +02:00 
						 
				 
			
				
					
						
							
							
								Senky 
							
						 
					 
					
						
						
							
						
						3741e99aab 
					 
					
						
						
							
							[ticket/10161] all "e-mail" strings in language files changed to "email"  
						
						... 
						
						
						
						according to Oleg's comment:
email is preferred by RFCs and probably the way of the future
PHPBB3-10161 
						
						
					 
					
						2012-04-15 20:10:51 +02:00 
						 
				 
			
				
					
						
							
							
								Callum Macrae 
							
						 
					 
					
						
						
							
						
						11112314f7 
					 
					
						
						
							
							[ticket/10271] AJAXified various deletions in the ACP.  
						
						... 
						
						
						
						The following places have had deletion AJAXified:
* Smilies and icons
* Word censors
* BBCodes
* Attachment groups
* Groups
* Admin / User / Moderator / Forum roles
* Report / denial reasons
* Module management
* Custom profile fields
PHPBB3-10271 
						
						
					 
					
						2012-03-31 02:09:15 +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 
							
						 
					 
					
						
						
							
						
						3788326d71 
					 
					
						
						
							
							[ticket/10345] Remove more useless 0-cases  
						
						... 
						
						
						
						PHPBB3-10345 
						
						
					 
					
						2011-11-25 15:10:51 -05: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 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						5798c8f02e 
					 
					
						
						
							
							[ticket/10123] Change "smilie" to "smiley" as per our coding guidelines.  
						
						... 
						
						
						
						PHPBB3-10123 
						
						
					 
					
						2011-04-08 12:31:56 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						851bb9fcd8 
					 
					
						
						
							
							[ticket/10084] Add smilie/icon errors out when file is missing  
						
						... 
						
						
						
						PHPBB3-10084 
						
						
					 
					
						2011-04-07 20:36:11 +02:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						1564c01c38 
					 
					
						
						
							
							[ticket/10033] "Disallow usernames" does not check already disallowed names.  
						
						... 
						
						
						
						PHPBB3-10033 
						
						
					 
					
						2011-03-23 22:48:22 +01:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						22621e0439 
					 
					
						
						
							
							Enter stage left: the INTTEXT token  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10516 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2010-02-21 11:33:29 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						14e21a1a38 
					 
					
						
						
							
							warn users about TEXT  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10511 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2010-02-20 16:18:28 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						ac857b2e0a 
					 
					
						
						
							
							some encoding fixes  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9902 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-08-01 11:07:48 +00:00 
						 
				 
			
				
					
						
							
							
								Marek A. R 
							
						 
					 
					
						
						
							
						
						e4afce6075 
					 
					
						
						
							
							- Add hard limit for smilies  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9771 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-07-17 13:40:26 +00:00 
						 
				 
			
				
					
						
							
							
								Joas Schilling 
							
						 
					 
					
						
						
							
						
						0e5cc91d6b 
					 
					
						
						
							
							Fix bug  #22665  - Display and highlight already used rank images while assigning new rank  
						
						... 
						
						
						
						Authorised by: acydburn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9607 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-06-17 12:17:19 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						133623f6cf 
					 
					
						
						
							
							#42375  - correctly state what happens (word censors not affecting usernames for registration)  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9375 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2009-03-16 16:47:16 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						b850bbf882 
					 
					
						
						
							
							Catch too long help lines  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8743 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2008-08-12 16:03:18 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						325ff1fa1b 
					 
					
						
						
							
							One commit for those fixes having a very tiny impact (mostly only whitespaces or forgotten spans, etc.)  
						
						... 
						
						
						
						Although i somehow mistakingly got #20445  and #15249  into it. :/
Removing s_watching_img from watch_topic_forum() function (Bug #20445 )
Changing order for post review if more than one post affected (Bug #15249 )
Language typos/fixes (Bug #20425 , #15719 , #15429 , #14669 , #13479 )
Style/Template fixes (Bug #20065 , #19405 , #19205 , #15028 , #14934 , #14821 , #14752 , #14497 , #13707 , #14738 )
Tiny code fixes (Bug #20165 , #20025 , #19795 , #14804 )
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8350 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2008-01-30 16:01:15 +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 
							
						 
					 
					
						
						
							
						
						8ec08728a6 
					 
					
						
						
							
							Ticket  #17705  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8287 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-12-27 16:04:42 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						df58b050f0 
					 
					
						
						
							
							grr  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@8255 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-11-28 20:09:01 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						d78b227478 
					 
					
						
						
							
							missed one. Language change, sorry about that.  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@8254 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-11-28 19:46:36 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						da7fc3d188 
					 
					
						
						
							
							#15554  
						
						... 
						
						
						
						#15464 
#15384 
Yes, there is a lang change.
git-svn-id: file:///svn/phpbb/trunk@8253 89ea8834-ac86-4346-8a33-228a782c2dd0 
					
						2007-11-27 15:13:50 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						7d84cac202 
					 
					
						
						
							
							#14621  
						
						... 
						
						
						
						#14596 
info file changes
git-svn-id: file:///svn/phpbb/trunk@8135 89ea8834-ac86-4346-8a33-228a782c2dd0 
					
						2007-10-04 15:08:22 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						529980ab79 
					 
					
						
						
							
							language fixes and template adjustements for the whois facility...  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@8093 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-09-20 15:36:00 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						feee13f962 
					 
					
						
						
							
							fixing some language and style bugs...  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@8079 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-09-05 13:33:18 +00:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						23e3766497 
					 
					
						
						
							
							- Prevent {URL} token in custom BBCodes from make_clickable messing [Bug  #14151 ]  
						
						... 
						
						
						
						- Added alternative tokens to custom BBCodes which are safe for CSS/Javascript and changed TEXT token to entitise opening and closing parantheses.
git-svn-id: file:///svn/phpbb/trunk@8056 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-08-19 21:29:31 +00:00 
						 
				 
			
				
					
						
							
							
								Nils Adermann 
							
						 
					 
					
						
						
							
						
						d25ca29ca0 
					 
					
						
						
							
							- strip_bbcode should not treat smilies which look like BBCode and are placed in front of a closing tag as BBCode  
						
						... 
						
						
						
						- highlight in post subjects and topic titles
- language entry SMILIE_ONE_ADDED should have been SMILIES_ONE_ADDED
git-svn-id: file:///svn/phpbb/trunk@8045 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-08-17 23:53:06 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						aa3e36eb8a 
					 
					
						
						
							
							heh, ...  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@8012 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-08-06 17:12:15 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						4c4dbba46d 
					 
					
						
						
							
							Language changes, take them while they are hot.  
						
						... 
						
						
						
						#13295 
git-svn-id: file:///svn/phpbb/trunk@8009 89ea8834-ac86-4346-8a33-228a782c2dd0 
					
						2007-08-06 10:49:42 +00:00 
						 
				 
			
				
					
						
							
							
								Henry Sudhof 
							
						 
					 
					
						
						
							
						
						2ffdd92975 
					 
					
						
						
							
							#13918  
						
						... 
						
						
						
						And the language entries for the last ci.
git-svn-id: file:///svn/phpbb/trunk@7993 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-08-01 16:23:22 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						75a5162945 
					 
					
						
						
							
							again, a lot of bug fixes  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@7909 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-07-19 20:38:38 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						455536773f 
					 
					
						
						
							
							ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@7736 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-06-09 11:11:20 +00:00 
						 
				 
			
				
					
						
							
							
								David M 
							
						 
					 
					
						
						
							
						
						3899e337e6 
					 
					
						
						
							
							#11255  
						
						... 
						
						
						
						#11259 
#11291 
#11335 
#11457 
#11473 
#11475 
#11511 
#11523 
#11527 
git-svn-id: file:///svn/phpbb/trunk@7663 89ea8834-ac86-4346-8a33-228a782c2dd0 
					
						2007-05-22 21:32:26 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						08a45760b4 
					 
					
						
						
							
							#11229 ,  #11233  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@7650 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-05-19 23:39:45 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						94a91530da 
					 
					
						
						
							
							adjust smilies. Also allow adding more codes to existing smilies... no one noticed this before. :/  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@7614 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-05-17 11:59:06 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						20e008767a 
					 
					
						
						
							
							#10909  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@7572 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-05-14 17:02:07 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						26cf5c195d 
					 
					
						
						
							
							some language fixes reported.  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@7570 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-05-14 15:05:32 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						c1a738ce5f 
					 
					
						
						
							
							punctuation changes in language files  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@7524 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-05-10 15:31:35 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						f7b51337c5 
					 
					
						
						
							
							some language-specific adjustements  
						
						... 
						
						
						
						fix prune users (adding the list of users to the confirmation page)
tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element)
git-svn-id: file:///svn/phpbb/trunk@7455 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-05-03 14:29:22 +00:00 
						 
				 
			
				
					
						
							
							
								Jonathan Stanley 
							
						 
					 
					
						
						
							
						
						79120b0178 
					 
					
						
						
							
							#9889  
						
						... 
						
						
						
						When did these unwanted guests creep in? @_@
git-svn-id: file:///svn/phpbb/trunk@7365 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-04-16 17:14:18 +00:00 
						 
				 
			
				
					
						
							
							
								Jonathan Stanley 
							
						 
					 
					
						
						
							
						
						0df3802cfb 
					 
					
						
						
							
							Presentational (X)HTML tags makes Bertiezilla cire. Replaced examples with the semantically neutral "<span>" and styling them via inline CSS.  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@6942 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-01-27 18:33:26 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						ddddda47fb 
					 
					
						
						
							
							- fix some oddities (doubled spaces for example)  
						
						... 
						
						
						
						- changed the way make_forum_select() is returning the forum list - now including skipped forums but being disabled. This should make identifying the correct forum much more easier.
- Changed some permission namings based on suggestions by the community
- Tried to comply to the permission field ordering within the language files while displaying permission sets. Hopefully it's worth the additional processing time.
- Disable submit buttons after clicking for installation and conversions.
git-svn-id: file:///svn/phpbb/trunk@6930 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-01-26 16:09:51 +00:00 
						 
				 
			
				
					
						
							
							
								Meik Sievertsen 
							
						 
					 
					
						
						
							
						
						576bb754e9 
					 
					
						
						
							
							fixing some bugs, most being submitted grammatical/spelling errors.  
						
						... 
						
						
						
						git-svn-id: file:///svn/phpbb/trunk@6915 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-01-21 18:33:45 +00:00 
						 
				 
			
				
					
						
							
							
								David M 
							
						 
					 
					
						
						
							
						
						3a2a61baa4 
					 
					
						
						
							
							#6772  
						
						... 
						
						
						
						- some other random things
git-svn-id: file:///svn/phpbb/trunk@6880 89ea8834-ac86-4346-8a33-228a782c2dd0 
						
						
					 
					
						2007-01-11 05:44:22 +00:00 
						 
				 
			
				
					
						
							
							
								Oleg Pudeyev 
							
						 
					 
					
						
						
							
						
						00a69b4372 
					 
					
						
						
							
							Merge branch 'develop-olympus' into develop  
						
						... 
						
						
						
						* develop-olympus:
  [ticket/10128] Pass E_USER_WARNING to trigger_error() calls from user_ban().
  [ticket/10123] Change "smilie" to "smiley" as per our coding guidelines. 
						
						
					 
					
						2011-04-10 19:52:58 -04:00 
						 
				 
			
				
					
						
							
							
								Andreas Fischer 
							
						 
					 
					
						
						
							
						
						8a54d88509 
					 
					
						
						
							
							Merge branch 'develop-olympus' into develop  
						
						... 
						
						
						
						* develop-olympus:
  [ticket/10084] Add smilie/icon errors out when file is missing 
						
						
					 
					
						2011-04-08 12:24:59 +02:00 
						 
				 
			
				
					
						
							
							
								Igor Wiedler 
							
						 
					 
					
						
						
							
						
						c63676e802 
					 
					
						
						
							
							Merge branch 'develop-olympus' into develop  
						
						... 
						
						
						
						* develop-olympus:
  [ticket/10033] "Disallow usernames" does not check already disallowed names. 
						
						
					 
					
						2011-03-23 23:21:36 +01:00 
						 
				 
			
				
					
						
							
							
								Igor Wiedler 
							
						 
					 
					
						
						
							
						
						af5b9a9640 
					 
					
						
						
							
							[ticket/9556] Drop php closing tags, add trailing newline  
						
						... 
						
						
						
						Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .
Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;
Extensions: php, css, html, js, xml.
PHPBB3-9556 
						
						
					 
					
						2010-11-11 19:10:55 +01:00