friendica

Author	SHA1	Message	Date
friendica	fd626022ec	add smarty engine, remove some obsolete zot1 stuff	2012-07-03 22:23:08 -07:00
Thomas Willingham	badaa68340	Diabook directory wide variants.	2012-07-04 01:08:50 +01:00
Zvi ben Yaakov (a.k.a rdc)	424797138f	Limiting .directory-photo-wrapper styles to <section> so as not to interfere with .directory-photo-wrapper in <aside>	2012-07-03 21:49:02 +03:00
friendica	f7144e671c	fix diabook directory pages (only the normal style - any volunteers for the wide?)	2012-07-02 16:56:37 -07:00
Thomas Willingham	74a819980f	Various theme stuff. Profile group list for testbubble Screenshot for facepark Various niggles in darkzero/NS	2012-07-02 03:40:12 +01:00
friendica	696d78d658	Merge pull request #369 from rdc/master Added more profile data and CSS styling to the /directory page	2012-07-01 16:44:21 -07:00
Martin Schmitt	85c078f862	Esperanto -> 100%	2012-07-01 19:13:24 +02:00
Zvi ben Yaakov (a.k.a rdc)	2214cd74e5	Added more profile data and CSS styling to the /directory page	2012-07-01 14:46:03 +03:00
friendica	31718968c6	advanced profile theming	2012-06-30 01:29:29 -07:00
Fabrixxm	a03e6b96ea	quattro: fix Forum widget, hide edit profile link	2012-06-29 05:47:53 -04:00
Fabrixxm	8b18ee49ff	quattro: some updates - add makefile to rebuild both css with single command - fix icons in Forums widget - style photos pages	2012-06-29 05:29:58 -04:00
friendica	be658788de	maintain page position when hovering on pop-outs	2012-06-28 22:19:12 -07:00
Simon L'nu	ecf9ad9a08	fix item-delete-selected* css Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-06-28 12:15:32 -04:00
friendica	eb3bbd9081	insidious little parsing bug	2012-06-26 22:32:07 -07:00
friendica	f995a11641	have no idea why the if/endif macro block was getting printed and not processed.	2012-06-26 21:35:03 -07:00
friendica	fa2a8fa9bd	highlight js events-reminder on birthday events	2012-06-27 13:49:35 +10:00
friendica	359a98cd22	change event behaviour so that title is required but description is not	2012-06-25 21:20:08 -07:00
friendica	fbaca4b742	event summary/title	2012-06-25 20:55:27 -07:00
Simon L'nu	eb6bf7e7fa	fix margin of wall-item-body Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-06-25 18:42:18 -04:00
Simon	d944ff7833	Merge pull request #361 from simonlnu/master cleaned up the css a bit	2012-06-25 14:25:33 -07:00
Simon L'nu	2ed3af55a8	fix delete thingy, and minor clean up Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-06-25 17:17:06 -04:00
Zvi ben Yaakov (a.k.a rdc)	51ef8fb7ff	Added App::get_cached_avatar_image usage for displaying "Last users" avatar thumbs in right sidebar	2012-06-25 14:01:16 +03:00
friendica	35a098e0dc	service limits for photo uploads	2012-06-25 01:37:44 -07:00
friendica	ad6c82bdea	implement "follow" service limits	2012-06-24 22:23:17 -07:00
friendica	c464bc494c	add like/dislike to profiles	2012-06-24 21:16:55 -07:00
Simon L'nu	3b1d9d9695	update jquery to 1.7.2; fix some dispy templates to be more in sync with view/ Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-06-23 13:33:58 -04:00
friendica	7614d35cad	liking comments backend	2012-06-23 04:44:48 -07:00
Vasudev Kamath	6e4760dd9c	Merge branch 'master' of git://github.com/friendica/friendica	2012-06-23 08:11:35 +05:30
Simon L'nu	5cfa7dd041	minor tweaks to some tpl files Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-06-22 13:07:42 -04:00
Zach Prezkuta	54c76ca822	allow rotation either CW or CCW	2012-06-20 20:51:03 -06:00
Thomas Willingham	75e82dc077	Darkzero-NS fix weeks old BBIcon error	2012-06-21 03:14:41 +01:00
Thomas Willingham	c4df339b92	Darkzero/NS - make the archives font the same colour as the other widgets.	2012-06-21 02:42:38 +01:00
Simon L'nu	0be715d271	icon change; tweak button in toolbar; move site-location Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-06-20 05:04:04 -04:00
tobiasd	79357ec60d	Merge pull request #342 from fabrixxm/master quattro: auto scroll and flash comment in display page	2012-06-19 10:12:09 -07:00
friendica	8b502bb486	position tweak	2012-06-19 03:34:31 -07:00
Tobias Diekershoff	c2842efd3f	[DE] strings	2012-06-19 08:44:11 +02:00
Fabio Comuni	4c6a432130	quattro: in post display page, scroll to and flash selected comment	2012-06-19 06:54:41 +02:00
friendica	d614089582	make subdued elements jump out at you on hover	2012-06-17 22:50:02 -07:00
friendica	40e6d87d08	highlight the lost contact message	2012-06-14 17:41:24 -07:00
friendica	8c94fa23bf	Merge https://github.com/friendica/friendica into pull	2012-06-14 17:39:17 -07:00
friendica	be090cc851	better handling of dead contacts	2012-06-14 16:56:46 -07:00
fabrixxm	2f5e891cd1	quattro theme: show uncollapsed comments on display page	2012-06-14 09:25:18 -04:00
friendica	4229debff8	ajax append placeholder, fix some html warnings	2012-06-13 21:40:02 -07:00
friendica	920ea2e1c7	archive widget	2012-06-12 20:46:30 -07:00
Vasudev Kamath	11974b4d94	Merge branch 'master' of git://github.com/friendica/friendica	2012-06-11 20:47:11 +05:30
Simon L'nu	1605bcd901	minor template update Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-06-09 18:07:19 -04:00
friendica	52d90674ea	better events-reminder theming	2012-06-07 18:08:15 -07:00
fabrixxm	1d832618a4	fix a random profile error message	2012-06-07 08:49:33 -04:00
friendica	d2e86bdabc	Merge https://github.com/friendica/friendica into pull	2012-06-06 22:29:35 -07:00
friendica	3b49035636	admin page untranslated strings, remove empty list element for update	2012-06-06 22:28:30 -07:00
zottel	6a95d483c7	A few corrections in German translations.	2012-06-07 01:43:32 +02:00
friendica	dd001e32f4	rev update	2012-06-06 16:02:10 -07:00
friendica	ae08d2c49b	Merge https://github.com/friendica/friendica into pull	2012-06-05 17:59:49 -07:00
Tobias Diekershoff	c7b1b4b752	DE: update for the strings	2012-06-05 11:42:57 +02:00
Vasudev Kamath	079fdecff1	Merge branch 'master' of git://github.com/friendica/friendica	2012-06-04 19:59:23 +05:30
friendica	fe1dc1bf98	named anchors on display page	2012-06-04 04:28:20 -07:00
Tobias Diekershoff	b13c6ea9ad	quattro: added editor buttons to comments	2012-06-04 11:49:16 +02:00
Vasudev Kamath	12474e3c2e	Merge branch 'master' of git://github.com/friendica/friendica	2012-06-04 12:04:17 +05:30
Tobias Diekershoff	ca105f1c66	quattro: cleanup the less file	2012-06-04 07:17:23 +02:00
Simon L'nu	34f210bc2d	fix mini photo-menu bug Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-06-03 18:10:04 -04:00
Zach Prezkuta	77962aa79d	Fix bugs in the retraction code Currently, the following seems to be the functional status: For a Diaspora top-level post: Friendica comments show up AND delete Diaspora comments show up AND delete for top-level owner Diaspora comments show up for non-owner Diaspora comments sometimes don't delete for non-owner -> Appears to be Diaspora's fault, as a "not a valid object" error shows up in the log Friendica likes show up, but can't unlike (Friendica doesn't even message Diaspora) Diaspora likes show up Diaspora non-owner can't unlike -> Same as comments, seems to be Diaspora's fault For a Friendica top-level post: Friendica comments show up AND delete Diaspora comments show up AND delete Friendica likes don't show up in Diaspora sometimes Friendica doesn't even message Diaspora for unlikes (sometimes?) Diaspora likes and unlikes work	2012-06-03 14:53:30 -06:00
Zach Prezkuta	c0af6dbb1a	Implement relaying of relayable_retractions Also: some whitespace cleanup, fix Diaspora parent DB query	2012-06-03 14:53:29 -06:00
Tobias Diekershoff	959b264c44	quattro: admin panel styling and 1st buttons for addon/theme overview	2012-06-03 22:32:42 +02:00
Tobias Diekershoff	2741ce67f8	privacy settings: make submit button translateable	2012-06-03 17:38:05 +02:00
Tobias Diekershoff	283524d990	DE: update to the strings	2012-06-03 17:33:28 +02:00
Tobias Diekershoff	6fbeafc843	prv messages: make submit translateable	2012-06-03 17:16:29 +02:00
friendica	d27c6de84e	add hometown to profiles	2012-06-02 20:58:20 -07:00
friendica	608d424b0b	"howlong" added to marital status.	2012-06-02 02:30:26 -07:00
friendica	1180919c89	some zero theming on settings page	2012-05-30 16:30:51 -07:00
friendica	bdcb8d27dd	transition to beta for private forums	2012-05-30 15:52:17 -07:00
friendica	88a0d6a1d5	private group tests, cont.	2012-05-29 22:57:15 -07:00
friendica	b6fe837a64	hide private group if desired	2012-05-29 18:43:56 -07:00
Simon	43c185ce04	Merge pull request #316 from annando/master Speed improvements	2012-05-29 13:13:10 -07:00
Simon L'nu	dd666e93d8	fix toolbar. more size dynamicism Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-29 16:09:02 -04:00
Michael Vogel	68757f2504	Merge remote branch 'upstream/master'	2012-05-29 16:09:26 +02:00
friendica	2eafa9a475	ability to only expire contacts, not self	2012-05-29 01:14:53 -07:00
friendica	2dc7e53435	more theme cleanup	2012-05-28 19:17:06 -07:00
Simon L'nu	cb259098dd	fixed font-size/line-height stuffs Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-28 19:25:10 -04:00
friendica	6962989e52	slackr - tone down the shadows a smidgin	2012-05-27 23:02:25 -07:00
Michael Vogel	a71e3134bf	Merge remote branch 'upstream/master'	2012-05-25 16:19:10 +02:00
friendica	d1345e5054	Merge https://github.com/friendica/friendica into pull	2012-05-25 00:43:09 -07:00
friendica	abb9fecf09	rev update	2012-05-25 00:42:38 -07:00
Tobias Diekershoff	07535692dc	DE update to strings and templates	2012-05-25 06:04:33 +02:00
Simon	5bc0cfa067	Merge pull request #313 from fabrixxm/master install wizard: fix php executable path	2012-05-24 16:30:22 -07:00
Simon L'nu	2a32917e3a	update dark a bit. i messed up some buttons Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-24 19:28:12 -04:00
root	60df67b9e3	fix small js error when user not logged in	2012-05-24 04:29:33 -04:00
root	a5b8339a75	install wizard: fix php executable path - php executable not required - "check again" button submit form instead of reload page via js - checks form submit to install module without redirect	2012-05-24 04:21:33 -04:00
friendica	f0ddcb979b	slackr: improve interactivity	2012-05-23 23:29:45 -07:00
friendica	6c78d42050	slackr: hide calendar when posting	2012-05-23 18:20:24 -07:00
friendica	5d06e0060d	Merge https://github.com/friendica/friendica into pull	2012-05-23 16:58:58 -07:00
friendica	60723702f1	more theme stuff	2012-05-23 16:58:31 -07:00
Simon L'nu	16f9d7fd35	clean up and more fixing Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-23 19:22:07 -04:00
friendica	19bf0aa283	slackr - better highlighting of current selections	2012-05-23 16:16:59 -07:00
friendica	5b7865f8f9	slackr - knock the sharp edges off the events calendar	2012-05-23 15:55:09 -07:00
Simon	5acd0a1c32	Merge pull request #309 from fabrixxm/master Update install wizard	2012-05-23 15:10:24 -07:00
Simon L'nu	5198260e3a	clean up and make nice the dispy photo edit stuff Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-23 18:06:49 -04: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
root	325343a492	Update install wizard - writable .htconfig.php not required - add test for working .htaccess/mod_rewrite configuration - fix last pass: create tables, eventually show config text and print a "What next" section	2012-05-23 07:38:31 -04:00
friendica	61dba985c1	photo rotation	2012-05-23 01:01:04 -07:00
friendica	8ffb65ceef	event calendar theming	2012-05-22 22:34:35 -07:00
friendica	86a38cca24	import quattro event reminder	2012-05-22 22:06:52 -07:00
friendica	af495879af	mark bubbles unsupported	2012-05-22 21:54:19 -07:00
friendica	3ac7c4e859	keep FB out of private notes	2012-05-22 21:20:31 -07:00
friendica	0da20ec9ef	Merge https://github.com/friendica/friendica into pull	2012-05-22 18:06:34 -07:00
friendica	e70573f34c	if identity (uid) changes - reload any other open browser windows on next ping.	2012-05-22 16:01:07 -07:00
Thomas Willingham	b962559570	Oops - but lets commit the right revision, sorry. There's a spare line in the last one.	2012-05-22 19:19:36 +01:00
Thomas Willingham	18983bb932	Fix darkzero/ns BB icon background colours.	2012-05-22 19:14:58 +01:00
friendica	f29f861d25	add queue totals to admin summary page	2012-05-22 03:44:03 -07:00
Tobias Diekershoff	be64437b14	DE: update to the strings and some mail templates	2012-05-22 12:17:01 +02:00
Simon L'nu	d466c9ab08	fix (min-)search-text text Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-21 21:38:53 -04:00
Simon L'nu	bd3c0edf34	updates to dispy family; fix typo in INSTALL.txt Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-21 21:29:18 -04:00
friendica	9ca3ac6e61	Merge https://github.com/friendica/friendica into pull	2012-05-21 16:43:07 -07:00
friendica	54e2c1ca81	rev update, bug 428, 429, and ability to block globaldir submissions from demo sites	2012-05-21 16:40:11 -07:00
Simon L'nu	627367e1ee	more light fixes Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-21 06:48:08 -04:00
Simon L'nu	cb2702249f	fix dumb mistake in light Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-21 02:47:43 -04:00
Simon L'nu	2ac55c9f21	fix dispy light Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-20 14:37:20 -04:00
Thomas Willingham	c6104fb856	Darkzero-NS + 'Friendicaland' countries.	2012-05-20 01:44:07 +01:00
Michael Vogel	8c80fe0bf5	Performance tests	2012-05-20 00:11:32 +02:00
Thomas Willingham	4484bd0e97	Darkzero, another missing part of "everything"	2012-05-19 17:30:55 +01:00
Thomas Willingham	b1c58511ad	Diabook-dark - some more cleaning up	2012-05-19 17:20:27 +01:00
Thomas Willingham	a1b96d11a7	Okay, so maybe not everything	2012-05-19 15:17:35 +01:00
Thomas Willingham	d6ca4a1b42	Give Darkzero some loving. Everything that used to be hidden with light text on light backgrounds is legible now.	2012-05-19 14:51:10 +01:00
Simon L'nu	4a35a51724	fix -desc again Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-19 03:15:35 -04:00
friendica	3821744450	apply max-width to images in posts, duepuntozero	2012-05-18 01:46:02 -07:00
friendica	34b79b4f2b	theming for default group selector	2012-05-18 01:38:11 -07:00
friendica	7b0ded3f14	more private forums, default privacy group for new contacts	2012-05-17 22:44:52 -07:00
Simon L'nu	331013f281	fix admin links... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-16 13:33:20 -04:00
Simon L'nu	a8a3732f05	sigh. fix dark again Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-16 05:51:29 -04:00
Simon L'nu	7eb73bc600	get rid of the monstrosity for .button. need to find alternate solution Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-16 05:32:08 -04:00
Simon L'nu	fca09c9d4c	slight re-design of wall stuff and css/font cleaning Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-16 01:58:55 -04:00
Tobias Diekershoff	68dc7c3568	DE strings	2012-05-15 10:44:01 +02:00
friendica	0faa0c2ab1	slackr drop shadows extended	2012-05-14 21:45:37 -07:00
Simon L'nu	db5fe14241	finish dipsy light colour fixes Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-14 00:30:25 -04:00
tommy tomson	303856ce01	diabook-theme: small fixes	2012-05-13 20:51:39 +02:00
friendica	eaf028c9fb	Merge https://github.com/friendica/friendica into pull	2012-05-12 22:20:03 -07:00
friendica	e7813f22af	slackr drop shadows	2012-05-12 22:19:29 -07:00
Simon L'nu	93dc96e2cf	css fixes; new screenshots Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-12 18:53:01 -04:00
friendica	72d8e0459d	Merge pull request #294 from mschmitt/master Esperanto at 100% again	2012-05-12 15:01:05 -07:00
Martin Schmitt	ae300bceb9	Ĝisdatigis la esperantlingvan tradukaĵon al 100%.	2012-05-12 16:56:31 +02:00
Vasudev Kamath	3a45d4f9e0	Merge branch 'master' of git://github.com/friendica/friendica	2012-05-12 20:20:26 +05:30
tommy tomson	9699d9cd01	diabook-theme: fix in earthlayers	2012-05-12 16:11:46 +02:00
tommy tomson	2882012e1b	diabook-theme: some fixes	2012-05-12 13:50:22 +02:00
Simon L'nu	c6897d0dc4	finished migrating dispy light - maybe Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-12 07:29:36 -04:00
Vasudev Kamath	10db2f00f9	Merge branch 'master' of git://github.com/friendica/friendica	2012-05-12 12:10:09 +05:30
Thomas Willingham	2454028ef6	Darkzero - fixed notifications bar.	2012-05-12 00:32:47 +01:00
tommy tomson	48c48d644f	diabook-theme: update mapquery and small fix	2012-05-11 16:41:16 +02:00
tommy tomson	74e79a06a8	diabook-theme: add "population density 2010"-layer to EarthLayers-box	2012-05-11 14:56:59 +02:00
friendica	49cd3f615d	Merge https://github.com/friendica/friendica into pull	2012-05-11 04:05:25 -07:00
tommy tomson	f9d5e602ac	diabook-theme:small fix	2012-05-11 13:04:25 +02:00
friendica	7600b9b1ee	Merge https://github.com/friendica/friendica into pull	2012-05-11 03:42:05 -07:00
friendica	496782e468	moderated comment templates	2012-05-11 03:41:29 -07:00
tommy tomson	e13e5070a7	diabook-theme: small fix	2012-05-11 09:01:58 +02:00
tommy tomson	a81faead6e	diabook-theme: include prv_message autocomplete	2012-05-11 08:39:39 +02:00
friendica	8a5dcf64d8	fix PM replies after autocomplete changes	2012-05-10 20:01:13 -07:00
tommy tomson	b2bd25a470	Merge remote-tracking branch 'origin/master'	2012-05-11 02:40:09 +02:00
tommy tomson	ccc825ccbc	diabook-theme: small fix	2012-05-11 02:39:54 +02:00
Thomas Willingham	e7b8e839ae	Diabook-dark. More touchups.	2012-05-10 17:14:27 +01:00
friendica	c5f6755bdd	specified background image does not exist	2012-05-10 05:49:48 -07:00
tommy tomson	3ac5d19b92	diabook-theme: some fixes	2012-05-10 12:19:51 +02:00
friendica	c9bb888611	priv mail autocomplete, improved contrast for darkzero, etc.	2012-05-10 02:01:08 -07:00
friendica	93ae6ee97b	Merge https://github.com/friendica/friendica into pull	2012-05-10 01:46:29 -07:00
friendica	774c51cc19	email autocomplete	2012-05-10 01:45:51 -07:00
tommy tomson	7b41c0a555	Merge remote-tracking branch 'origin/master'	2012-05-10 09:54:47 +02:00
tommy tomson	69b43582d0	diabook-theme: some css/bug-fixes	2012-05-10 09:54:16 +02:00
Simon L'nu	a077e63fa5	don't make -desc so obnoxious looking Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-10 02:27:48 -04:00
Thomas Willingham	89d3ce7b5d	Diabook-dark - do things the right way instead of the stupid way.	2012-05-09 04:54:17 +01:00
Thomas Willingham	d2bbd92889	Fix TinyMCE, but needs adding to theme.php	2012-05-09 03:42:09 +01:00
Thomas Willingham	8a1f8515ca	Fix jquery.fancybox, but still needs adding to theme.php	2012-05-09 03:31:56 +01:00
Thomas Willingham	a0293ae442	Diabook-dark cleaned up a bit.	2012-05-09 03:21:26 +01:00
friendica	a048fd806a	don't provide 'show more' on remote friends in common unless there are actually more	2012-05-08 17:40:56 -07:00
Tobias Diekershoff	d2c2063084	DE update for the strings	2012-05-08 09:56:05 +02:00
tommy tomson	88443ed3fb	diabook-themes: state of the boxes at right_aside are now stored in db, instead of cookie.	2012-05-08 03:29:25 +02:00
friendica	e8b9b8a403	separate poll_interval from delivery_interval - default is the same.	2012-05-07 04:21:54 -07:00
Simon L'nu	e554530430	more css tweaks. nothing major Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-07 01:20:32 -04:00
tommy tomson	e417f083b5	diabook-theme: small fix	2012-05-07 02:49:44 +02:00
tommy tomson	3d0a0b6abf	diabook-theme: add "Earth Layers"-box at right_side	2012-05-07 02:24:43 +02:00
tommy tomson	66b9b60792	diabook-theme: twitterbox-bugfix	2012-05-06 23:26:44 +02:00
tommy tomson	f09b3cfbf8	diabook: small fix	2012-05-06 12:25:09 +02:00
tommy tomson	8bdbfdc853	Merge remote-tracking branch 'origin/master'	2012-05-06 12:09:22 +02:00
tommy tomson	abbb4c2f36	diabook-theme: bugfix	2012-05-06 12:08:46 +02:00
Simon L'nu	f32c3d74a4	fixing widths to be more dynamic where possible. font size fixes. add README.md Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-06 06:05:31 -04:00
tommy tomson	e1ab3a93cc	diabook-theme: small fix	2012-05-06 00:36:46 +02:00
tommy tomson	c421f35da7	diabook-theme: twitter-box-update at right_aside	2012-05-06 00:10:35 +02:00
tommy tomson	f297751437	diabook-theme: can now set the twitter search term in theme-settings & small fixes	2012-05-05 20:01:38 +02:00
Vasudev Kamath	b5e857c0e7	Merge branch 'master' of git://github.com/friendica/friendica	2012-05-05 20:48:16 +05:30
friendica	8f26e698e6	Merge pull request #289 from cvogeley/master Option to set theme width added. Minor layout changes	2012-05-05 05:04:05 -07:00
Tobias Diekershoff	f9f62ee7ec	DE: new email templates translated	2012-05-05 09:11:25 +02:00
Christian Vogeley	7f061c255c	Option to set theme width added. Minor layout changes	2012-05-05 00:45:35 +02:00
Simon L'nu	20ea1b7d4b	fix lightbox; finished dark, now on to light Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-04 17:06:17 -04:00
Martin Schmitt	52f4563f30	Esperanto 100%	2012-05-04 12:02:05 +02:00
friendica	9ecd128e5e	"show more" friends in common	2012-05-04 01:46:36 -07:00
Tobias Diekershoff	22c8fe46a5	DE strings	2012-05-04 07:30:49 +02:00
friendica	421acee65b	implement max load average before queuing/deferring delivery and poller processes	2012-05-03 21:50:48 -07:00
Ludovic Grossard	1f86205ee8	proofreading the mail templates in fr fixed typo, grammar, spelling…	2012-05-03 22:35:59 +02:00
Simon L'nu	bb081e4bf5	forgot to move modernizr up. modernizr needs to be in <head>, like html5shiv (which it includes) Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-03 14:35:21 -04:00
Simon L'nu	1a13c56fef	major reworking of dispy dark. light to follow Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-03 14:25:18 -04:00
tommy tomson	d72db2e1aa	diabook-theme: small fix	2012-05-03 07:57:40 +02:00
tommy tomson	ff2ddc319d	diabook-theme: small fix	2012-05-03 06:25:23 +02:00
tommy tomson	3521e22333	diabook-theme: made boxes at right_aside sortable	2012-05-03 06:05:55 +02:00
Max Weller	f0c11cac4a	Moved Meta Viewport from global head.tpl to diabook's header I mistakenly added this <meta> tag to the global header, but it causes problems for other themes, as they have other optimal widths. I also added a style to diabook which makes the jGrowl messages appear below the header bar, so you can still click the menu items without having to close messages first.	2012-05-02 16:59:58 +02:00
tommy tomson	6875f54647	diabook-themes: more improvements in theme.php, add titles to bbcode under coment-box	2012-05-02 16:27:01 +02:00
tommy tomson	67471bb534	diabook-theme: tryied to improve performance a bit	2012-05-02 14:33:04 +02:00
tommy tomson	6a9cd8cd4b	diabook-theme: fix footer/impressum	2012-05-02 12:40:51 +02:00
friendica	1fab28c413	fix size	2012-05-01 20:38:06 -07:00
friendica	066d69b21c	add template	2012-05-01 20:22:59 -07:00
friendica	8bd6e1aef9	first try common friends for visitors	2012-05-01 19:16:18 -07:00
Thomas Willingham	671a10f5d4	More Diabook-dark touch-ups. Should really be useable this time...with editplain anyway.	2012-05-01 21:37:49 +01:00
tommy tomson	ab556857f0	diabook-themes: small fix at "community pages"-box	2012-05-01 16:46:08 +02:00
Simon L'nu	6d3ba2825b	lighten bg and darken font on dispy light Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-01 04:02:56 -04:00
Simon L'nu	e245ecddf2	sub-minor change to head.tpl Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-05-01 01:56:21 -04:00
Simon L'nu	46558e98a8	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: diabook-themes: add "community profiles"-box to right_column change api.php in function api_item_get_user to check if $usercache is NULL before checking an element in it make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter rev update start adding tooltips to tab menus fix join group notifications * master:	2012-05-01 00:49:42 -04:00
tommy tomson	2c577ed90f	diabook-themes: add "community profiles"-box to right_column	2012-05-01 06:21:40 +02:00
friendica	a3a55897e5	Merge https://github.com/friendica/friendica into pull	2012-04-30 19:04:28 -07:00
friendica	3c0cf72716	make 'aaa joined group bbb' work from the initiating end, new privacy pref to control it also hidewall wasn't properly checked before sending 'xxx is friends with yyy' messages	2012-04-30 19:01:41 -07:00
tommy tomson	f35ffa9b60	diabook-themes: add "last tweets"-box to right_aside, that searches for #friendica on twitter	2012-05-01 02:33:55 +02:00
Simon L'nu	9b7dac6ce1	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: provide "xxx joined yyy" notifications adding META viewport tag for better look on tablets Update Esperanto to 100% DE update to the strings activitystreams schema constants for "join group" missed a db field typo in profile_selectors, fix remote tagging not all profile selector choices have unique or direct translations log db error strings in all cases admin page to manage failed updates improved db error logging close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw) * master:	2012-04-30 06:02:38 -04:00
friendica	9f18c9d664	Merge pull request #277 from mschmitt/master Update Esperanto to 100%	2012-04-30 01:29:50 -07:00
Max Weller	9d8a0553ac	adding META viewport tag for better look on tablets	2012-04-30 09:48:21 +02:00
Martin Schmitt	5b9f01c3ab	Update Esperanto to 100%	2012-04-30 09:00:03 +02:00
Tobias Diekershoff	f08dc392df	DE update to the strings	2012-04-30 08:39:12 +02:00
friendica	0153d86b7f	admin page to manage failed updates	2012-04-29 19:10:07 -07:00
Simon L'nu	34eb843fb4	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: the heart should really be red. fix location change notification enhanced profile reporting for single values add db field for removed account, which will also be the first test of update error checking toggle to archive unfriends, though render them useless indicate successful updates diabook-themes: small fix diabook-themes: bug/css-fixes some constants for the db update failure possibilities bring back the email and logging of update failures, but without the transactions * master:	2012-04-29 22:06:16 -04:00
tommy tomson	920d40acf4	diabook-themes: small fix	2012-04-29 05:58:23 +02:00
tommy tomson	3d054341ef	diabook-themes: bug/css-fixes	2012-04-29 04:12:04 +02:00
friendica	7919d00399	bring back the email and logging of update failures, but without the transactions	2012-04-28 17:50:28 -07:00
Simon L'nu	ecd1dab373	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: a few more continues that should be returns small bugfix. sometimes also avatar pics were rescaled * master:	2012-04-28 20:16:25 -04:00
Christian Vogeley	3f586bb962	small bugfix. sometimes also avatar pics were rescaled	2012-04-28 20:15:10 +02:00
Simon L'nu	c661dc502f	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: break up poller into separate processes add tooltip title to common_tabs PRIVACY: if wall is blocked, don't provide public keywords in HTML meta Diabook-dark update, it's almost useable now (if you're lenient). Added "important changes" to admin menu for admins who don't follow the github properly. * master:	2012-04-28 05:29:03 -04:00
friendica	f163aed66d	break up poller into separate processes	2012-04-27 23:17:40 -07:00
friendica	3bb06cc3e4	add tooltip title to common_tabs	2012-04-27 19:47:52 -07:00
Thomas Willingham	4b553de79f	Diabook-dark update, it's almost useable now (if you're lenient).	2012-04-28 03:01:27 +01:00
Simon L'nu	3bfa3f2a13	fix #search-text Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-27 21:02:57 -04:00
Thomas Willingham	adc2fc18a5	Added "important changes" to admin menu for admins who don't follow the github properly.	2012-04-28 01:25:55 +01:00
friendica	26c53580d1	implement contact archival	2012-04-27 17:17:58 -07:00
Christian Vogeley	731379fa25	another attempt to fix lower tab behaviour on small screens, community back in tab area	2012-04-27 23:48:44 +02:00
Simon L'nu	64f3af49fa	remove extra netsearch-box and fix Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-27 14:33:56 -04:00
Simon L'nu	d0d79196ba	fix contact-friend stuff on profile sidebar Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-27 13:31:06 -04:00
Vasudev Kamath	214ec91a3f	Merge branch 'master' of git://github.com/friendica/friendica	2012-04-27 22:43:26 +05:30
friendica	4b92e3543c	Merge https://github.com/friendica/friendica into pull	2012-04-27 02:31:37 -07:00
friendica	266eaae439	put community back on the lower tab. It belongs with message streams	2012-04-27 02:30:49 -07:00
Simon L'nu	deae1df3be	fix some css errors Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-27 04:42:38 -04:00
friendica	153534bc70	Merge https://github.com/friendica/friendica into pull	2012-04-27 01:10:33 -07:00
friendica	f06a554e05	fix view contacts	2012-04-27 01:10:09 -07:00
Simon L'nu	b936e3a18a	fix 2 issues. contacts img in finder; wall filer title Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-27 02:33:58 -04:00
friendica	a1f94ac59f	reset qcomment selector after insert.	2012-04-26 21:53:40 -07:00
friendica	d3992b78e6	put fakelink back in birthday notice	2012-04-26 20:08:57 -07:00
friendica	dee36c1b04	birthday contact link goes to event page instead of remote profile	2012-04-26 20:02:42 -07:00
friendica	dd33599a1d	Merge https://github.com/friendica/friendica into pull	2012-04-26 19:56:25 -07:00
friendica	3c6cf1f19c	make comment edit icons look more like base theme	2012-04-26 19:55:20 -07:00
Simon L'nu	8834944952	fix s/color/colour/g issue Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-26 20:13:11 -04:00
friendica	3ee998dbaf	Merge pull request #267 from tomtom84/master add link "remove account" to /mod/settings.php	2012-04-26 15:33:34 -07:00
Simon L'nu	d6116b6979	announced dipsy change. re-tie your boots, we're in for a wee ride ;) Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-26 16:14:42 -04:00
tommy tomson	328568943e	diabook-themes: small-fix	2012-04-26 21:07:46 +02:00
friendica	82abb14bf9	Merge pull request #265 from cvogeley/master cleanzero theme added	2012-04-26 01:35:50 -07:00
Simon L'nu	c1f1974e44	convert stylesheets to less, and compress output css Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-26 02:38:18 -04:00
Thomas Willingham	20a9cdfc90	Diabook-dark more CSS fixes. Slowly getting there.	2012-04-25 23:40:40 +01:00
Christian Vogeley	43a257f2f6	duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design	2012-04-25 21:30:04 +02:00
Christian Vogeley	28370e320f	duepuntozero: move community and manage link to upper right area + css fixes to avoid breaking of design	2012-04-25 21:28:13 +02:00
Christian Vogeley	c0d4e39052	added BBCODE thing in comments	2012-04-25 21:08:31 +02:00
Christian Vogeley	4c1398c6b1	add cleanzero theme	2012-04-25 19:09:46 +02:00
friendica	37bc00094e	this turns out to be harder than I thought	2012-04-25 01:36:22 -07:00
friendica	38e822320c	Merge pull request #264 from mschmitt/master Esperanto at 100% again	2012-04-25 00:25:05 -07:00
friendica	50f10a4fd7	Merge https://github.com/friendica/friendica into pull	2012-04-25 00:14:20 -07:00
friendica	ba0ade3380	cleanup - make bb-buttons vanish when comment closed	2012-04-25 00:13:36 -07:00
Martin Schmitt	15f7125df2	Esperanto at 100% again	2012-04-25 08:50:02 +02:00
tomtom84	5187faa595	Merge pull request #263 from tomtom84/master diabook-themes: fix css to login.tpl	2012-04-24 18:42:32 -07:00
tommy tomson	9fe6333fd4	diabook-themes: fix css to login.tpl	2012-04-25 03:38:21 +02:00
friendica	5af80dbb89	restore qcomment selector	2012-04-24 18:23:48 -07:00
tommy tomson	e72eaf2408	zero-themes: add bbcode-toolbar to commentbox	2012-04-25 02:43:50 +02:00
tommy tomson	08b990a314	diabook-themes: small fix	2012-04-25 00:19:57 +02:00
friendica	5ebc221c28	Merge pull request #261 from fabrixxm/eventspage Some tweak on events page and events/bitrhdays reminder	2012-04-24 14:50:22 -07:00
Thomas Willingham	a28fea987e	Diabook-dark css fix	2012-04-24 20:07:08 +01:00
Thomas Willingham	fade45ca76	Diabook-dark, couple of new icons, and another css fix.	2012-04-24 20:00:49 +01:00
Fabio Comuni	c9a8dbc322	quattro: small week calendar view for event/birthday reminders	2012-04-24 09:50:44 +02:00
Fabio Comuni	62ad5043d6	remove html from get_birthdays() and get_events()	2012-04-24 09:50:10 +02:00
Fabio Comuni	fc61616c53	events page: set calendar start date from url (events/[year]/[month]/) and show event popup from url anchor (#link-[event id])	2012-04-24 08:12:30 +02:00
Martin Schmitt	c85fd87df1	Esperanto at 100% again	2012-04-24 06:52:36 +02:00
Thomas Willingham	9443248fad	Improvements to diabook-dark Still a long way to go, but some icons and a few CSS fixes	2012-04-24 04:55:39 +01:00
Tobias Diekershoff	af7abcea27	DE strings, correction of a typo	2012-04-23 20:55:48 +02:00
tommy tomson	a305cf9f5c	diabok-themes: fixed bug in green-wide and dark-wide	2012-04-23 18:42:37 +02:00
tommy tomson	c5c419a785	diabook-themes: small fix in nets_aside, group_aside and delete obsolete .tpls in subfolders	2012-04-23 17:22:22 +02:00
tommy tomson	d072c12e7d	diabook-themes: bugfix in admin-section	2012-04-23 15:47:18 +02:00
tommy tomson	e74ae8b031	diabook-themes: bugfix	2012-04-22 23:58:34 +02:00
tommy tomson	d6c8a14fb0	diabook-themes: fixed youtube-bug and added "Info/Impressum" to footer	2012-04-22 22:31:44 +02:00
Tobias Diekershoff	9434b447f3	DE strings update	2012-04-22 13:13:27 +02:00
tommy tomson	c0a377e0de	diabook-themes: comment-bbcode-bugfix	2012-04-22 12:59:00 +02:00
Vasudev Kamath	f1d84c1045	Merge branch 'master' of git://github.com/friendica/friendica	2012-04-22 12:08:05 +05:30
Simon L'nu	203aa819e2	fix tinymce theming Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-22 01:22:29 -04:00
tommy tomson	fe6567cb88	diabook-themes: deleted obsolete diabook-folder & minor bug-fixes	2012-04-22 03:15:06 +02:00
Simon L'nu	7a14f45904	fix checkbox/radio buttons for some browsers Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-20 20:18:47 -04:00
tommy tomson	8809e96310	diabook-themes: add diabook-dark	2012-04-21 01:06:17 +02:00
Vasudev Kamath	8465ad6e1e	Few more files with unnecessary executable permissions	2012-04-21 00:22:48 +05:30
tommy tomson	e052be606c	diabook-themes: add diabook-green and some minor css/bug-fixes	2012-04-20 17:16:42 +02:00
Simon	0e25376e4a	Merge pull request #254 from simonlnu/master add some knobs to comment boxes	2012-04-20 03:43:55 -07:00
fabrixxm	16c308791f	Merge pull request #253 from fabrixxm/master fix bug n385	2012-04-20 03:42:50 -07:00
Simon L'nu	5d2dd5798b	fix the buttons. don't hide the buttons once shown Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-20 06:42:08 -04:00
Simon L'nu	eb9ddb884a	optimise imgs; add some comment editing knobs Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-20 05:56:54 -04:00
Fabio Comuni	6af5a3a485	escape email template var names. fix bug n385.	2012-04-20 11:39:36 +02:00
Fabio Comuni	3bb785fdad	Merge remote-tracking branch 'CatoTH/master' into req245	2012-04-20 09:25:51 +02:00
tommy tomson	f5f1956e8b	diabook-themes: theme-settings: add "colour scheme"-option, add diabook-pink and some bug/css-fixes	2012-04-20 01:44:21 +02:00
Simon L'nu	05173d0a8a	fix .item-select Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-19 13:02:41 -04:00
Simon L'nu	4fd1a17f06	tweak drop-down and add in filebrowser Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-19 12:54:53 -04:00
fabrixxm	44f4b4b9d1	Merge pull request #248 from fabrixxm/tmcefilebrowser TinyMCE file browser	2012-04-19 00:30:45 -07:00
Martin Schmitt	25f6753a1f	Hadn't merged fixed typo from upstream.	2012-04-19 06:51:52 +02:00
Martin Schmitt	7e3c183601	EO translation fixes	2012-04-19 06:45:54 +02:00
Fabio Comuni	fddf21d983	filebrowser: fix style, show 10 recent photos if not in an album	2012-04-18 15:15:52 +02:00
Fabio Comuni	0630120455	filebrowser: more style, load min and max scale photos	2012-04-18 14:56:03 +02:00
Fabio Comuni	56efb42223	tinymce: add inlinepopups plugin	2012-04-18 14:55:21 +02:00
Fabio Comuni	e2e6b56c44	tinymce: add filebrowser for photos and attached files	2012-04-18 13:23:42 +02:00
Simon L'nu	a30ea16218	only affect immediate li children Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-18 06:17:20 -04:00
Simon L'nu	311f39f12f	fix silly abandonded typo. shouldn't affect translations Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-18 06:10:34 -04:00
Simon L'nu	af3e37ce20	fix alignment issues with toolbar Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-18 05:59:50 -04:00
Tobias Hößl	b885fedee1	XSRF protection and PHPdoc for mod/admin.php	2012-04-18 07:36:48 +00:00
Tobias Hößl	d7e750ad74	XSRF protection and PHPdoc for mod/admin.php	2012-04-18 07:24:47 +00:00
tommy tomson	1b6c84d8f4	diabook-themes: some css/bug-fixes	2012-04-18 02:36:30 +02:00
Martin Schmitt	2fbd5127ba	messages.po/strings.php at 100% Esperanto	2012-04-17 22:50:44 +02:00
tommy tomson	5b407b5ee7	diabook-themes: theme-settings: "wide"-option and new screenshots	2012-04-17 19:45:53 +02:00
Simon L'nu	f4ff75cace	[SECURITY] finish ripping out fpostit Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-17 13:21:30 -04:00
Simon	04af5d9e2c	Merge pull request #241 from simonlnu/master rip out fpostit	2012-04-17 10:16:56 -07:00
Simon L'nu	1b2209fb3c	rip out fpostit Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-17 13:15:11 -04:00
Tobias Diekershoff	dbff4252d4	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-17 18:07:20 +02:00
Tobias Diekershoff	757e3429ac	update to the German string files	2012-04-17 18:06:28 +02:00
tommy tomson	b30c761aae	diabook-themes: removed fpostit due to security issues and small fix in german translation	2012-04-17 16:15:49 +02:00
Simon L'nu	68e1523496	finally fix the ui in the settings. it was fugly.... other bug fixes too Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-17 00:26:37 -04:00
tommy tomson	f08844a8a5	diabook-themes: bugfix (sry, necessary)	2012-04-16 19:23:11 +02:00
tommy tomson	15dc8f4b21	diabook-themes: small bug/css-fixes ---> ver. 1.019	2012-04-16 18:51:08 +02:00
tommy tomson	b32a731517	diabook-themes: bug-fixes	2012-04-16 17:12:08 +02:00
tommy tomson	947b6073b1	diabook-themes: minor bugfixes	2012-04-16 16:05:29 +02:00
friendica	93df525f5c	Merge pull request #238 from annando/master API: Support of the statusnet application	2012-04-15 16:00:07 -07:00
tommy tomson	b5c164bf2f	diabook-themes: css-fixes	2012-04-15 19:58:26 +02:00
friendica	c4e8ef330e	where did this "lang" string come from and why?	2012-04-15 06:04:54 -07:00
Simon L'nu	6a2f0eb475	REALLY fix fpostit this time Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-15 03:18:55 -04:00
Simon L'nu	d836be1dc3	fix fpostJS, add and fix some other stuff Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-15 02:13:36 -04:00
tommy tomson	dddf3307af	diabook-themes: added js for auto-growing comment-textareas	2012-04-15 04:39:33 +02:00
tommy tomson	170c15ceb9	diabook: theme-settings: add a wide-option	2012-04-15 02:50:16 +02:00
friendica	31b1d353b2	Merge pull request #234 from copyninja/master Executable permisson removal on files which are not elf/script	2012-04-14 14:50:54 -07:00
Simon L'nu	6278b2a923	string fix: typo. slow down scroll to top in dispys Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-14 16:24:35 -04:00
Vasudev Kamath	41d74c0868	Another bunch of executable permission removal	2012-04-14 20:16:06 +05:30
Vasudev Kamath	626bb57e1d	Removed execution permission: lintian warning in Debian packaging	2012-04-14 20:04:54 +05:30
friendica	6591b292a1	bogus empty list element in dfrn_request page when emailnet not enabled	2012-04-14 05:32:31 -07:00
Michael Vogel	4e220ec391	Merge commit 'upstream/master'	2012-04-14 13:15:25 +02:00
Simon L'nu	96cda3136b	lighten wrapper shadow a bit on dispy Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-13 20:14:09 -04:00
Simon L'nu	6b46fe3dfe	neat little changes. hopefully the shadow will be well recieved Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-13 19:30:07 -04:00
friendica	bfb821e918	well that was a silly mistake...	2012-04-13 16:12:06 -07:00
tommy tomson	a300616bcb	diabook-themes: theme-settings: users can set font-size and line-height for posts and comments	2012-04-13 22:08:13 +02:00
tommy tomson	2c843466a9	diabook: theme-settings: users can set font-size and line-height for posts and comments	2012-04-13 21:34:21 +02:00
tommy tomson	615cd53e51	diabook-themes: small fixes	2012-04-13 18:28:11 +02:00
Fabio Comuni	f6e1ddf7fb	Merge remote-tracking branch 'friendica/master'	2012-04-13 11:59:25 +02:00
Fabio Comuni	469710893d	quattro: language icon in navbar	2012-04-13 11:56:56 +02:00
Fabio Comuni	4496d075e5	move html out of lang_selector() and new template lang_selector.tpl	2012-04-13 11:56:21 +02:00
Fabio Comuni	fdf50b8574	display settings: show theme screenshot on page load	2012-04-13 11:55:36 +02:00
Fabio Comuni	7aa3b92f4c	quattro: add admin theme settigs. darker items background with a bottom border.	2012-04-13 11:21:15 +02:00
Fabio Comuni	138a0e06b8	admin: change global theme settings	2012-04-13 11:20:05 +02:00
Fabio Comuni	8be7b5c65b	quattro: work on "like" activitiy items less visible fixes to widths popup notification out of navbar category input in jot	2012-04-13 09:43:38 +02:00
friendica	3c4e6d3461	bug #369 - show contacts who are not in any groups	2012-04-12 23:06:41 -07:00
friendica	972c01edb3	profile change activities	2012-04-12 21:10:32 -07:00
friendica	32cd62ff0a	allow setting default new friend notify	2012-04-12 18:15:46 -07:00
Michael Vogel	572678fef9	Merge commit 'upstream/master' Conflicts: include/dba.php	2012-04-13 00:10:41 +02:00
tommy tomson	e3af552bbf	diabook-themes: fixed css for settings aside-links	2012-04-12 22:00:18 +02:00
tommy tomson	39009b5ac9	diabook-themes: css-fixes in aside	2012-04-12 20:23:03 +02:00
tommy tomson	3a8e6cbacb	fix css in aside	2012-04-12 17:37:55 +02:00
Fabio Comuni	309f2bfa5f	quattro: icons for "Mark all sys notifs read" and "See all notifs" as icons in a toolbar in notifications menu	2012-04-12 09:17:35 +02:00
Fabio Comuni	6c50eba206	quattro: move center css to style.php. add tpl for generic_links_widget	2012-04-12 08:40:17 +02:00
Fabio Comuni	e992e29685	settings: move tabs to aside. add a new template "generic_links_widget.tpl"	2012-04-12 08:38:55 +02:00
Simon L'nu	c21244f679	fix the icons a bit Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-12 01:08:02 -04:00
Michael Vogel	ee714daf4d	Merge commit 'upstream/master'	2012-04-11 19:35:51 +02:00
Michael Vogel	c88c2515e4	API: Improved the timeline. Several (disabled) tests with caching of photos.	2012-04-11 19:31:01 +02:00
tommy tomson	a1d5026abf	diabook-themes: small fix	2012-04-11 18:49:07 +02:00
Simon L'nu	c79d1deb92	major refactor. step 1 Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-11 01:59:33 -04:00
friendica	b02a671494	visit "random profile" feature	2012-04-10 20:50:31 -07:00
friendica	ed608694ce	make editplain work everywhere	2012-04-10 18:08:06 -07:00
friendica	703bfcb6d4	Merge https://github.com/friendica/friendica into pull	2012-04-10 16:07:05 -07:00
friendica	3c66816938	Merge branch 'libravatar' of https://github.com/dawnbreak/friendica into pull	2012-04-10 15:28:48 -07:00
Tobias Hößl	e1c43c1c1c	Incorrect tranlation (one negation too much)	2012-04-10 20:43:31 +00:00
tommy tomson	6db33fc513	diabook-themes: smal fix in bbcode-js	2012-04-10 15:13:34 +02:00
tommy tomson	b3f18945ba	diabook-themes: added url and quote to bbcode toolbar under comment box	2012-04-10 14:38:59 +02:00
Simon L'nu	707a5dbae7	aaah, nice asides ;). we'll be updating these soon Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-10 05:48:42 -04:00
friendica	2d23c8a246	Merge pull request #218 from campino/master db errors and update error mail	2012-04-09 16:53:23 -07:00
tommy tomson	0d4fab4ee3	bbcode toolbar attached to the comment text field minor css-fixes	2012-04-10 00:55:39 +02:00
Klaus Weidenbach	1f9fe8b5ee	Remove Gravatar from core and add new hook avatar_lookup. This patch removes all occurances of Gravatar from friendica's core and adds a new hook "avatar_lookup" inside the function avatar_img($email) where the new *avatar-plugins should hook in. I haven't touched the language files yet. Are they updated automatically somehow?	2012-04-09 21:22:09 +02:00
tommy tomson	d25a9df996	diabook-themes: small icon fix	2012-04-09 19:56:53 +02:00
Alexander Kampmann	2190b95d80	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-09 16:56:37 +02:00
tommy tomson	c27c340de1	diabook-nav-icons with gradient	2012-04-09 16:41:23 +02:00
Alexander Kampmann	1370ba5d16	Merge branch 'master' of https://github.com/friendica/friendica	2012-04-09 14:28:21 +02:00
Alexander Kampmann	7187516718	fixed some typos	2012-04-09 14:27:52 +02:00
Michael Vogel	894e126c55	API: Tweetdeck is now working	2012-04-09 11:49:33 +02:00
zottel	5183d4f77d	Some new German translations	2012-04-09 02:30:18 +02:00
Alexander Kampmann	0d60dbef31	added exceptions to dba class added exception handling to index.php, please mind that there is no recovery at the moment added transactions to db update. Please mind that they might not be supported by db table engines. added admin email on failed updates added german translation for admin email	2012-04-09 00:45:10 +02:00
tommy tomson	7d018f651d	fixed z-index of youtube-vids fixed bug to hide right_side	2012-04-09 00:02:48 +02:00
friendica	741a5dba57	provide theme_init() functions	2012-04-08 05:52:00 -07:00
Michael Vogel	ce0eac44b5	Merge commit 'upstream/master'	2012-04-08 10:07:39 +02:00
Simon L'nu	01961f7caa	minor dispy* fixes Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-07 23:46:47 -04:00
tommy tomson	f931d5c918	diabook-themes: small fix	2012-04-07 19:56:00 +02:00
Michael Vogel	17d097124c	"vier": Some design stuff	2012-04-07 18:35:37 +02:00
Michael Vogel	cb05801a90	Merge commit 'upstream/master'	2012-04-07 18:35:29 +02:00
tommy tomson	1c0700f371	changelog 1.014 : image-rezise via jquery-plugin in stream comments under uploaded pictues add Diabook's version-number in head-section css-fixes: tabs youtube-iframe title-bar in jot-wrapper blockquote & .oembed	2012-04-07 16:39:43 +02:00
Michael Vogel	7308dbae28	"vier": Bookmarks now look better.	2012-04-07 01:19:07 +02:00
tomtom84	adf3ad5fd6	Merge pull request #210 from tomtom84/master fixes in diabook-derivates	2012-04-06 04:29:01 -07:00
Tobias Diekershoff	eb6370fa41	small fixes for the German strings	2012-04-06 12:43:20 +02:00
tommy tomson	f980b79edc	new-contacts-introductions in contacts-drop-down and new-messages in messages-drop-down get each an additional indicator... profile-picture is now scaled right in firefox... fixed broken css on introductions-page in firefox...	2012-04-06 11:19:12 +02:00
Tobias Diekershoff	afd2bf031e	update to the German strings	2012-04-06 09:37:50 +02:00
Michael Vogel	34d268544e	Merge commit 'upstream/master'	2012-04-06 00:00:46 +02:00
Alexander Kampmann	355c42cb30	Merge branch 'master' of https://github.com/friendica/friendica Conflicts: include/config.php update.php	2012-04-05 13:39:15 +02:00
Simon L'nu	df82affe2f	finish styling category tags and category input Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-05 00:04:23 -04:00
Simon L'nu	9ee424c1e3	style categorytags Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-04 23:47:35 -04:00
Simon L'nu	8e5489846d	update the dispy* templates Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-04 23:35:07 -04:00
friendica	c4ca21a762	move alert box away from nav links	2012-04-04 19:13:41 -07:00
Simon L'nu	922d690d1e	latest changes are the popup menu for notifs, fixes Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-04 02:19:39 -04:00
friendica	1e02fd8a72	Merge branch 'pull'	2012-04-03 19:16:59 -07:00
friendica	3db2cf76b9	remove loozah themes which fell too far behind to recover	2012-04-03 16:40:25 -07:00
tommy tomson	f0a8ef64fe	smal fix	2012-04-03 21:45:58 +02:00
tommy tomson	cd309b69e6	german translation for right_aside	2012-04-03 21:06:57 +02:00
tommy tomson	8a71191d6d	make right_aside translatable and provide german translation... and some css-fixes	2012-04-03 20:59:00 +02:00
Michael Vogel	81dfb61f93	API: template for test function added	2012-04-02 22:36:05 +02:00
Michael Vogel	3dc317dcc6	Merge commit 'upstream/master'	2012-04-02 22:00:22 +02:00
tommy tomson	6dfd55668f	diabook-themes: css-fixes	2012-04-02 20:30:27 +02:00
tommy tomson	076b1b374b	diabook-themes: fixes in js	2012-04-02 18:16:58 +02:00
tommy tomson	b5d57d5313	diabook-themes: fixed pageheader	2012-04-02 17:17:14 +02:00
tommy tomson	9faa940f04	diabook-themes: bugfixes / css-fixes	2012-04-02 15:06:55 +02:00
Michael Johnston	581b54c974	allow users to set categories on their posts	2012-04-01 21:28:31 -04:00
tommy tomson	23dc376364	diabook-themes: add link to global dir in "find friends" at right_aside	2012-04-02 01:29:20 +02:00
Michael Vogel	a39d8d3f02	The "vier"-theme is now working again. But there is still work needed	2012-04-02 00:08:49 +02:00
tommy tomson	408de09f72	css-fixes	2012-04-02 00:05:49 +02:00
tommy tomson	f075e977fe	add new messages-layout in diabook	2012-04-01 18:12:20 +02:00
tommy tomson	ff12637ceb	fix the display of community-plugin in diabook-themes	2012-04-01 16:34:31 +02:00
tommy tomson	15ba0ef5d0	various bugfixes and css-fixes	2012-04-01 13:12:15 +02:00
friendica	bc283f7c5d	qcomment overflow	2012-04-01 03:37:41 -07:00
friendica	ae5e5bf1e4	Merge branch 'pull'	2012-04-01 01:03:05 -07:00
friendica	5c2fdc795f	send unverified private mail using zrl	2012-04-01 00:59:35 -07:00
Simon L'nu	db7f7e4237	latest fixes for dispys. tweaking/repairing Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-04-01 03:57:05 -04:00
tommy tomson	36545e554b	diabook-themes: move "common tabs" to left side on settings page	2012-03-31 18:42:11 +02:00
tommy tomson	13ded12ffb	move the common tabs to right_aside in diabook-derivates	2012-03-31 16:58:02 +02:00
friendica	d5a31e5791	Merge branch 'pull'	2012-03-31 04:40:35 -07:00
tommy tomson	893ece9066	bug fix in diabook-aerith and -red	2012-03-31 11:50:33 +02:00
tommy tomson	0b41654935	bug-fixes in diabook-derivates	2012-03-31 11:09:57 +02:00
Simon L'nu	f5e3ec9a56	forgot the css changes for last push Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-31 04:02:51 -04:00
friendica	b4b1055b50	settings for unknown private mail acceptance	2012-03-31 00:57:59 -07:00
Simon L'nu	b88a452c6b	theme fixes; fix qcomment (finally) Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-31 03:56:06 -04:00
Fabio Comuni	be2005f146	quattro: move quattro-green inside quattro folder. Add config option to select quattro color scheme.	2012-03-30 21:21:14 +02:00
Fabio Comuni	77f57e1b13	Merge remote-tracking branch 'friendica/master'	2012-03-30 19:37:43 +02:00
tommy tomson	f50fb7d6ca	css-fixes in diabook-derivates	2012-03-30 17:52:29 +02:00
tommy tomson	6d3d882f9b	css-fixes in diabook-derivates	2012-03-30 16:33:34 +02:00
Fabio Comuni	24e7a3413c	quattro-green: remove settings code Use config.php from quattro	2012-03-30 15:46:14 +02:00
Fabio Comuni	db59a45030	quattro: add config.php	2012-03-30 15:45:23 +02:00
Fabio Comuni	054d21a2e8	settings: add "display settings" tab, with UI-related settings. Load optional "config.php" from theme folder and show in page. Loading of "config.php" follow theme_info['extends'] property.	2012-03-30 15:45:02 +02:00
tommy tomson	5b4bb347a6	css-fixes in diabook-derivates	2012-03-30 14:38:21 +02:00
Tobias Diekershoff	8685a91742	quattro-green: added Description to the theme.php	2012-03-30 14:24:45 +02:00
Tobias Diekershoff	b5e292509e	quattro-green: adopted quattro option for centered display	2012-03-30 14:03:33 +02:00
tommy tomson	5ced7f2bc5	add themes diabook-red & diabook-aerith	2012-03-30 13:48:34 +02:00
Tobias Diekershoff	e2370b56bf	quattro-greey: apply theming to private mail	2012-03-30 08:10:49 +02:00
Simon L'nu	3b4016168d	tweaking stuff in dispys. i thought i fixed the login screens, but they're b0rked right now. Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-29 20:19:43 -04:00
friendica	e935b3a225	theme file_as combobox for 2.0	2012-03-29 04:07:16 -07:00
tommy tomson	339c8a4b56	css fixes in diabook-derivates	2012-03-29 11:02:59 +02:00
fabrixxm	3ee529d095	Merge pull request #185 from fabrixxm/master Updated private message pages	2012-03-28 23:47:23 -07:00
friendica	75f3d41da2	Merge pull request #184 from annando/master Enhancing the API - Preparations for a better facebook export	2012-03-28 15:08:15 -07:00
tommy tomson	aa26517cdc	add a searchbox to "find friends" for global search	2012-03-28 23:07:34 +02:00
tommy tomson	1a9bbac0be	bugfix in diabook	2012-03-28 20:45:39 +02:00
Michael Vogel	bdd2754740	Merge commit 'upstream/master'	2012-03-28 19:52:30 +02:00
Fabio Comuni	011a96d960	quattro: style pm pages	2012-03-28 15:34:02 +02:00
Fabio Comuni	50711040cb	message: remove tabs, move new message link to aside, all message with gmail-style	2012-03-28 15:31:58 +02:00
Fabio Comuni	f86e909a82	Merge remote-tracking branch 'friendica/master'	2012-03-28 15:21:01 +02:00
friendica	e894775a39	Merge branch 'pull'	2012-03-28 05:16:25 -07:00
Fabio Comuni	0f2a34c23b	quattro: tpl for "file as"	2012-03-28 13:37:04 +02:00
Simon L'nu	4a75ea2f42	really fix it this time... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-28 06:47:38 -04:00
Simon L'nu	3d5e711780	WITH is going on? Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-28 06:20:13 -04:00
friendica	b58dc43148	Merge branch 'pull'	2012-03-28 03:19:42 -07:00
friendica	b18086097e	title not updated when editing post	2012-03-28 03:18:26 -07:00
Simon	c32ee4d226	Merge pull request #180 from simonlnu/master duh...	2012-03-28 03:03:47 -07:00
Simon L'nu	356e654521	doh fix Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-28 06:03:04 -04:00
fabrixxm	768326e484	Merge pull request #179 from fabrixxm/master new field_combobox template and some eyecandy to "file as" function	2012-03-28 03:00:24 -07:00
Simon L'nu	bcf8a571f9	add some icons for the newbie stuff (diabook but 24px not 32); fixes for dispy (broken last push) Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-28 05:52:28 -04:00
Fabio Comuni	0a2675d8b6	filer: replace "file as" prompt with combobox opened in fancybox	2012-03-28 10:49:34 +02:00
Fabio Comuni	82106632f0	template: field_combobox a text input plus a select wich updates text input value on change. html5 version commented out for poor browsers support.	2012-03-28 10:43:52 +02:00
friendica	7fc57f486f	support autocomplete @-tags in plaintext mode	2012-03-28 00:44:45 -07:00
friendica	f95fb2667a	vier navbar messed up after default theme template move	2012-03-28 00:16:22 -07:00
friendica	47eaa97af6	Merge branch 'pull'	2012-03-27 15:21:30 -07:00
friendica	aba63f8b78	turn on gecko spellcheck in tinymce	2012-03-27 15:20:36 -07:00
tommy tomson	f30471df4f	small fix in diabook	2012-03-27 23:41:19 +02:00
tommy tomson	211d00a1f5	fixes in diabook	2012-03-27 23:27:43 +02:00
tommy tomson	31fbc3fde3	provide a close-option for boxes in right_aside and store info via js and cookies	2012-03-27 19:02:07 +02:00
tommy tomson	9fd54de691	provide a close-option for boxes in right_aside and store info via js and cookies	2012-03-27 15:29:46 +02:00
Simon L'nu	c3388ad813	more fixes for dispys Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-27 04:40:31 -04:00
Simon L'nu	6cd56e0f33	add dispy-dark snapshot; fix toolbar Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-27 03:57:47 -04:00
tommy tomson	e7bc3f2bd0	add "find friends" to right_aside to diabook, fixes in css in diabook	2012-03-27 08:28:47 +02:00
Tobias Diekershoff	b9d976e31b	fixed Umlaute in de strings.php	2012-03-27 07:18:20 +02:00
friendica	5275b5d049	qcomment enhancements	2012-03-26 20:13:03 -07:00
Simon L'nu	3b9f0fd801	fix dispy's nav element; fix colours in #search-text Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-26 14:19:59 -04:00
tommy tomson	2d834d0f45	add "similar interrest", "Friend Suggestions" and "Invite Friends" to right_aside, fixes in css	2012-03-26 18:54:57 +02:00
Tobias Diekershoff	f1d15d8884	Merge branch 'master' of https://github.com/friendica/friendica	2012-03-26 14:49:15 +02:00
Tobias Diekershoff	37f10a6d4f	marking quattro-green as extension of quattro and deleting the tpl files	2012-03-26 14:48:01 +02:00
tommy tomson	aaddee0d94	minor css fixes in diabook	2012-03-26 13:52:44 +02:00
friendica	0164da4fb9	screenshot for darkzero-NS, same as darkzero	2012-03-26 04:25:20 -07:00
Tobias Diekershoff	8ded404aaa	added quaddro templates to quaddro-green	2012-03-26 11:28:38 +02:00
friendica	63fa5f6c77	Merge pull request #172 from fabrixxm/master Rearrange theme tpls	2012-03-26 02:00:14 -07:00
tommy tomson	876aa0c752	small fix in diabook :: add local friendica to right_aside	2012-03-26 10:33:28 +02:00
friendica	ca31aed490	Merge branch 'pull'	2012-03-26 00:53:32 -07:00
friendica	2820dba1e7	comix screenshot	2012-03-26 00:52:54 -07:00
Fabio Comuni	579c4f3079	diabook: small fix in theme_info array	2012-03-26 09:48:38 +02:00
friendica	109e8d4f05	more theme screenshots	2012-03-26 00:47:52 -07:00
Simon L'nu	0c4aba4b57	[fix] contact_edit.tpl syntax; reduce cols to fit better Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-26 03:39:06 -04:00
tommy tomson	c4c69959e2	add screenshots to diabook	2012-03-26 09:37:14 +02:00
Fabio Comuni	51d419e159	themes: use duepuntozero tpls as default	2012-03-26 09:09:14 +02:00
Simon L'nu	7de8e15ca4	fix the search box Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-26 03:01:13 -04:00
tommy tomson	37f02424f8	small fix	2012-03-26 07:02:27 +02:00
friendica	ba28362242	position the theme-preview on settings page	2012-03-25 21:12:10 -07:00
friendica	a06185e87c	screenshot gallery	2012-03-25 20:08:28 -07:00
friendica	be52ec6f5a	Merge branch 'pull'	2012-03-25 19:48:17 -07:00
Simon L'nu	3d11c22b01	add in the search box Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-25 22:45:44 -04:00
Simon L'nu	758e1b7424	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: theme screenshots * master:	2012-03-25 22:40:24 -04:00
friendica	c88674aaf2	theme preview for end users	2012-03-25 19:05:14 -07:00
friendica	7ab117fd31	Merge branch 'pull'	2012-03-25 18:19:58 -07:00
friendica	7ef1ed2d70	theme screenshots	2012-03-25 17:55:43 -07:00
Simon L'nu	3d62cb9782	minor fix to dispy theme.php Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-25 17:13:24 -04:00
Simon L'nu	aa33815d3c	urgent fix to dispy-dark theme.php Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-25 17:06:38 -04:00
tommy tomson	baeb735315	small fixes	2012-03-25 19:43:42 +02:00
Simon L'nu	2c43120129	dispy-dark not experimental. start implementing fpostit Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-25 03:22:16 -04:00
Simon L'nu	84686a2698	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: move community_pages to right_aside, fixes in css improved the inivitations and added a bit of sales pitch. * master:	2012-03-25 03:18:21 -04:00
tommy tomson	329a26d62e	move community_pages to right_aside, fixes in css	2012-03-25 08:47:17 +02:00
Simon L'nu	1d56224b08	increase version to 1.0 for dispys \o/ Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-25 01:12:28 -04:00
Simon L'nu	8fe77e5b86	implement filer/file-as Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-25 01:01:59 -04:00
tommy tomson	8451b22d42	small fix in css	2012-03-24 08:56:26 +01:00
tommy tomson	ba027f174d	add right_aside to diabook-blue	2012-03-24 08:13:48 +01:00
tommy tomson	378762fed2	add connectable services to right_aside	2012-03-24 06:17:14 +01:00
tommy tomson	d76b052f90	add PostIt to right_aside, fixes in css	2012-03-24 04:05:21 +01:00
Fabio Comuni	1780fff161	diabook: theme.php remove code duplication last photos check for user "hidewall" remove unneeded regex move js code to close popup in main.js (missing stop event propagation in popup links)	2012-03-23 14:09:06 +01:00
Fabio Comuni	82cc86a41a	user settings: don't show emoticons	2012-03-23 12:07:22 +01:00
tommy tomson	c35b9ec24f	fix in css right_aside	2012-03-23 10:16:11 +01:00
tommy tomson	7706a8f9d8	small fix	2012-03-23 07:28:48 +01:00
tommy tomson	687fa80094	fix 1024resolution	2012-03-23 07:02:21 +01:00
tommy tomson	bf4dd8ad17	add right_aside to theme diabook	2012-03-23 02:36:34 +01:00
Tobias Diekershoff	07c5b0af5a	quattro(-green) styling the 'filed under: remove' text	2012-03-22 14:09:21 +01:00
Tobias Diekershoff	1e86e3fb26	it's only item.filer ;-)	2012-03-22 13:46:05 +01:00
Tobias Diekershoff	5babf5c8b4	Merge branch 'quattrofiler'	2012-03-22 13:42:10 +01:00
Tobias Diekershoff	6df7fae4b5	non static filer text	2012-03-22 13:41:41 +01:00
Tobias Diekershoff	54c08b2b0f	adding filer functionality to quattro(-green)	2012-03-22 12:41:51 +01:00
friendica	808180ce5f	missing tooltip for "file as"	2012-03-22 04:07:37 -07:00
tommy tomson	e37c4f69b4	add file_as-option to diabook-derivates	2012-03-22 06:54:18 +01:00
tommy tomson	72d0756fa6	add icons to aside diabook, fixes in css	2012-03-22 04:33:21 +01:00
friendica	89028f2e2f	add comix-plain	2012-03-21 13:55:37 -07:00
friendica	56495e04b2	smooth the comix comment box	2012-03-21 06:48:04 -07:00
friendica	1a98f3c067	ika to ica	2012-03-21 00:35:33 -07:00
friendica	adcf52d02d	facepark is unsupported ATM	2012-03-21 00:08:06 -07:00
friendica	db02eebde1	Merge branch 'pull'	2012-03-20 23:59:02 -07:00
friendica	6c7b619b34	remove stray template variable from old code	2012-03-20 23:57:33 -07:00
friendica	efd7c14c24	Merge pull request #154 from tonybaldwin/master added theme	2012-03-20 23:31:12 -07:00
friendica	0dc4c3f484	add comix theme	2012-03-20 22:54:20 -07:00
friendica	4d39b0658f	use password field for DB input	2012-03-20 22:53:19 -07:00
tony baldwin	e5c29fcc78	Merge remote branch 'upstream/master'	2012-03-21 01:36:23 -04:00
tony baldwin	cf17606d0f	added Vijay's theme from facepark.in	2012-03-21 01:33:48 -04:00
Simon L'nu	de0298e67e	some tweakings for intro boxes (finally got an intro i could see :). dispy synced with dispy-dark Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-20 11:37:51 -04:00
friendica	cca524495c	community discovery cont., cleanup of DB debugging	2012-03-18 22:12:36 -07:00
friendica	c286681158	Merge pull request #147 from CatoTH/master CSRF-Protection in the group-related form	2012-03-18 17:54:12 -07:00
Simon L'nu	e84095182f	fix the comment box being too wide and looking off-kilter Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-18 18:33:38 -04:00
Michael Vogel	6f10142b2e	API: Seesmic is now working. Optimizing text export.	2012-03-18 17:52:51 +01:00
Tobias Hößl	453b5b46a3	CSRF-Protection in the group-related form (creating, renaming and dropping a group, adding/removing members from it)	2012-03-18 15:44:33 +00:00
Simon L'nu	87fdae2dd8	[fix] whitespace in photo_view and like_noshare. dispy-dark clean up Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-17 01:55:40 -04:00
Simon L'nu	75883b196e	remove auto-complete from darkzero-NS, dispys, since the comment one is now global Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-16 21:23:24 -04:00
Simon L'nu	368d93625d	make auto-complete in darkzero-NS. other themes can use this easily. might need to edit the id it hooks into Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-16 20:29:02 -04:00
Simon L'nu	91fee866b7	make profiles-menu disappear when clicked outside it Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-16 16:43:34 -04:00
Simon	1246a40ec2	Merge pull request #141 from CatoTH/master Private messages - tabindex	2012-03-16 10:54:20 -07:00
Tobias Hößl	90bb32ab73	Bugfix of old IEs	2012-03-16 17:47:40 +00:00
Tobias Hößl	27054964fe	Forgot to remove a debug line	2012-03-16 17:46:26 +00: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
Simon L'nu	7b15f27ba4	weee, dispys get another update Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-16 13:31:59 -04:00
Simon L'nu	d965f73ef1	missing close double quote in mail_list.tpl Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-16 01:57:27 -04:00
Simon L'nu	6bdb71f01c	more changes in dispy-dark Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-16 01:55:34 -04:00
friendica	33e03a8df0	Merge branch 'pull'	2012-03-15 19:56:32 -07:00
friendica	5a12383b78	undo git stuffup	2012-03-15 19:55:58 -07:00
tommy tomson	02395c8af5	added icons to profile_side, fixes in css	2012-03-16 03:49:43 +01:00
friendica	5d2c590fa9	Merge pull request #136 from annando/master Mail improvements, item caching and so on	2012-03-15 15:30:52 -07:00
Simon L'nu	5c75d40c0b	fixed the sidebar edit thingy. haven't synced dispy yet. Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-15 17:27:06 -04:00
Michael Vogel	9243c9fc14	Merge commit 'upstream/master'	2012-03-15 21:11:58 +01:00
Simon L'nu	5b757e4e0e	commit latest to dispy-dark. fixes in html css and js Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-15 15:07:17 -04:00
friendica	a7fd3a8b24	Merge branch 'pull'	2012-03-15 01:48:10 -07:00
friendica	4cd3d5cd02	Merge https://github.com/friendica/friendica into pull	2012-03-15 01:48:07 -07:00
tommy tomson	6dbee45d92	add links to wall, photos, events, etc to aside on networkpage, fixes in css	2012-03-15 08:29:39 +01:00
friendica	93a8907f43	force login to ssl on SSL_POLICY_SELFSIGN	2012-03-14 21:29:44 -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	959aa13de0	Merge pull request #133 from tonybaldwin/master slack-NS	2012-03-14 15:15:34 -07:00
friendica	2dc527609e	Merge https://github.com/friendica/friendica into pull	2012-03-14 14:34:48 -07:00
Simon	c95deb4839	Merge pull request #134 from simonlnu/master PHP Fatal error: Call-time pass-by-reference has been removed in mod/item.php on line 630	2012-03-14 08:02:04 -07: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
tommy tomson	f03c57007a	fix in nav	2012-03-14 12:56:59 +01:00
tommy tomson	42462cc1f0	add links to home, profile, photos, events, notes to aside in network-stream	2012-03-14 12:50:11 +01:00
Simon	fb77bfa648	Merge pull request #131 from simonlnu/master massive work done to both dispys, mostly -dark	2012-03-13 22:10:02 -07:00
Simon L'nu	975781d3e2	massive work done to both dispys, mostly -dark Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-14 01:05:08 -04:00
friendica	4972d7ef6e	more work on filer, comment level and file tag removal	2012-03-13 20:46:37 -07:00
Tony Baldwin	1ae740535d	added slack-NS, non-scrolly, slackr-based theme.	2012-03-13 23:05:04 -04: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	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
friendica	acc4bbeb6e	Merge pull request #129 from CatoTH/master CSRF-Protection and minor changes	2012-03-13 14:36:52 -07:00
friendica	bf7425c591	click anywhere to close notifications -> zeros and bubbles	2012-03-12 20:21:32 -07:00
tommy tomson	8358b9247f	fix css	2012-03-13 00:38:38 +01:00
tomtom84	ecc9f4ba70	Merge pull request #127 from tomtom84/master fixes in diabook-derivates	2012-03-12 16:06:15 -07:00
tommy tomson	27bc8052d0	use fancybox instead of lightbox	2012-03-13 00:04:19 +01:00
tomtom84	8a85914e1d	Merge pull request #126 from tomtom84/master fixes in diabook-derivates	2012-03-12 15:33:29 -07:00
tommy tomson	caffb217c1	fixes	2012-03-12 23:31:54 +01:00
Tobias Hößl	59766b944c	Some security against XSRF-attacks	2012-03-12 20:17:37 +00:00
tomtom84	a1305433b8	Merge pull request #125 from tomtom84/master fixes in diabook-derivates	2012-03-12 13:11:19 -07:00
tommy tomson	9436175746	add lightbox, fixex in css	2012-03-12 21:09:16 +01:00
Simon L'nu	9f52e3df8d	fix dispy-dark photo album stuff Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-11 21:34:51 -04:00
Simon L'nu	e9b82bb5ee	fix dispys' css and layout Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-11 20:36:16 -04:00
Michael Vogel	7235d5466a	Removed changes	2012-03-11 20:24:55 +01:00
Michael Vogel	d653e27e2d	Merge commit 'upstream/master' Conflicts: view/theme/diabook/wall_item.tpl view/theme/diabook/wallwall_item.tpl	2012-03-11 20:22:28 +01:00
Michael Vogel	b879a1ddf1	Pages: Show every community page - even from foreign servers (with caching)	2012-03-11 17:45:12 +01:00
Simon L'nu	258a8c0871	screwed up on the font-size for screen last push Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-11 10:29:12 -04:00
Simon L'nu	fa0cb8514d	add some '@media handheld' types for dispys Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-11 10:24:49 -04:00
Simon L'nu	62fe48f064	fix more stuff Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-11 10:14:31 -04:00
Simon L'nu	57d8370376	fix some stuff right away Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-11 09:12:31 -04:00
Simon L'nu	f7ade749b8	preliminary dispy-dark theme. WIP! did i say "WIP!"? yes, i did. WIP! Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-11 01:32:11 -05:00
friendica	1bddd48661	bug #327 - composed private message is lost if no recip specified.	2012-03-10 15:50:51 -08:00
Michael Vogel	74b3e9f273	Enabled Caching for items. Changed color of tags in diabook.	2012-03-10 15:50:35 +01:00
tomtom84	c79cb57e1e	Merge pull request #118 from tomtom84/master fixes in diabook-derivates	2012-03-10 04:24:49 -08:00
tommy tomson	0f3255467e	fixed login-fields, fixed. notofication.png, changed locations	2012-03-10 13:22:41 +01:00
Tobias Diekershoff	1e37477fdc	German translation	2012-03-10 10:36:20 +01:00
Michael Johnston	fd1f8fb436	allow user to set number of items to show on network page	2012-03-09 21:29:39 -05:00
Michael Vogel	cb1ecf2c5a	diabook: Moving the location between the icons	2012-03-10 00:15:27 +01:00
tomtom84	68ca29719e	Merge pull request #116 from tomtom84/master fixes in diabook-derivates	2012-03-09 09:17:01 -08:00
tommy tomson	8fe4645a5d	add js to hide nav-menus, when clicked outside	2012-03-09 18:15:27 +01:00
tomtom84	68541b5dd2	Merge pull request #115 from tomtom84/master fixes in diabook-derivates	2012-03-09 04:24:59 -08:00
tommy tomson	9f441731af	fixes in css	2012-03-09 13:23:38 +01:00
Alexander Kampmann	af34cf019c	Merge branch 'master' of git://github.com/friendica/friendica	2012-03-09 12:17:19 +01:00
friendica	2ce78253ae	Merge branch 'pull'	2012-03-09 00:48:16 -08:00
friendica	3878b58f0d	bug #324 - tinymce used for mail even if editplain being used.	2012-03-09 00:47:10 -08:00
Simon L'nu	81f5b0e2df	[theme:dispy] optimised the pngs: bet. 0 and 30% savings in size. style label elemnts. Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-09 00:26:54 -05:00
Simon L'nu	dc8d060d4d	i consider dispy pretty stable at this point, so i'm removing the experimental file Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-09 00:00:56 -05:00
Simon L'nu	20b2090182	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: removed info add info fixed star-bug More improved transparency for smilies removed dolphin file (wtf?) . * master:	2012-03-08 23:59:43 -05:00
tomtom84	e25fb2b2f9	Merge pull request #112 from tomtom84/master fixes in diabook-derivates	2012-03-08 19:39:39 -08:00
tommy tomson	e06b941307	removed info	2012-03-09 04:38:20 +01:00
tomtom84	92ab98f8d8	Merge pull request #111 from tomtom84/master fixes in diabook-derivates	2012-03-08 19:16:01 -08:00
tommy tomson	722f631d15	add info	2012-03-09 04:14:24 +01:00
tomtom84	05561bd905	Merge pull request #110 from tomtom84/master fixes in diabook-derivates	2012-03-08 18:02:25 -08:00
tommy tomson	feda3cfc96	fixed star-bug	2012-03-09 02:59:13 +01:00
Simon L'nu	8d19baadff	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: theme info file for testbubble catalan translation revup add theme diabook-blue, fix css * master:	2012-03-08 20:38:54 -05:00
friendica	b86a08166c	theme info file for testbubble	2012-03-08 16:30:45 -08:00
friendica	af9f7da449	catalan translation	2012-03-08 16:29:22 -08:00
friendica	3b47626c15	Merge https://github.com/friendica/friendica into pull	2012-03-08 14:35:47 -08:00
tommy tomson	b9dda93f0c	add theme diabook-blue, fix css	2012-03-08 23:22:26 +01:00
Simon L'nu	5fe8952c29	make svg from notifications.svg to ease future editing. more dispy tweaks Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-08 13:37:45 -05:00
tomtom84	08b5ede5a1	Merge pull request #107 from tomtom84/master fixes in theme diabook	2012-03-08 05:52:14 -08:00
tommy tomson	1fcbc7aa5a	add links to /profiles, add some icons to diabook/icons, fixes in css	2012-03-08 14:49:07 +01:00
Simon L'nu	15d310e4c3	fix jot.tpl buttons. fix up subsequent styling breakage Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-07 12:35:04 -05:00
Simon L'nu	66d2c52b5f	push fix for funky menu action. the overflow-x might break again for some people Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-07 10:07:36 -05:00
Alexander Kampmann	4690d00141	Merge branch 'master' of git://github.com/friendica/friendica	2012-03-07 12:06:20 +01:00
Alexander Kampmann	b2df1205ef	merged	2012-03-07 12:06:09 +01:00
tomtom84	dd2ff7c796	Merge pull request #103 from tomtom84/master fixes in theme diabook	2012-03-06 23:44:18 -08:00
tommy tomson	ec3ce05357	fix in navbar	2012-03-07 08:42:19 +01:00
tomtom84	05a52b2660	Merge pull request #101 from tomtom84/master fixes in theme diabook	2012-03-06 15:49:32 -08:00
tommy tomson	49b5a1bf20	fix in navbar	2012-03-07 00:47:43 +01:00
Simon	decc9e5798	Merge pull request #99 from tomtom84/master fixes in theme diabook	2012-03-06 15:22:55 -08:00
tommy tomson	6a5c4bab9c	messages-menu translation, add scroll-to-top and theme-bug-report in theme	2012-03-07 00:07:27 +01:00
Simon L'nu	edd450cf06	dispy, dispy, oh what a little lispy Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-06 17:55:05 -05:00
friendica	8fb0ea4048	bugs #312 , #313	2012-03-06 14:27:53 -08:00
Simon L'nu	bc8b014906	styling fixes in dispy. fix typos in settings.tpl Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-06 16:18:26 -05:00
Fabio Comuni	607ee1ff9c	quattro: theme settings (a bit hackish)	2012-03-06 09:50:18 +01:00
tommy tomson	eaaf030c18	Merge remote-tracking branch 'origin/master'	2012-03-06 08:28:21 +01:00
tommy tomson	b64b1d13a4	fixes in diabook	2012-03-06 08:27:20 +01:00
friendica	321b651635	Merge branch 'pull'	2012-03-05 18:52:15 -08:00
friendica	23460302f5	some admin page fixes and cleanup	2012-03-05 18:51:21 -08:00
Michael Johnston	9f44dbbb48	changed bg color around comment box from white to match page background, improved contrast on comment preview (darkzero)	2012-03-05 21:10:01 -05:00
friendica	e5de03040e	Merge branch 'pull'	2012-03-05 15:59:28 -08:00
friendica	7b3349f38a	some testbubble stuff	2012-03-05 15:58:26 -08:00
Simon L'nu	190650060a	forgot a small change in .field_help Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-05 18:16:51 -05:00
Simon L'nu	50824bddd0	implement more of the changes requested Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-05 17:57:04 -05:00
tommy tomson	a406c16581	fixes	2012-03-05 22:31:03 +01:00
Alexander Kampmann	fbc017cdba	added test blueprints, fixed? encoding issues	2012-03-05 22:22:10 +01:00
Simon L'nu	9d461846e2	multiple fixes; the jot-header works as standalone, not sure what's up. Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-05 15:55:17 -05:00
Simon L'nu	02f825ca3c	tweak sizing of <section> and <aside> more; fix link in 'view contacts' in sidebar Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-05 13:16:28 -05:00
Simon L'nu	ef1d02e7bd	still working on jot-header. amending <aside> and other elements Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-05 12:21:57 -05:00
Simon L'nu	65b6ec79ed	hopefully fix the overflow issue everywhere this time Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-05 10:55:26 -05:00
friendica	965e657c20	$name appearing on testbubble items	2012-03-05 03:10:45 -08:00
friendica	31f192bb57	Merge branch 'pull'	2012-03-05 00:54:25 -08:00
friendica	0d97799324	testbubble notifications	2012-03-05 00:53:42 -08:00
Simon L'nu	7de79a8c49	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: like dislike button fixes in diabook * master:	2012-03-05 01:08:54 -05:00
Simon L'nu	fe7a6b070d	yet more ui things, and bug fixing Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-05 01:08:45 -05:00
tomtom84	9c541dbd67	Merge pull request #83 from tomtom84/master fixes in diabook theme	2012-03-04 20:15:26 -08:00
tommy tomson	fe614b4e7c	like dislike button	2012-03-05 05:14:08 +01:00
Simon	04527bd0b1	Merge pull request #80 from unary/darkzero improved contrast in acl selector, and preview (darkzero)	2012-03-04 19:19:45 -08:00
Simon	3b95171824	Merge pull request #82 from simonlnu/master say hello to dispy's younger brother	2012-03-04 19:19:08 -08:00
Simon L'nu	58cdf776b6	more ui thingies with dispy - we'll get you well dispy, we promise Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-04 22:16:10 -05:00
friendica	b57247d6a6	Merge branch 'pull'	2012-03-04 19:15:42 -08:00
friendica	b9bea3a549	wrap title and text for editplain in zero and TB themes	2012-03-04 19:14:03 -08:00
friendica	fba089012a	correct owner info from misconfigured installs, duepuntozero title block misplaced in editplain mode	2012-03-04 18:50:32 -08:00
tommy tomson	e52891d8ab	fixes in diabook	2012-03-05 03:08:58 +01:00
tomtom84	d369fcc994	Merge pull request #81 from tomtom84/master fixes in diabook theme	2012-03-04 17:46:48 -08:00
tommy tomson	1653e5a615	fixes in diabook	2012-03-05 02:45:24 +01:00
Michael Johnston	b2035ae0c6	improved contrast in acl selector, and preview (darkzero)	2012-03-04 17:29:00 -05:00
Simon L'nu	2441babbe9	removed extra padding/border on tread-wrapper (heh, tea read :P) Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-04 15:52:50 -05:00
Simon L'nu	25510453bf	fix up toolbar so the notifications line up better together Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-04 14:55:09 -05:00
Simon L'nu	5f77aff486	more tweakage. stylesheet and jot-header Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-04 12:21:08 -05:00
tommy tomson	8e49b4332c	style.css fix	2012-03-04 14:19:53 +01:00
Simon L'nu	cb57a0ebfd	soften '.shiny' a bit to fit in with colour scheme. tweak wall boxes Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-04 05:19:49 -05:00
Simon L'nu	c28ce8a79c	tweak wall items a bit (nasty-looking wall items...). jot-header tries to count chars and fails :P Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-04 05:00:35 -05:00
tomtom84	dfa056bb1b	Merge pull request #74 from tomtom84/master fixes in diabook theme	2012-03-03 20:49:09 -08:00
tommy tomson	e0e0224fa6	some fixes in diabook	2012-03-04 05:48:06 +01:00
Simon	f3c1e2c546	Merge pull request #73 from simonlnu/master dispy! (and minor formatting)	2012-03-03 16:23:07 -08:00
Simon L'nu	09c2f81cb3	these are more finessing on formatting again Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-03 19:20:23 -05:00
Simon L'nu	64400e8d59	first commit for dispy New Edition Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-03 19:19:35 -05:00
tomtom84	74866a96de	Merge pull request #72 from tomtom84/master fixes in diabook theme	2012-03-03 15:10:54 -08:00
tommy tomson	25d6ca3b73	tag fix	2012-03-04 00:10:03 +01:00
tomtom84	f4b9c405da	Merge pull request #71 from tomtom84/master fixes in diabook theme	2012-03-03 14:45:03 -08:00
tommy tomson	b3eeb22401	fix	2012-03-03 23:43:15 +01:00
tomtom84	77db5becb6	Merge pull request #70 from tomtom84/master fixes in diabook theme	2012-03-03 14:13:14 -08:00
tommy tomson	173fb983c5	navbar fix	2012-03-03 23:12:03 +01:00
Simon L'nu	1bed4010aa	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: Added docblox default configuration file. fixed apps css * master:	2012-03-03 16:49:22 -05:00
tomtom84	7230fa5a94	Merge pull request #68 from tomtom84/master fixes in diabook theme	2012-03-03 12:48:34 -08:00
tommy tomson	42b9887693	fixed apps css	2012-03-03 21:45:59 +01:00
Simon L'nu	da78d8594f	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: fixed star/unstar fixed admin fixed editor * master:	2012-03-03 13:39:56 -05:00
tomtom84	1dfd5c4f85	Merge pull request #67 from tomtom84/master fixes in diabook theme	2012-03-03 10:09:28 -08:00
tommy tomson	d4ac1f2a9c	fixed star/unstar	2012-03-03 19:07:55 +01:00
tomtom84	e84e684fdc	Merge pull request #66 from tomtom84/master fixed editor and admin-sec in theme diabook	2012-03-03 07:54:21 -08:00
tommy tomson	83e9f57459	fixed admin fixed editor	2012-03-03 16:49:48 +01:00
Simon L'nu	2b9ea33e8b	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: fix editor * master:	2012-03-03 09:45:32 -05:00
tomtom84	792031c36e	Merge pull request #65 from tomtom84/master fix editor in theme diabook	2012-03-03 06:03:34 -08:00
tommy tomson	b3ba2eb4d0	fix editor	2012-03-03 15:01:25 +01:00
Simon L'nu	ba28404470	Merge branch 'master', remote-tracking branch 'remotes/upstream/master' * remotes/upstream/master: fix text-editor in theme german strings as of 28th Feb from transilex small fix in style.css fix star/unstar fixes in wall_item.tpl and style.css in theme diabook fix in wall_item.tpl new icon link.png add diabook to default themes fixed broken tags and notifications in theme * master:	2012-03-03 08:05:53 -05:00
tomtom84	8ffe15fbb1	Merge pull request #64 from tomtom84/master fix editor in theme diabook	2012-03-03 04:30:31 -08:00
tommy tomson	60adef2463	fix text-editor in theme	2012-03-03 13:27:39 +01:00
Tobias Diekershoff	9d885c4801	german strings as of 28th Feb from transilex	2012-03-03 12:17:32 +01:00
tomtom84	b4361e37e0	Merge pull request #63 from tomtom84/master fixes in diabook theme	2012-03-02 21:02:55 -08:00
tommy tomson	83c25b4386	small fix in style.css	2012-03-03 06:00:46 +01:00
tommy tomson	89f667ff76	fix star/unstar	2012-03-03 04:45:34 +01:00
friendica	2ae82ae3c2	Merge pull request #62 from tomtom84/master fixes in diabook theme	2012-03-02 19:32:34 -08:00
tommy tomson	d138d07c05	fixes in wall_item.tpl and style.css in theme diabook	2012-03-03 04:27:06 +01:00
tommy tomson	8f72d95b0e	fix in wall_item.tpl new icon link.png	2012-03-03 01:52:53 +01:00
Simon L'nu	7ef861907e	minor formatting issues Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-02 19:09:17 -05:00
tommy tomson	d3f83c9375	fixed broken tags and notifications in theme	2012-03-03 00:41:02 +01:00
Simon L'nu	81de5f7802	apply changes to templates to testbubble Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-02 13:59:28 -05:00
Simon	e2e9050d74	Merge pull request #58 from simonlnu/master fix for comment-wwedit-wrapper; CSS class in tpl had a stray $	2012-03-02 09:28:04 -08:00
Simon	d61ee3760d	Merge pull request #59 from tomtom84/master diabook theme	2012-03-02 09:25:42 -08:00
tommy tomson	64a85b2507	deleted readme.txt from folder diabook	2012-03-02 18:01:21 +01:00
Simon L'nu	9c698b1a60	fix for comment-wwedit-wrapper CSS class in tpl had a stray $ Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-03-02 12:00:16 -05:00
tommy tomson	ac1d758f6e	github finally working	2012-03-02 17:47:45 +01:00
tommy tomson	d72520f5f1	adjust3	2012-03-02 17:45:21 +01:00
tommy tomson	e2798cee16	adjust	2012-03-02 16:01:20 +01:00
Fabio Comuni	ef34847501	templates: fix tags	2012-03-02 12:41:34 +01:00
fabrixxm	3a609adfb7	Merge pull request #55 from fabrixxm/master Some minor and one majior mod in templates	2012-03-02 00:00:03 -08:00
tommy tomson	5183e737d0	diabook commit	2012-03-02 02:05:35 +01:00
Fabio Comuni	ed42fa7d59	conversation: remove templating items in code and move it to template.	2012-03-01 11:46:08 +01:00
Fabio Comuni	a26ce7c56b	show relation in contact_template	2012-03-01 11:31:16 +01:00
Fabio Comuni	b71a3af457	Merge remote-tracking branch 'friendica/master' into randomerror	2012-02-29 14:58:37 +01:00
Fabio Comuni	42d591d257	revert `01a2791e3a` to avoid random preg internal errors. fix contact_template	2012-02-27 18:48:59 +01:00
friendica	153e7beb19	add plugin hooks to enotify	2012-02-26 23:54:04 -08:00
Simon L'nu	72e78046af	minor typographical fixes. need to do something about the http on https sites for html5shiv. changed to https on mine Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-02-27 01:04:41 -05:00
friendica	6bc48b29cc	fix tag icon size	2012-02-26 16:40:21 -08:00
friendica	e994b990eb	typo in css	2012-02-26 16:31:51 -08:00
friendica	a1861d1128	tagging missing from wallwall and a couple of themes, star missing from dispy	2012-02-26 16:29:06 -08:00
Michael	fe3dfbee56	Mail: New options for actions after importing mails.	2012-02-26 23:39:29 +01:00

... 13 14 15 16 17 ...

2790 Commits