1479 commits

Author	SHA1	Message	Date
friendica	82f2bfea5b	convert boolean or int settings to strings to work around issues with template processing	2012-03-16 16:05:16 -07:00
Simon	1246a40ec2	Merge pull request #141 from CatoTH/master ... Private messages - tabindex	2012-03-16 10:54:20 -07:00
Tobias Hößl	75823c2353	Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button	2012-03-16 17:45:07 +00:00
friendica	28f941193d	syntax error from pasted text, remove ^M's	2012-03-16 06:02:26 -07:00
friendica	224dfa848b	bug #335 network search broken after new ssl policy settings	2012-03-16 05:51:04 -07:00
friendica	7684f63ecd	track whether contact is a community page or not	2012-03-15 16:38:26 -07:00
friendica	f96aff5518	more recycle fixes for plaintext	2012-03-15 03:47:02 -07:00
friendica	9cd1c35c22	fix recycle symbol when using plaintext editor	2012-03-15 03:44:41 -07:00
friendica	b06c5983a4	don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts	2012-03-14 21:58:54 -07:00
friendica	110e8f2919	basic ssl_policy for important modules	2012-03-14 21:20:20 -07:00
friendica	f0a62d8908	ssl_policy stuff	2012-03-14 20:36:23 -07:00
friendica	531201f2a1	Merge pull request #132 from campino/master ... Test cases	2012-03-14 15:16:30 -07:00
friendica	dcdfa96a1f	Merge branch 'pull'	2012-03-14 14:34:52 -07:00
friendica	2dc527609e	Merge https://github.com/friendica/friendica into pull	2012-03-14 14:34:48 -07:00
Simon L'nu	0bf9595ab1	PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630 ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-14 11:00:20 -04:00
Alexander Kampmann	70709a8825	Merge branch 'master' of git://github.com/friendica/friendica ... Conflicts: view/de/strings.php	2012-03-14 12:57:35 +01:00
Alexander Kampmann	509532d168	get_tags tests corrected. They test for the right things now.	2012-03-14 12:30:52 +01:00
friendica	7e270b043c	addon settings form error	2012-03-13 23:52:13 -07:00
friendica	4972d7ef6e	more work on filer, comment level and file tag removal	2012-03-13 20:46:37 -07:00
friendica	de017d1ed7	sort inbox by recently replied conversations first	2012-03-13 19:27:52 -07:00
friendica	be48fff157	file as widget and basic filing implementation for duepuntozero,slackr ... much more work needed - this is just for test/evaluation currently	2012-03-13 18:13:03 -07:00
friendica	db80ffa0ff	don't count self in number of contatcs	2012-03-13 16:02:20 -07:00
friendica	427362c324	Merge branch 'pull'	2012-03-13 15:41:13 -07:00
friendica	dc84da520d	invite potential connectees to the free social web	2012-03-13 15:40:16 -07:00
Tobias Hößl	59766b944c	Some security against XSRF-attacks	2012-03-12 20:17:37 +00:00
Tobias Hößl	9574f7df03	Merge branch 'master' of git://github.com/friendica/friendica	2012-03-12 19:06:45 +00:00
Alexander Kampmann	bce3bfff38	get tags test improved	2012-03-12 13:59:00 +01:00
friendica	93058af4fc	backend for "save to file" feature	2012-03-11 20:19:56 -07:00
friendica	d9bee73edf	community meta tag renamed from "ika"	2012-03-11 15:50:23 -07:00
Tobias Hößl	4df08433c6	Merge branch 'master' of git://github.com/friendica/friendica	2012-03-11 11:27:47 +00:00
friendica	d9c5d9d2eb	default the text template var on conversations	2012-03-10 15:53:36 -08:00
friendica	1bddd48661	bug #327 - composed private message is lost if no recip specified.	2012-03-10 15:50:51 -08:00
Michael Johnston	fd1f8fb436	allow user to set number of items to show on network page	2012-03-09 21:29:39 -05:00
Alexander Kampmann	f8042d0445	splitted test cases.	2012-03-09 12:57:11 +01:00
friendica	42d622d6bf	recover contacts total count which got lost	2012-03-09 02:50:57 -08:00
Tobias Hößl	635958e11d	Merge branch 'master' of git://github.com/friendica/friendica	2012-03-09 10:00:12 +00:00
friendica	3878b58f0d	bug #324 - tinymce used for mail even if editplain being used.	2012-03-09 00:47:10 -08:00
friendica	03b5e3aa0c	reworked fix from unary for bug #323 (due to incorrect use of array_key_exists())	2012-03-07 21:12:31 -08:00
friendica	7ad2dd6565	fix photos after permissions_sql change	2012-03-06 17:52:00 -08:00
friendica	88cd5800cf	[privacy] rework latest fix	2012-03-06 17:21:14 -08:00
friendica	39a49d51e3	remove stray debugging	2012-03-06 16:28:52 -08:00
friendica	7431bd9509	fix html reshares when editplain in use	2012-03-06 15:28:27 -08:00
friendica	a464e4d33f	search should be ok, but a little extra security won't hurt	2012-03-06 15:15:59 -08:00
friendica	21887a36fd	[PRIVACY] privacy issue bug #314	2012-03-06 14:53:14 -08:00
friendica	8fb0ea4048	bugs #312, #313	2012-03-06 14:27:53 -08:00
friendica	23460302f5	some admin page fixes and cleanup	2012-03-05 18:51:21 -08:00
Tobias Hößl	02a9fd5dc1	A 'PHP Fatal error: Call to a member function getElementsByTagName() on a non-object in mod/parse_url.php on line 191' occurred when the linked HTML-File doesn't have a HEAD. The HTML-file couln't be link to in the editor therefore.	2012-03-03 10:44:34 +00:00
Fabio Comuni	5fc3c3ab85	group: fix create new group form	2012-03-02 15:40:17 +01:00
Fabio Comuni	b6b7742579	Merge remote-tracking branch 'friendica/master' into randomerror	2012-03-01 11:47:45 +01:00
Fabio Comuni	f0b6e76293	admin: fix small string	2012-03-01 11:28:48 +01:00