| 
							
							
								 Friendika | 0bf8e418a8 | Merge branch 'chriscase-master' Conflicts:
	mod/dfrn_notify.php | 2011-02-17 14:05:51 -08:00 |  | 
			
				
					| 
							
							
								 Chris Case | 9e654f7e57 | removed localized multipart email templates, now the multipart settings are configured directly in the code | 2011-02-17 13:41:56 -08:00 |  | 
			
				
					| 
							
							
								 Fabio Comuni | f5557763d2 | Updates to theme dupuntozero | 2011-02-17 17:29:29 +01:00 |  | 
			
				
					| 
							
							
								 Friendika | 67bb737aa1 | broken image + linkify site link in body | 2011-02-16 17:49:52 -08:00 |  | 
			
				
					| 
							
							
								 Friendika | 9f1f9da89b | Merge branch 'chriscase-master' | 2011-02-16 14:41:12 -08:00 |  | 
			
				
					| 
							
							
								 Chris Case | 5aa6bbbbc5 | fixed encoding, i had been experimenting with different ones and forgot to change it back, now UTF-8 | 2011-02-16 08:05:54 -08:00 |  | 
			
				
					| 
							
							
								 Chris Case | e56895123a | changed message sending to use base64 encoding | 2011-02-16 05:17:40 -08:00 |  | 
			
				
					| 
							
							
								 Friendika | 9f02057374 | provide permalink for posts, include permalinks in feeds and imported from feeds | 2011-02-16 02:07:11 -08:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 7a6174298b | deleted the translated file of comment_item.tpl | 2011-02-15 10:56:07 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | afdfc725b8 | some translations into German | 2011-02-15 09:49:38 +01:00 |  | 
			
				
					| 
							
							
								 Friendika | 0e7b09b41c | bug #0000002, strip HTML from pasted text in prv messages | 2011-02-14 21:33:17 -08:00 |  | 
			
				
					| 
							
							
								 Chris Case | 94e0c3c970 | fixed the charset on the html version of the message, overlooked this in the last commit, now uses utf-8 in the meta tag | 2011-02-14 04:54:44 -08:00 |  | 
			
				
					| 
							
							
								 Chris Case | 5eebb373e5 | revamped private message templates, added multipart messages with text and html versions, updated de, en, fr and it.  Translated the french version of the private message template. | 2011-02-14 03:59:54 -08:00 |  | 
			
				
					| 
							
							
								 Friendika | 5e02519a13 | disable network toggles when ACL's are entered | 2011-02-11 04:32:38 -08:00 |  | 
			
				
					| 
							
							
								 Friendika | c16e86add8 | toggles "post to facebook, post to twitter", etc. | 2011-02-11 02:35:19 -08:00 |  | 
			
				
					| 
							
							
								 Friendika | e06cd399b7 | close tag on favicon link missing | 2011-02-07 23:28:41 -08:00 |  | 
			
				
					| 
							
							
								 Friendika | 147d7f3bbf | theme name cleanup - rename default to loozah, provide sane fallbacks and change system primary theme. Provide indication on contact edit page of last update success/failure - can be extended later to
show actual timestamp of last successful update. | 2011-02-06 15:50:50 -08:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 09af200bcc | german choose existing pic for the avatar | 2011-02-06 08:51:10 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | dd3f21b98a | Merge branch 'master' of git://github.com/friendika/friendika | 2011-02-06 08:48:07 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | acd5f49d43 | wording | 2011-02-04 21:56:43 +01:00 |  | 
			
				
					| 
							
							
								 Fabio Comuni | fb7959cfc0 | Add a link to user photos in Upload Profile Photo page | 2011-02-04 10:30:56 +01:00 |  | 
			
				
					| 
							
							
								 Friendika | e2c8bedfe5 | allow changing album name in photo edit page | 2011-02-03 15:13:38 -08:00 |  | 
			
				
					| 
							
							
								 Friendika | a4cbdc2414 | remove self | 2011-02-03 03:58:47 -08:00 |  | 
			
				
					| 
							
							
								 Friendika | 01c83f0e93 | Merge branch 'tobiasd-master' | 2011-02-02 23:55:16 -08:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 5e73f9da86 | double $ in de/strings.php corrected | 2011-02-03 08:35:23 +01:00 |  | 
			
				
					| 
							
							
								 Friendika | 1558cd8085 | Merge branch 'tobiasd-master' | 2011-02-02 23:27:12 -08:00 |  | 
			
				
					| 
							
							
								 Friendika | 33b2490a91 | Merge branch 'fabrixxm-master' | 2011-02-02 23:24:04 -08:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 73c2ccbc78 | updates to the German strings.php file | 2011-02-03 08:17:07 +01:00 |  | 
			
				
					| 
							
							
								 Friendika | 2a4d1fa858 | append jotplugin tools to current toolbar row | 2011-02-02 23:07:01 -08:00 |  | 
			
				
					| 
							
							
								 fabrixxm | 670dba6666 | update jot-headers | 2011-02-01 18:52:16 +01:00 |  | 
			
				
					| 
							
							
								 Friendika | 837cce8a75 | email cc recipients (front end) | 2011-01-31 19:07:13 -08:00 |  | 
			
				
					| 
							
							
								 Friendika | 3eefe8b500 | more ssl_policy cleanup, allow manual feed update per contact when hub is whacked, log feed parse errors | 2011-01-30 19:38:03 -08:00 |  | 
			
				
					| 
							
							
								 Friendika | d2dddd995a | set update frequency to twice daily for 'feed' contacts, unable to set update frequency on contact edit form. | 2011-01-26 20:29:32 -08:00 |  | 
			
				
					| 
							
							
								 Friendika | b4642ca650 | search icons (?) | 2011-01-26 14:25:36 -08:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 529b036dbe | some more strings translated into German | 2011-01-25 12:44:14 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 43dc0b4280 | updated profile_advanced.php from changes in view/en | 2011-01-23 08:45:30 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 96620520a8 | wording in email template adjusted | 2011-01-22 09:20:52 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 3f847d5b0f | variable name spelling mistake in template corrected | 2011-01-21 14:55:03 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 61f0a0d903 | more strings | 2011-01-21 13:18:51 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 258c79ccd9 | spelling ;-) | 2011-01-21 13:01:19 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | ac845a1d95 | minor wordening | 2011-01-21 12:59:51 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 991185404c | minor wording correction | 2011-01-21 12:54:07 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 734476c5e2 | minor correction to profile_edit.tpl more strings | 2011-01-21 12:46:33 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | b23c941991 | made this notification header consisten with the other | 2011-01-21 12:34:25 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | a2723f8206 | minor thing with the strings | 2011-01-21 12:19:57 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 6a87fe4a0f | german translation of registrations-top.tpl | 2011-01-21 12:15:43 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | 55fb33d85d | some more strings | 2011-01-21 12:05:26 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | c61defb2b0 | german translation of install_db.tpl | 2011-01-21 11:54:04 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | ffdcbd798f | german translation of jot.tpl | 2011-01-21 11:48:42 +01:00 |  | 
			
				
					| 
							
							
								 Tobias Diekershoff | a3ef818d1d | german translation of lostpass.tpl and lostpass_eml.tpl | 2011-01-21 11:36:30 +01:00 |  |