7927 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
fermionic	1b74e3ff10	Merge pull request #644 from fermionic/20130303-no-embedding-private-images-option ... fix disable embedding option description	2013-03-04 15:57:57 -08:00
Zach Prezkuta	277c47732b	fix disable embedding option description	2013-03-04 16:55:07 -07:00
Michael Vogel	86e19dda22	Vier: Some more changes to the theme. ... Added a switch to suppress displaying of the tags.	2013-03-05 00:46:11 +01:00
Michael Vogel	8bb6b51967	Vier: Some more transition effects	2013-03-04 21:11:31 +01:00
Michael Vogel	421d484839	Merge remote-tracking branch 'upstream/master'	2013-03-04 00:05:17 +01:00
Michael Vogel	478a079665	Vier: Further changes: profile border is rounded.	2013-03-04 00:04:06 +01:00
Michael Vogel	8e1d253568	OStatus conversation: now the creation date of the item is store with the conversation ... vier: The link color and the color of the top bar is changed.	2013-03-03 23:44:50 +01:00
friendica	631085462e	Merge pull request #642 from oohlaf/master ... Ignore invalid tokens when scraping an URL	2013-03-03 14:38:17 -08:00
Olaf Conradi	77f4a36d90	Ignore invalid tokens when scraping an URL	2013-03-03 21:41:27 +01:00
friendica	1c55b0b359	Merge pull request #639 from annando/master ... Community/Open Graph	2013-03-03 12:07:52 -08:00
friendica	ee70e02d0d	Merge pull request #640 from fermionic/20130303-no-embedding-private-images-option ... allow admin to prevent private image embedding on hub	2013-03-03 12:07:35 -08:00
friendica	2c1729e7a8	Merge pull request #641 from oohlaf/master ... Fix SQL error	2013-03-03 12:06:10 -08:00
Olaf Conradi	aa7aa59def	Fix SQL error for missing AND operator ... AND operator was missing from WHERE clause	2013-03-03 20:44:52 +01:00
Michael Vogel	00888a73bb	OStatus conversation: Prevent posting loops	2013-03-03 17:58:35 +01:00
Zach Prezkuta	0187283709	allow admin to prevent private image embedding on hub	2013-03-03 09:44:41 -07:00
fermionic	ee263aec55	Merge pull request #636 from fabrixxm/installer/checkphpcli ... install: add check for php-cli	2013-03-03 07:51:51 -08:00
fermionic	ef39edd845	Merge pull request #638 from tobiasd/issue_197 ... put edited meta info in item object to give theme developers the chance ...	2013-03-03 07:48:51 -08:00
Michael Vogel	05597b564d	Merge remote-tracking branch 'upstream/master'	2013-03-03 16:30:18 +01:00
Tobias Diekershoff	4e68a6b3e0	typo	2013-03-03 12:02:45 +01:00
Tobias Diekershoff	0b925899d4	put edited meta info in item object to give theme developers the chance to display this in a fancy way	2013-03-03 11:47:01 +01:00
friendica	583e82aeb5	Merge https://github.com/friendica/friendica into pull	2013-03-02 15:47:23 -08:00
friendica	f07df4f667	merge	2013-03-02 15:46:54 -08:00
friendica	59c03edbc9	fix util/config	2013-03-02 15:44:00 -08:00
Michael Vogel	2866f62c88	Suppoorting Open Graph and Dublin Core when displaying single item ... Following link shorteners in parse_url	2013-03-02 14:46:06 +01:00
Thomas Willingham	7e7e88d4ad	Add sample lighttpd config, from the mailing list.	2013-03-01 19:55:33 +00:00
fabrixxm	40f61f7841	Merge pull request #637 from fabrixxm/lang/it ... update IT strings	2013-03-01 08:29:02 -08:00
Fabrixxm	1524c15ba5	update IT strings	2013-03-01 11:27:43 -05:00
Tobias Diekershoff	c54b61cf81	DE: update to the strings	2013-03-01 16:24:58 +01:00
Fabrixxm	4791e5b245	install: add check for php-cli ... Check won't pass if $php -v won't return "(cli)"	2013-03-01 04:43:04 -05:00
fermionic	78cc56309b	Merge pull request #633 from tobiasd/admin-info-themes ... Admin info themes	2013-02-28 17:00:56 -08:00
fabrixxm	570f67187d	Merge pull request #635 from fabrixxm/addonlangs ... fix bug in run_xgettext, update messages.po	2013-02-28 07:16:18 -08:00
Fabrixxm	3d3aebeda1	fix bug in run_xgettext, update messages.po	2013-02-28 10:14:40 -05:00
Tobias Diekershoff	a84e9196fb	ZH-CN: update to the strings	2013-02-28 08:59:06 +01:00
Tobias Diekershoff	56b8118485	PL: update to the strings	2013-02-28 08:55:38 +01:00
Tobias Diekershoff	cd478ecdca	exp account info in decaf-mobile	2013-02-28 08:10:05 +01:00
Tobias Diekershoff	42a054c667	exp account info in frost-mobile	2013-02-28 08:07:41 +01:00
Tobias Diekershoff	209ebd4e74	exp account info in frost	2013-02-28 08:03:34 +01:00
Tobias Diekershoff	36959cfc4b	exp accounts info in diabook	2013-02-28 08:01:37 +01:00
friendica	079c638403	Merge pull request #631 from fabrixxm/addonlangs ... Per addon translation	2013-02-27 16:53:08 -08:00
friendica	90a596339d	Merge pull request #632 from beardy-unixer/master ... Add support for members-only apps menu	2013-02-27 16:51:56 -08:00
Thomas Willingham	f5d15a7ff8	Add support for members-only addons	2013-02-28 00:29:06 +00:00
Fabrixxm	d302bd070c	add check for false returned by query in load_translation_table	2013-02-27 10:16:05 -05:00
Fabrixxm	7b01e735ae	move load_traslation_table after db setup	2013-02-27 10:15:09 -05:00
Fabrixxm	5214eb2bda	update util/messages.po	2013-02-27 09:44:05 -05:00
Fabrixxm	a1746a9fd2	run_xgettext: check for dir before run xgettext	2013-02-27 09:42:20 -05:00
Fabrixxm	057110e08b	update strings, add plural select function definition check	2013-02-27 09:36:25 -05:00
pixelroot	e1c24377ee	new file: view/theme/smoothly/images/larrow.gif ... new file: view/theme/smoothly/images/rarrow.gif	2013-02-27 14:27:41 +01:00
pixelroot	43e88508c9	modified: view/theme/smoothly/login.tpl ... modified: view/theme/smoothly/smarty3/login.tpl modified: view/theme/smoothly/smarty3/wall_thread.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php modified: view/theme/smoothly/wall_thread.tpl	2013-02-27 14:27:06 +01:00
Fabrixxm	9d99a531b9	update translation utils: ... po2php: add "if function_exists" around plural select function run_xgettext: add option to extract strings from addon folder	2013-02-27 08:25:03 -05:00
Fabrixxm	cd8346694b	load_translation_table: load translation strings from enabled plugins	2013-02-27 08:23:00 -05:00