205 commits

Author	SHA1	Message	Date
friendica	593d361d2e	profile/channel page view contacts	2012-11-09 00:02:46 -08:00
friendica	22841e1566	start implementing zot-id	2012-11-08 19:07:19 -08:00
friendica	55df0452b6	finish off like/dislike localisation except for zrl/magic_link	2012-11-06 16:16:26 -08:00
friendica	3c04676a32	get posts to show up	2012-10-07 21:44:11 -07:00
friendica	e124c9fa5c	Can't see any posts currently - after the big shakeup, but we can now post top level activities and store them.	2012-10-03 22:28:19 -07:00
friendica	846a9813b2	here's where the heavy lifting begins - everything is likely to be broken for quite some time as we add location and db independence to items and conversations and work through the rest of the permissions and how to federate the buggers.	2012-10-01 18:02:11 -07:00
friendica	fbafd92f7f	moving a lot of structure around. 'entity' is now 'channel'	2012-09-25 17:57:20 -07:00
friendica	e4f3e96b65	remove targeted windows	2012-09-09 21:26:36 -07:00
friendica	2df083efb1	rev update	2012-09-03 22:32:35 -07:00
friendica	eac29badb2	start on contacts/profiles	2012-08-30 18:17:38 -07:00
friendica	f6d198ce5d	trim a bit of fat	2012-08-29 23:03:03 -07:00
friendica	5ff6e9348b	a few minor changes	2012-08-26 23:05:00 -07:00
friendica	2456174cc9	back to identity creation form	2012-08-23 20:00:10 -07:00
friendica	2358a220ba	merge from upstream	2012-08-15 20:01:55 -07:00
friendica	2a49460c77	improvements in js localisation/translation	2012-08-13 22:12:16 -07:00
friendica	184cf51d2f	reduce duplication - only provide one system language setting	2012-08-12 20:56:23 -07:00
friendica	0292d46e5d	merge comment threading, provide plugin/theme functions to handle css/js includes	2012-08-09 16:26:44 -07:00
friendica	dcbc0c0c95	major theme re-org, only duepuntozero and slackr working atm	2012-08-01 05:02:43 -07:00
friendica	65160ffd12	functions to generate and check webbies interactively	2012-07-30 21:51:25 -07:00
friendica	4b36e41b09	implement page update modes	2012-07-23 20:49:56 -07:00
friendica	6e08f39820	simplify	2012-07-21 03:48:59 -07:00
friendica	49c0e0de9b	sync changes	2012-07-19 18:53:26 -07:00
friendica	d92a4a686d	eliminate the obsolete "last-child" indicator	2012-07-18 17:08:03 -07:00
friendica	54ffc32d7c	working towards getting rid of item['tag'] and item['file'] - still some dependencies	2012-07-16 21:52:26 -07:00
friendica	aeaccb03ba	make network tag and personal searches work again	2012-07-16 21:07:59 -07:00
friendica	03209d2d0d	updates	2012-07-14 20:39:46 -07:00
friendica	e7957e1448	create fetch_tags function, make search work again, change logo	2012-07-10 19:28:02 -07:00
friendica	94fabe3a29	upstream fixes and a lot of taxonomy stuff	2012-07-10 06:28:02 -07:00
friendica	4b066e04f6	making tags work	2012-07-09 22:08:25 -07:00
friendica	5589bca1e0	fix !@#$ tinymce linebreaks for the thousandth time	2012-07-04 17:15:43 -07:00
friendica	dd71f9446b	config to disable email validation	2012-07-01 18:56:00 -07:00
friendica	a3edbf7e5d	create third privacy state - public post but not searchable or publicly visible	2012-06-28 17:43:29 -07:00
friendica	43d3721fa9	css smiley class	2012-06-28 16:42:40 -07:00
friendica	7d8b087f4a	fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them.	2012-06-13 19:59:20 -07:00
friendica	832d9eeaaf	more fixes	2012-06-12 16:17:34 -07:00
friendica	24e85c95b6	date based profile wall filter - backend	2012-06-11 19:36:04 -07:00
friendica	4978ee12d1	webfinger profile linker	2012-06-02 18:05:23 -07:00
friendica	15c023a218	y didn't i think of this b4?	2012-05-30 17:22:51 -07:00
Simon L'nu	789063da39	add a placeholder attribute on search-text; dispy fixes ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-23 15:58:22 -04:00
friendica	a163825291	redir links for permission controlled attachments	2012-05-21 22:54:39 -07:00
friendica	70a07086ad	slight improvement in a couple of queries	2012-05-08 22:46:40 -07:00
friendica	d0dd22af57	workaround to clean up orphaned filetags	2012-05-04 17:43:47 -07:00
friendica	7c6e8b30b2	only show remove category to item owner	2012-05-04 16:45:10 -07:00
friendica	10754ced3e	category removal	2012-05-04 06:42:56 -07:00
friendica	26c53580d1	implement contact archival	2012-04-27 17:17:58 -07:00
Fabio Comuni	4496d075e5	move html out of lang_selector() and new template lang_selector.tpl	2012-04-13 11:56:21 +02:00
friendica	9b1bb53234	fix_mce_lf on profiles	2012-04-10 16:31:49 -07:00
friendica	3a1c78bd75	some work on tests	2012-04-07 01:04:45 -07:00
friendica	221726392e	pass autoname(0) test	2012-04-05 18:44:36 -07:00
friendica	62e528ba43	remove zrl from query string	2012-04-02 00:45:45 -07:00
friendica	1f74bd1b78	catch a couple more Oo smilies	2012-04-01 22:57:50 -07:00
Michael Johnston	581b54c974	allow users to set categories on their posts	2012-04-01 21:28:31 -04:00
friendica	53f799f2bc	handle escaped file chars in display and search	2012-03-31 15:25:17 -07:00
friendica	0cf2e051bb	escape % in file_tag_query as it is ultimately embedded in a sprintf	2012-03-31 14:48:35 -07:00
friendica	8c928e67ba	warning cleanup	2012-03-30 23:18:46 -07:00
friendica	bb8beb26b4	use zrl to get home again	2012-03-29 20:58:32 -07:00
Michael Vogel	bdd2754740	Merge commit 'upstream/master'	2012-03-28 19:52:30 +02:00
Fabio Comuni	7aec2fd68d	filer: info() on item filed	2012-03-28 10:45:16 +02:00
friendica	528d795fb6	ability to change tags in edited posts	2012-03-22 16:17:10 -07:00
friendica	d81256d7b0	support lowercase :-p smilie	2012-03-21 21:45:45 -07:00
Thomas	84f8e2eaa8	modified: include/text.php ... Stupid bug fixed	2012-03-19 22:32:19 +00:00
Thomas	e9b33a6f1f	modified: include/text.php ... deleted: images/diaspora.png deleted: images/smiley-bangheaddesk.gif deleted: images/smiley-beard.png deleted: images/smiley-shaka.gif deleted: images/smiley-whitebeard.png Removed selected smiley per Mike's request. Also removed deprecated smileys that were just commented out.	2012-03-19 21:59:06 +00:00
friendica	139a86dbd3	some openid fixes, use identity url from openid server and normalise it.	2012-03-19 06:48:11 -07:00
friendica	2349852b4a	support "no_smilies"	2012-03-19 03:18:39 -07:00
friendica	67fd539f53	bug #337, call template_unescape() only at the end of template processing	2012-03-17 18:15:36 -07:00
Michael Vogel	f5db142d93	Quotes with author are now having an "open/close" link	2012-03-17 12:15:59 +01:00
Michael Vogel	8a1f175df0	New bbcode element: "spoiler". Mail: Top post quotes are now embraced in "spoiler" elements	2012-03-17 11:07:49 +01:00
friendica	224dfa848b	bug #335 network search broken after new ssl policy settings	2012-03-16 05:51:04 -07:00
Michael Vogel	9243c9fc14	Merge commit 'upstream/master'	2012-03-15 21:11:58 +01:00
friendica	4972d7ef6e	more work on filer, comment level and file tag removal	2012-03-13 20:46:37 -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	5a41676465	initial tag display for categories and save-to-file - suitable for testing but needs cleanup, links to delete term, and theming.	2012-03-13 04:04:26 -07:00
friendica	3bc990f718	more save to file backend	2012-03-11 21:32:11 -07:00
friendica	93058af4fc	backend for "save to file" feature	2012-03-11 20:19:56 -07:00
Michael Vogel	9f76d96d46	Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.	2012-03-11 19:11:25 +01:00
Michael Vogel	670b571c8a	Caching improved.	2012-03-10 18:19:00 +01:00
Michael Vogel	74b3e9f273	Enabled Caching for items. Changed color of tags in diabook.	2012-03-10 15:50:35 +01:00
Simon L'nu	415ca107fd	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' ... * remotes/upstream/master: fix html reshares when editplain in use * master:	2012-03-06 18:38:44 -05:00
Thomas	67456bad06	Fixed...merged with mainline THEN added beards.	2012-03-06 20:50:38 +00:00
Thomas	a265afe7eb	added beard smileys	2012-03-06 20:44:53 +00:00
friendica	eec4cff84b	remove "smilie" expansion for Diaspora logo	2012-03-06 04:28:45 -08:00
Fabio Comuni	60e5dda1b5	template proc: first optimization	2012-03-02 12:24:35 +01:00
friendica	f1bf6dcdfb	expand multiple heart smilies e.g. <3333	2012-03-02 01:24:20 -08:00
friendica	bd2c8c92f1	yet more work on notifications	2012-02-29 19:23:01 -08:00
Tobias Hößl	ac86407fdf	Bugfix	2012-02-26 20:43:35 +00:00
friendica	390eb15e7d	never enough documentation	2012-02-22 01:50:06 -08:00
friendica	91c3349025	escape smiley conversion in code and pre blocks	2012-02-21 23:13:03 -08:00
friendica	6edd6d8ae1	Merge branch 'pull'	2012-02-20 18:07:16 -08:00
friendica	11871195be	fix twitter title showing up occasionally	2012-02-20 18:06:43 -08:00
Abinoam P. Marques Jr	03834b2433	text.php - Friendika -> Friendica (just to prepare for deprecate the friendika.png at the future)	2012-02-20 19:38:42 -03:00
Simon L'nu	49179f9033	add :headdesk and fix doc/Pages.md to remove the absolute URL to / ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-02-19 05:17:26 -05:00
friendica	4222f506a8	deprecating two-char smilies	2012-02-17 23:44:25 -08:00
friendica	7dcef67492	facepalm smiley	2012-02-16 15:15:28 -08:00
fabrixxm	16f00cb73b	Merge pull request #36 from fabrixxm/master ... Missing icons in 'quattro' and ajax events calendar	2012-02-15 03:51:44 -08:00
Fabio Comuni	fe3e8ee854	quattro: icons for attachments	2012-02-15 11:10:02 +01:00
friendica	03171fd7de	preliminary qcomment support, [nosmile] tag to disable smiley processing	2012-02-14 23:13:18 -08:00
friendica	134fdda75f	refactor smilie code to allow for extensions and generation of a table of the entire list	2012-02-14 15:31:08 -08:00
Vasudev Kamath	e4b1c07727	cry, foot in mouth, cool, undecided and embarassed smiley's are mapped	2012-02-14 23:10:11 +05:30
friendica	330a876d81	bug #281	2012-02-12 14:18:32 -08:00
Vasudev Kamath	495d0fb80f	Merge branch 'master' of git://github.com/friendica/friendica	2012-02-12 15:06:41 +05:30