2333 commits

Author	SHA1	Message	Date
Michael Vogel	8adc1bd703	Vier: Improved scrollbar when the "aside" area is to short.	2013-10-04 11:12:29 +02:00
Oliver	53040c0814	Update style.css ... no opacity for remote-link icon	2013-09-24 09:18:29 +02:00
tobiasd	b178317cbb	Merge pull request #774 from silke/frost-mobile-share-link ... Transferred link link from Neptune theme (by 23n) to frost-mobile	2013-09-23 21:36:47 -07:00
Silke Meyer	5075770654	Transferred link link from Neptune theme (by 23n) to frost-mobile	2013-09-24 00:28:35 +02:00
tomtom84	ca39c2acb4	- diabook update ... -- adjust nav-bar, depending to userstatus	2013-09-11 19:14:41 +02:00
tomtom84	9ddca9425d	update diabook-theme ... -- fixed contact-edit-page -- some css-fixes	2013-09-08 04:30:55 +02:00
tomtom84	06994b94b2	- update diabook-theme: ... -- removed twitter-box from right col, because api is outdated -- some css-fixes	2013-09-07 03:28:52 +02:00
tomtom84	4747145ca9	add a readme to diabook-folder and update my fork	2013-09-06 20:51:33 +02:00
tomtom84	8c0c807a59	add a readme to diabook-folder	2013-09-06 20:51:33 +02:00
Michael Vogel	9bbf60ac9b	Vier: A little rearrangement of the menu order.	2013-06-23 00:26:04 +02:00
Michael Vogel	bd7abe210c	Vier: Introductions are now shown. The popup menu when editing a profile is visible again.	2013-06-23 00:07:21 +02:00
Zach Prezkuta	b4aa018d7b	forgot to update Frost autocomplete JS location	2013-06-04 20:29:33 -06:00
Zach Prezkuta	cc4d091db0	remove some now-unnecessary templates	2013-06-01 10:45:32 -06:00
Zach Prezkuta	127b7a589e	eliminate Cropper conflicts with jQuery	2013-06-01 10:42:51 -06:00
Fabrixxm	2111f750fb	quattro: show notification number in favicon	2013-05-31 06:18:59 -04:00
Tobias Diekershoff	5113885427	fix 540 in vier	2013-05-29 17:10:49 +02:00
Tobias Diekershoff	c82ab9e1b5	fix bug #540 for quattro themes	2013-05-29 10:44:09 +02:00
Zach Prezkuta	35358baac9	update to v4.0.0; point to local host of SWF	2013-05-11 10:55:09 -06:00
Zach Prezkuta	5d30008ab3	don't set img src in notifications to blank	2013-05-11 09:43:21 -06:00
fermionic	3a13aba62e	Merge pull request #674 from fermionic/20130503-basic-video-support ... basic video playback support using VideoJS	2013-05-11 08:33:36 -07:00
pixelroot	b06dab97ba	modified: view/theme/smoothly/default.php ... modified: view/theme/smoothly/style.css new file: view/theme/smoothly/templates/tools.tpl modified: view/theme/smoothly/theme.php	2013-05-08 14:46:42 +02:00
pixelroot	e90c89f3fc	new file: view/theme/smoothly/images/power.png ... new file: view/theme/smoothly/images/up.png	2013-05-08 11:09:08 +02:00
pixelroot	523548ff22	modified: view/theme/smoothly/default.php ... modified: view/theme/smoothly/images/down.png modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php view/theme/smoothly/images/power.png view/theme/smoothly/images/up.png	2013-05-08 11:08:21 +02:00
Zach Prezkuta	bc57d7f64e	bug in main.js for VideoJS on initial page load	2013-05-07 22:06:40 -06:00
pixelroot	258604f036	modified: view/theme/smoothly/css/typography.css	2013-05-07 14:30:04 +02:00
pixelroot	8c8d3913cc	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2013-05-07 14:01:54 +02:00
pixelroot	5ac6e82e7d	modified: view/theme/smoothly/default.php ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2013-05-07 09:39:14 +02:00
Zach Prezkuta	bd20f6ed9a	add some styling for the video player	2013-05-03 19:09:12 -06:00
Zach Prezkuta	fec4581f34	basic video playback support using VideoJS	2013-05-03 18:17:56 -06:00
friendica	61a0f9c196	bug #540 and hush up a couple of log messages that are way too verbose	2013-04-28 04:30:20 -07:00
pixelroot	f41c5dd1e5	modified: view/theme/smoothly/css/typography.css ... modified: view/theme/smoothly/default.php modified: view/theme/smoothly/style.css modified: view/theme/smoothly/templates/nav.tpl modified: view/theme/smoothly/theme.php	2013-04-24 14:09:24 +02:00
Fabrixxm	4dc72742ae	remove unneeded files	2013-04-23 07:52:36 -04:00
Fabrixxm	379c761c3f	missing "templates" folders	2013-04-23 07:47:57 -04:00
Fabrixxm	6fddd1cbbf	template: remove old 'internal' template files, move smarty3 templates into 'templates' subdir	2013-04-23 03:35:31 -04:00
Zach Prezkuta	78e747016f	update mobile theme settings pages	2013-04-18 19:47:27 -06:00
Zach Prezkuta	2316e0d731	update admin options for frost, frost mobile, and decaf mobile	2013-04-04 16:42:39 -06:00
pixelroot	ee07251d38	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2013-04-01 19:36:22 +02:00
tobiasd	cda327a368	Merge pull request #658 from annando/master ... Mail importing problems, a small "vier" change	2013-03-30 01:46:13 -07:00
Michael Vogel	eabefb2f04	vier: The background color of the right area is now white.	2013-03-29 11:18:20 +01:00
pixelroot	d685181101	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2013-03-27 20:08:06 +01:00
pixelroot	2b7dd2f72b	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2013-03-26 17:10:58 +01:00
pixelroot	296c49f4a1	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2013-03-26 15:47:17 +01:00
pixelroot	0a446da659	modified: view/theme/smoothly/css/typography.css ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2013-03-26 11:28:22 +01:00
Michael Vogel	111495423c	Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated.	2013-03-14 23:15:15 +01:00
pixelroot	bb3e8ad785	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2013-03-12 10:06:19 +01:00
pixelroot	a65ae04bcc	modified: view/theme/smoothly/style.css	2013-03-11 19:59:49 +01:00
pixelroot	a2adc03636	deleted: view/theme/smoothly/login.tpl ... deleted: view/theme/smoothly/smarty3/login.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2013-03-11 19:19:33 +01:00
Michael Vogel	5d3613c8bc	Vier: The change from blue to black in links is now faded as well.	2013-03-07 19:34:54 +01:00
Michael Vogel	c40c61c106	OStatus conversations: Fixed a bug when a message hadn't got an id. ... vier: Some more changes to make the side menu static. In the index.php I did a small change to make friendica compatible with the android client for diaspora.	2013-03-06 23:23:04 +01: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	1c55b0b359	Merge pull request #639 from annando/master ... Community/Open Graph	2013-03-03 12:07:52 -08:00
Zach Prezkuta	0187283709	allow admin to prevent private image embedding on hub	2013-03-03 09:44:41 -07:00
Michael Vogel	05597b564d	Merge remote-tracking branch 'upstream/master'	2013-03-03 16:30:18 +01:00
friendica	f07df4f667	merge	2013-03-02 15:46:54 -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
tobiasd	69776fc54e	Merge pull request #627 from fermionic/20130223-quattro-vier-smarty-updates ... some smarty templates needed updating	2013-02-23 23:26:48 -08:00
Zach Prezkuta	047cf0d342	some smarty templates needed updating	2013-02-23 09:36:00 -07:00
Zach Prezkuta	4db50a3ecb	admin option to disable post content in email notifications for the site	2013-02-23 09:31:34 -07:00
Fabrixxm	7a6d63a1b3	quattro: autocomplete private message To field	2013-02-22 11:02:01 -05:00
Fabrixxm	cc210bae3d	quattro: fix item max-width, fix contact serarch autocomplete popup style	2013-02-22 10:45:40 -05:00
fermionic	dbf51229d9	Merge pull request #621 from annando/master ... Using "term" table to improve performance, OStatus autocomplete, some more performance stuff	2013-02-21 10:16:50 -08:00
pixelroot	5c6562a996	modified: view/theme/smoothly/style.css	2013-02-21 08:46:30 +01:00
Michael Vogel	0d4d15c73d	Merge remote-tracking branch 'upstream/master' ... Conflicts: mod/admin.php	2013-02-20 21:57:26 +01:00
pixelroot	7a1947b88a	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2013-02-20 21:03:02 +01:00
Michael Vogel	93143702ed	Merge remote-tracking branch 'upstream/master' ... Conflicts: boot.php database.sql library/fancybox/jquery.fancybox-1.3.4.css mod/search.php update.php	2013-02-17 12:35:40 +01:00
Michael Vogel	3e58060b30	API: beautify the output of repeated items ... Vier: Birthday reminder looks better	2013-02-15 20:14:45 +01:00
fermionic	8e80755a47	Merge pull request #615 from fermionic/20130210-update-frost-mobile ... add new Smarty3 templates	2013-02-10 16:12:50 -08:00
Zach Prezkuta	e377fd9d22	add new Smarty3 templates	2013-02-10 17:11:55 -07:00
fermionic	6b6f00c702	Merge pull request #613 from fermionic/20130210-update-frost ... update to Frost v0.4	2013-02-10 14:02:53 -08:00
Zach Prezkuta	646c161506	added files for Frost Mobile v0.3	2013-02-10 15:00:20 -07:00
Zach Prezkuta	4d8678e523	update to Frost v0.4	2013-02-10 14:57:44 -07:00
Zach Prezkuta	c1c83115ad	Update Frost-mobile to v0.3	2013-02-10 10:21:52 -07:00
Zach Prezkuta	c4e6cb916d	move all commands inside the duepuntozero_init() function	2013-02-08 09:03:50 -07:00
friendica	c273adf0fe	Merge pull request #608 from fermionic/20130204-diabook-reduce-css ... Try to start reducing Diabook CSS	2013-02-05 17:36:33 -08:00
friendica	2044862eb9	Merge pull request #607 from fermionic/20130204-attach-types-are-too-coarse ... add support for more file attachment types	2013-02-05 17:19:53 -08:00
Zach Prezkuta	d8f7e9be26	make the diabook-aerith -wide.css variants inherit from the non-wide css files	2013-02-04 22:34:48 -07:00
Zach Prezkuta	665af33726	have the base -wide.css variants inherit from the non-wide version	2013-02-04 22:17:55 -07:00
Zach Prezkuta	6152cbd5ac	add support for more file attachment types	2013-02-04 22:15:16 -07:00
Zach Prezkuta	2b94590bbf	elastic transitions	2013-02-04 18:20:47 -07:00
Zach Prezkuta	0e67ba2bd4	update minified javascripts	2013-02-04 18:16:13 -07:00
Zach Prezkuta	1033e8896f	finish updating themes for colorbox	2013-02-04 18:09:56 -07:00
Zach Prezkuta	0f25455d1b	starting switching to colorbox	2013-02-04 18:09:56 -07:00
zottel	7db626b1b5	also reset network in mobile themes, smarty3 updates	2013-02-01 20:37:16 +01:00
Zach Prezkuta	7d3a923294	script for minifying javascript files	2013-01-31 19:05:27 -07:00
Thomas Willingham	d0d9ae3096	Dispy - remove head.tpl. It isn't actually required, and is the main cause of breakage in the theme.	2013-01-30 02:51:47 +00:00
friendica	a5ac69c65e	Merge pull request #591 from fermionic/20130126-javascript-free-theme ... Decaf mobile: an (almost) Javascript-free theme	2013-01-27 19:11:36 -08:00
Zach Prezkuta	6668d22d37	try to improve TinyMCE block handling	2013-01-27 14:41:48 -07:00
Zach Prezkuta	a15fff2fc6	mark experimental	2013-01-26 13:10:10 -07:00
Zach Prezkuta	acc4d66cd3	update smart templates	2013-01-26 13:07:54 -07:00
Zach Prezkuta	488a38cd85	Decaf mobile: an (almost) Javascript-free theme	2013-01-26 13:01:57 -07:00
Michael - piratica.eu	cc9ce39e3f	Merge branch 'master' of https://github.com/annando/friendica ... Conflicts: include/poller.php	2013-01-20 14:17:09 +01:00
Michael - piratica.eu	7ab335c9d6	Diaspora: Auto-adding users as friend who already sharing with us	2013-01-20 14:08:28 +01:00
Michael Vogel	4e3d0018c6	Merge remote-tracking branch 'upstream/master' ... Conflicts: boot.php include/items.php update.php	2013-01-20 14:07:57 +01:00
friendica	30f1fb2c4d	provide a date indication in reshared content	2013-01-15 14:58:50 -08:00
friendica	8b643d4c88	Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements ... fixes and tweaks to Smarty processing	2013-01-12 12:28:14 -08:00
Zach Prezkuta	74caf1a4a7	* Add MIME types for file attachments ... * Restore translatability to mood phrases * Prevent casting of "false" in html2plain * Allow attachments with a comma in the filename * Fix/optimize ACL img data-src jQuery search * Fix bug when uploading files with a comma in the name using Chrome/Chromium * Babel nicer output formatting * Remove obsolete "plaintext" check in mod/parse_url * Restore TinyMCE live insertion of images * Smarty conversion script: add --no-header option to suppress warning headers in Smarty template files	2013-01-12 06:31:32 -07:00
Zach Prezkuta	609c45e791	fixes and tweaks to Smarty processing	2013-01-12 05:58:54 -07:00
Zach Prezkuta	c43ff35fe7	newline at end of header	2013-01-11 10:00:10 -07:00
Zach Prezkuta	1656c63a55	add warning message about automatically generated templates	2013-01-11 09:57:11 -07:00
Oliver	a543a1a0c2	typo correction ... we don't want to drop Hilde	2013-01-11 14:15:17 +01:00
pixelroot	637cfdd7cb	modified: view/theme/smoothly/css/typography.css ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2013-01-11 10:56:14 +01:00
Zach Prezkuta	cd017282e4	use Python 2.4 compatible script; update Smarty templates	2013-01-10 22:34:23 -07:00
Michael Vogel	61c78711df	Preparations for a new tag structure. Tags are now stored in a dedicated table.	2013-01-11 01:20:16 +01:00
Michael Vogel	82820d8e95	Now the third most likely languages are shown. ... In "vier" the tag line is now suppressed. It saves a little bit of space - and is redundant.	2013-01-09 20:54:18 +01:00
friendica	f6a63abd7d	update smarty diabook templates bug 525	2013-01-08 14:45:19 -08:00
friendica	88cc414355	Merge pull request #570 from annando/master ... Vier, caches and "share" via API	2013-01-04 15:13:09 -08:00
friendica	c0fd572fec	Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init ... Finalize theme decision in a module's _init function	2013-01-04 14:36:47 -08:00
Zach Prezkuta	fdd142c42e	never use profile_load outside of a module's _init() function	2013-01-03 10:47:45 -07:00
Olaf Conradi	1c81409bf8	Merge pull request #573 from oohlaf/fixes ... Don't add src attributes inside acl-template	2013-01-02 05:32:19 -08:00
Olaf Conradi	2943550fe2	No need to remove data-src attributes ... Better comment string also	2013-01-02 14:28:13 +01:00
Christian Vogeley	457a3b5220	Change templates remove var modifiers	2013-01-01 23:41:26 +01:00
Christian Vogeley	cde9b6370d	Fix registration form	2013-01-01 21:05:24 +01:00
pixelroot	966d786982	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2013-01-01 16:42:52 +01:00
Zach Prezkuta	1d1c8f4771	replace dashes with underscores in diabook	2012-12-30 20:46:03 -07:00
Olaf Conradi	6a2bd8b29f	Don't replace data-src with src in acl-template ... On pageload an empty acl-list-item as template is created and not yet replaced. Don't change the data-src for src attributes in those images.	2012-12-31 00:01:15 +01:00
Michael Vogel	348f43157a	Vier: Some templates were missing	2012-12-30 22:58:05 +01:00
Michael Vogel	e50c0efcdf	Merge remote-tracking branch 'upstream/master'	2012-12-30 21:32:18 +01:00
Michael Vogel	ad287914c7	Support of "share" through the API.	2012-12-30 21:30:39 +01:00
Olaf Conradi	dbf8f711cf	Fix browser prefetch in notifications menu ... Fix browser prefetch by substituting data-src with src for images	2012-12-30 00:28:48 +01:00
Olaf Conradi	94c8d7693f	Keep html in template, use data attribute for img ... Revert previous changes to fix browser preloading a template variable as image. Images use a data attribute within templates as src. Javascript will substitute them.	2012-12-29 23:44:26 +01:00
Olaf Conradi	a41692120e	Also change acl stuff in the other themes	2012-12-28 23:51:40 +01:00
Michael Vogel	6f6b1f95c8	vier: With IE there are no borders around images anymore ... bbcode: Multiple new lines are now reduced	2012-12-28 11:31:30 +01:00
Zach Prezkuta	8066f2109e	update smarty templates	2012-12-27 12:23:37 -07:00
Zach Prezkuta	659ae4ed04	incremental improvements	2012-12-27 12:20:47 -07:00
Zach Prezkuta	b6981768ee	remove more dashes in templates	2012-12-27 09:38:42 -07:00
Michael Vogel	763504f0d5	Vier: Now the language of a post is shown	2012-12-27 01:05:59 +01:00
friendica	e189e6582a	fix profile_vcard all themes	2012-12-26 13:38:08 -08:00
Zach Prezkuta	263fe0f6bc	revert unnecessary variable name changes	2012-12-26 10:42:01 -07:00
Zach Prezkuta	189c8ccf6f	some missed templates	2012-12-25 12:28:24 -07:00
Zach Prezkuta	e736abd372	small fixes; update smarty3 templates	2012-12-25 12:05:46 -07:00
Zach Prezkuta	11c06e21b7	simplify by making Smarty include directives behave like Friendica native ones	2012-12-25 11:55:57 -07:00
Michael Vogel	5bc6896671	The caches are now cleared only once an hour.	2012-12-25 12:52:30 +01:00
fermionic	6603758a5e	Merge pull request #558 from fermionic/20121222-use-smarty-template-engine ... fix a few more templates for correct conversion to Smarty3 templates	2012-12-24 07:47:06 -08:00
Zach Prezkuta	ce445a385f	fix a few more templates for correction conversion to Smarty3 templates	2012-12-24 08:44:26 -07:00
Zach Prezkuta	f0bc8aa1dc	change field_*.tpl to * in some missed templates	2012-12-24 07:05:42 -07:00
Michael Vogel	bbec7a1ed9	Vier: added template for vcard	2012-12-24 12:41:00 +01:00
friendica	685a677bc9	Merge pull request #555 from annando/master ... Vier: Changed buttons	2012-12-24 03:22:43 -08:00
Michael Vogel	e0df845fa3	Vier: Changed the buttons to a flat style that suites more the style of "vier"	2012-12-24 11:07:51 +01:00
fermionic	80ea740cca	Merge pull request #554 from fermionic/20121222-use-smarty-template-engine ... couple more places where file_get_contents was used	2012-12-23 18:30:45 -08:00
Zach Prezkuta	fdd9ed7e51	couple more places where file_get_contents was used	2012-12-23 19:29:19 -07:00
fermionic	1392c58377	Merge pull request #552 from annando/master ... Vier: Forgotten CSS file and some more design changes	2012-12-23 17:16:20 -08:00
Michael Vogel	6649cb8e1a	Vier: New CSS file adde that acts like a translator between font awesome and the friendica classes	2012-12-23 23:54:28 +01:00
fermionic	974f60d132	Merge pull request #551 from fermionic/20121222-use-smarty-template-engine ... 20121222 use smarty template engine	2012-12-23 05:31:11 -08:00
Zach Prezkuta	232deadfd2	missed a couple more template engine assignments	2012-12-23 06:29:58 -07:00
fermionic	a0d7f7a6d3	Merge pull request #550 from fermionic/20121222-use-smarty-template-engine ... only use Smarty if the view/smarty3/ directory is writable	2012-12-23 05:19:02 -08:00
Zach Prezkuta	53a4cf5339	only use Smarty if the view/smarty3/ directory is writable; location bug fix	2012-12-23 06:16:35 -07:00
Michael Vogel	3a32372ffa	vier: Problems with firefox on small displays fixed	2012-12-23 10:58:04 +01:00
Michael Vogel	ed4eaed7e0	Vier: Content is now aligned left - like before.	2012-12-23 10:47:12 +01:00
Michael Vogel	2e83034fc3	Vier: Background color of popup menus changed	2012-12-23 10:31:46 +01:00
friendica	a29842e301	Merge https://github.com/annando/friendica into annando ... Conflicts: view/admin_site.tpl	2012-12-22 23:02:21 -08:00
Michael Vogel	4b240c9109	vier: Changed color of sidebar links, made the content centered.	2012-12-23 03:26:29 +01:00
Zach Prezkuta	96ed0a7791	Implement Smarty3	2012-12-22 12:57:29 -07:00
Michael Vogel	34128925dc	"vier": Now the search results containing a link to the original thread	2012-12-21 15:03:22 +01:00
Michael Vogel	61b51d40e7	Vier: disabling the "community" works now	2012-12-21 13:13:22 +01:00
Michael Vogel	d7073f7884	Vier: All optical glitches should be removed now.	2012-12-21 13:02:39 +01:00
Michael Vogel	293a794973	"vier": More icons replaced	2012-12-21 03:53:07 +01:00
Michael Vogel	7c7d3fe5de	"share" - now the attribut value for the "author" is escaped	2012-12-21 02:10:26 +01:00
Michael Vogel	f4bc5c57f3	New option to enable and disable the "share" element ... Changes to "vier" to use more "font awesome" icons	2012-12-21 00:08:58 +01:00
Michael Vogel	8e194cb411	Vier: switching some more icons to "font awesome"	2012-12-20 12:13:37 +01:00
friendica	898f68938a	Merge pull request #546 from annando/master ... Bugfix in mail import - use of the "share" element in ostatus and diaspora items	2012-12-19 22:54:53 -08:00
Michael Vogel	a8aa992102	Vier: Design issues with preview fixed	2012-12-20 04:19:02 +01:00
Michael Vogel	330960f8f7	Vier: Now there are buttons for inserting bbcode elements in the comments	2012-12-20 03:33:36 +01:00
Olaf Conradi	d9d7eb89ed	Fix alignment of photo menu ... Remove duplicate definitions Align menu button to be exactly the same width as the photo	2012-12-19 19:15:39 +01:00
Olaf Conradi	ee5d2acd42	Fix alignment of location	2012-12-19 19:04:18 +01:00
Olaf Conradi	98c5b6e73b	Text box alignment in Smoothly theme ... Make sure comment text boxes stay within their surrounding box.	2012-12-19 18:27:50 +01:00
Michael Vogel	a86baa372a	Mailimport is now realized like a wall-to-wall-post	2012-12-19 15:58:38 +01:00
Michael Vogel	c22f65bafa	repeated items from ostatus and diaspora are now using the share-element. ... Some design changes to repeated items in "vier".	2012-12-19 12:18:52 +01:00
Michael Vogel	4164257cb2	vier: The alt-pager and the birthday- and eventreminder is optically improved	2012-12-17 21:12:11 +01:00
Michael Vogel	9c0de28622	bbcode: New element "share" for shared content ... mail: Now mails connected via subject line if there isn't an appropriate header. vier: Improvents to the theme so that shared messages are looking fine	2012-12-17 03:01:40 +01:00
Michael Vogel	d253d59668	vier: Added Delegations and optical changes.	2012-12-15 14:39:37 +01:00
Michael Vogel	a61ac769a0	vier: Expanding and collapsing now works	2012-12-15 11:25:52 +01:00
Michael Vogel	5635fe250c	Merge remote-tracking branch 'upstream/master'	2012-12-03 08:30:49 +01:00
Michael Vogel	d548d1943f	vier: maximum width of comments defined	2012-12-03 08:29:41 +01:00
Thomas Willingham	785fa1e070	Remove unsupported tag from Darkzero-NS since I have been supporting it.	2012-11-29 02:33:11 +00:00
Thomas Willingham	512729073b	Unmark Diabook experimental	2012-11-27 17:14:13 +00:00
Thomas Willingham	7de455602c	Revert Diabook.	2012-11-27 16:28:12 +00:00
Thomas Willingham	95322ff5f4	Diabook - of all the things to miss...wall-item-content.	2012-11-26 05:49:13 +00:00
Thomas Willingham	fa5d25ec7a	Diabook - better 1024 resolution support.	2012-11-26 04:38:19 +00:00
Thomas Willingham	b0b4baa331	Diabook - kill wall_thread, remove need for wide variants, fix live updates, add todo list.	2012-11-26 02:11:19 +00:00
Michael Vogel	88f5865738	Vier: Maximum with for content area	2012-11-23 12:15:03 +01:00
friendica	226d1ba7c1	Merge pull request #537 from fermionic/20121121-features ... Port Features from Red	2012-11-22 20:54:16 -08:00
Zach Prezkuta	94204d9160	implement features	2012-11-22 09:14:22 -07:00
Michael Vogel	e36c30d285	Vier: Margin problems with code fixed.	2012-11-22 15:06:15 +01:00
Thomas Willingham	7139e60b94	Diabook - fix wall-to-wall posts	2012-11-19 15:58:50 +00:00
Thomas Willingham	1a5d4f91cd	Diabook red. All that's left to do now is...all sorts of other things.	2012-11-18 23:30:48 +00:00
Thomas Willingham	f644cbb30b	Diabook pink	2012-11-18 22:52:44 +00:00
Thomas Willingham	a7982caf71	Diabook - should probably add *all* the files...	2012-11-18 22:06:53 +00:00
Thomas Willingham	96633cb0e5	Diabook - kill thousands more lines. Two more to go then we can start on the bugs...	2012-11-18 22:06:02 +00:00
Thomas Willingham	589f3603ae	Diabook - grep replace missed this	2012-11-18 21:27:02 +00:00
Michael Vogel	c0376339e0	Merge remote-tracking branch 'upstream/master'	2012-11-17 14:29:09 +01:00
Michael Vogel	f17377e6de	New cache system with subdirectories	2012-11-17 00:50:39 +01:00
Thomas Willingham	3f9eef1ef6	Diabook - some more heavy lifting.	2012-11-16 22:29:39 +00:00
Thomas Willingham	c12a27c73c	More diabook...	2012-11-16 02:49:05 +00:00
Thomas Willingham	da2aabd61d	Diabook - couple of fixes.	2012-11-16 01:58:28 +00:00
Thomas Willingham	bb86214698	Add the event/birthday thing from Andreas.	2012-11-16 01:44:09 +00:00
Thomas Willingham	da1b4939f0	Merge branch 'master' of https://github.com/friendica/friendica	2012-11-16 00:37:53 +00:00
Thomas Willingham	b19c832381	Diabook. Get the paths right. There seems to be something in the PHP putting us in unexpected directories...but it works now.	2012-11-16 00:36:52 +00:00
Thomas Willingham	09150cb5dc	Diabook - some heavy lifting. Lots more still to do.	2012-11-15 23:54:13 +00:00
Michael Vogel	e67062d9cf	Merge remote-tracking branch 'upstream/master'	2012-11-15 21:52:35 +01:00
Michael Vogel	fce18fd223	Vier: New Icon set	2012-11-15 21:47:36 +01:00
Michael Vogel	ff5ab7e9c6	Vier: Further improvements.	2012-11-15 08:18:25 +01:00
pixelroot	a00723fb9c	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php modified: view/theme/smoothly/wall_thread.tpl	2012-11-14 20:10:08 +01:00
pixelroot	7c4e3984be	new file: view/theme/smoothly/search_item.tpl ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php modified: view/theme/smoothly/wall_thread.tpl	2012-11-14 11:43:26 +01:00
Thomas Willingham	6fd47ba78e	Even shinier Dispy.	2012-11-14 03:01:15 +00:00
Thomas Willingham	79f35d01a7	"Everything" now includes Vier	2012-11-13 16:21:03 +00:00
Thomas Willingham	13ffe6274c	Everything is shiny (except frost and smoothly).	2012-11-13 15:50:48 +00:00
pixelroot	7e16909d0e	deleted: view/theme/smoothly/events_reminder.tpl	2012-11-13 16:37:53 +01:00
pixelroot	0e2fdee20e	modified: view/theme/smoothly/jot-header.tpl ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2012-11-13 16:36:36 +01:00
fabrixxm	5a2c01d572	Merge pull request #532 from fabrixxm/quattrofixs ... template: new $item.shiny; some fix to quattro	2012-11-13 03:08:26 -08:00
Fabrixxm	f3716d51ef	quattro: fix tag item template ... add correct initial and final divs	2012-11-12 12:45:49 -05:00
pixelroot	9f09955925	modified: view/theme/smoothly/css/typography.css ... modified: view/theme/smoothly/style.css	2012-11-12 15:35:16 +01:00
pixelroot	8395966cf2	modified: view/theme/smoothly/css/typography.css ... new file: view/theme/smoothly/screenshot.png modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2012-11-12 15:01:19 +01:00
Michael Vogel	30e429e6ce	Vier: Changed the color of links and notification counter.	2012-11-12 08:22:49 +01:00
Michael Vogel	b6b85b9773	Vier: Colors of links changed	2012-11-12 00:38:45 +01:00
Thomas Willingham	4c3e9fde28	Diabook - move pause icon.	2012-11-11 18:44:13 +00:00
Thomas Willingham	fccc76371f	Move the language selector.	2012-11-11 18:42:35 +00:00
Thomas Willingham	1a884e4065	Diabook - an out of date buglink probably shouldn't be in the navigation.	2012-11-11 18:39:16 +00:00
Thomas Willingham	9ea96c74a2	Diabook - remove jquery that seems to do nothing except break ACL in 90% of all browsers.	2012-11-11 18:31:11 +00:00
Thomas Willingham	8b961b0a39	Diabook - yeah, we're supposed to *stop* duplicating code...	2012-11-11 17:49:41 +00:00
Thomas Willingham	4bd70c15db	Merge branch 'master' of https://github.com/friendica/friendica	2012-11-11 15:46:04 +00:00
Thomas Willingham	10e84c548c	Diabook threaded comments.	2012-11-11 15:44:36 +00:00
Michael Vogel	197a12adb5	Vier: Further design improvements	2012-11-11 00:39:08 +01:00
Michael Vogel	b875191237	Diaspora: Avatars of repeated items weren't found ... Vier: Complete redesign of the navigation header	2012-11-10 23:19:32 +01:00
Michael Vogel	71e43e68d4	Merge remote-tracking branch 'upstream/master'	2012-11-09 23:40:17 +01:00
Fabrixxm	b15352f650	quattro: collapse threaded comment box	2012-11-09 11:58:35 -05:00
Fabrixxm	c8b4ce9cca	quattro: fix shiny items with threads. fix 'tagged' template	2012-11-09 11:24:49 -05:00
Michael Vogel	fb02d72a35	vier: toggle comments only with threaded comments	2012-11-09 08:01:16 +01:00
friendica	f71db67a36	Merge https://github.com/friendica/friendica into pull	2012-11-08 20:47:04 -08:00
friendica	4199f49b54	remember me to base theme	2012-11-08 20:46:44 -08:00
fermionic	a6c05b5186	Merge pull request #530 from fermionic/20121108-dispy-menu-fix ... fix help button position in dispy	2012-11-08 18:16:01 -08:00
Michael Vogel	b41687e209	"vier": Button for show/hide of text area for comments	2012-11-09 01:56:51 +01:00
Zach Prezkuta	36a9b2ed9a	fix help button position	2012-11-08 17:50:37 -07:00
friendica	824dcb8e76	Merge pull request #529 from fermionic/20121107-remember-me ... add ability to remember logged in user after browser closes	2012-11-08 16:29:02 -08:00
Michael Vogel	b14e557575	Vier: Fixing "vier" so that it looks again like it was intended.	2012-11-09 01:19:24 +01:00
Michael Vogel	4196b6a96c	Merge remote-tracking branch 'upstream/master'	2012-11-08 21:44:17 +01:00
Tobias Diekershoff	815d48e5e4	frost-mobile: on subdirectory installs the login screen image was not found	2012-11-08 06:48:49 +01:00
Zach Prezkuta	e116712bf5	add ability to remember logged in user after browser closes	2012-11-07 18:59:30 -07:00
Zach Prezkuta	bff31a49eb	leaked local change	2012-11-06 08:49:03 -07:00
Zach Prezkuta	999c3439e6	fix mobile photo uploads; better theme control; frost improvements	2012-11-06 08:43:19 -07:00
Michael	ff40442768	Restoring the community pages in diabook	2012-11-05 00:20:32 +01:00
Zach Prezkuta	c9248b66db	display live update; don't collapse comments on live update	2012-11-01 18:31:50 -06:00
Zach Prezkuta	6effdd570c	add a confirm dialog and a busy rotator for delete selected	2012-11-01 17:42:40 -06:00
Zach Prezkuta	e9b26ffbb3	prevent double posting of status updates and comments	2012-11-01 17:14:42 -06:00
Tobias Diekershoff	c177a5e5b2	vier: threads	2012-11-01 15:05:31 +01:00
Zach Prezkuta	2bfacda2df	missed quattro threaded_conversation live update field	2012-10-29 13:04:59 -06:00
Zach Prezkuta	4fa5b76167	delete template files that are identical to the defaults	2012-10-29 12:56:17 -06:00
pixelroot	c1299bc689	view/theme/smoothly/screenshot.png	2012-10-25 13:50:26 +02:00
pixelroot	8e9c9992b0	new file: view/theme/smoothly/images/arrow.png ... new file: view/theme/smoothly/images/calendar.png new file: view/theme/smoothly/images/connect.png new file: view/theme/smoothly/images/dot.png new file: view/theme/smoothly/images/down.png new file: view/theme/smoothly/images/file.gif new file: view/theme/smoothly/images/groups.png new file: view/theme/smoothly/images/icons.png new file: view/theme/smoothly/images/icons.svg new file: view/theme/smoothly/images/login-bg.gif new file: view/theme/smoothly/images/lrarrow.gif new file: view/theme/smoothly/images/menu-user-pin.jpg new file: view/theme/smoothly/images/menu-user-pin.png new file: view/theme/smoothly/images/nav-bg.png new file: view/theme/smoothly/images/next.png new file: view/theme/smoothly/images/notifications.png new file: view/theme/smoothly/images/photo-menu.jpg new file: view/theme/smoothly/images/photography.png new file: view/theme/smoothly/images/premium.png new file: view/theme/smoothly/images/prev.png new file: view/theme/smoothly/images/search.png new file: view/theme/smoothly/images/shiny.png new file: view/theme/smoothly/images/star.png new file: view/theme/smoothly/images/tobottom.png new file: view/theme/smoothly/images/totop.png new file: view/theme/smoothly/images/user.png	2012-10-25 12:27:05 +02:00
pixelroot	272cccb47f	deleted: view/theme/smoothly/arrow.png ... deleted: view/theme/smoothly/calendar.png deleted: view/theme/smoothly/connect.png modified: view/theme/smoothly/css/typography.css deleted: view/theme/smoothly/dot.png deleted: view/theme/smoothly/down.png deleted: view/theme/smoothly/file.gif deleted: view/theme/smoothly/groups.png deleted: view/theme/smoothly/icons.png deleted: view/theme/smoothly/icons.svg deleted: view/theme/smoothly/login-bg.gif deleted: view/theme/smoothly/lrarrow.gif deleted: view/theme/smoothly/menu-user-pin.jpg deleted: view/theme/smoothly/menu-user-pin.png deleted: view/theme/smoothly/nav-bg.png modified: view/theme/smoothly/nav.tpl deleted: view/theme/smoothly/nets.tpl deleted: view/theme/smoothly/next.png deleted: view/theme/smoothly/notifications.png deleted: view/theme/smoothly/photo-menu.jpg deleted: view/theme/smoothly/photo_album.tpl deleted: view/theme/smoothly/photo_top.tpl deleted: view/theme/smoothly/photo_view.tpl deleted: view/theme/smoothly/photography.png deleted: view/theme/smoothly/premium.png deleted: view/theme/smoothly/prev.png deleted: view/theme/smoothly/profile_entry.tpl deleted: view/theme/smoothly/profile_vcard.tpl deleted: view/theme/smoothly/saved_searches_aside.tpl deleted: view/theme/smoothly/screenshot.png deleted: view/theme/smoothly/search.png deleted: view/theme/smoothly/search_item.tpl deleted: view/theme/smoothly/shiny.png deleted: view/theme/smoothly/star.png	2012-10-25 12:26:09 +02:00
Simon L'nu	00ee068b65	fix for preview post thingy blocking the posting buttons ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-10-25 02:59:49 -04:00
Simon L'nu	1d9633b0cc	Merge remote-tracking branch 'remotes/upstream/master' ... * remotes/upstream/master: Friendicaland - remove states no longer flying the Friendica banner. deleted: view/theme/smoothly/categories_widget.tpl deleted: view/theme/smoothly/contact_template.tpl deleted: view/theme/smoothly/footer.tpl deleted: view/theme/smoothly/generic_links_widget.tpl deleted: view/theme/smoothly/group_drop.tpl deleted: view/theme/smoothly/group_side.tpl deleted: view/theme/smoothly/header.tpl deleted: view/theme/smoothly/mail_head.tpl deleted: view/theme/smoothly/message_side.tpl deleted: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/login.tpl modified: view/theme/smoothly/style.css	2012-10-25 02:11:38 -04:00
pixelroot	fa7157492a	deleted: view/theme/smoothly/categories_widget.tpl ... deleted: view/theme/smoothly/contact_template.tpl deleted: view/theme/smoothly/footer.tpl deleted: view/theme/smoothly/generic_links_widget.tpl deleted: view/theme/smoothly/group_drop.tpl deleted: view/theme/smoothly/group_side.tpl deleted: view/theme/smoothly/header.tpl deleted: view/theme/smoothly/mail_head.tpl deleted: view/theme/smoothly/message_side.tpl deleted: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css	2012-10-24 16:41:56 +02:00
pixelroot	c92e7a3521	modified: view/theme/smoothly/style.css	2012-10-24 14:04:57 +02:00
pixelroot	6d1614e8fa	modified: view/theme/smoothly/login.tpl ... modified: view/theme/smoothly/style.css	2012-10-24 12:24:12 +02:00
Simon L'nu	cf42b6f78d	Merge remote-tracking branch 'remotes/upstream/master' ... * remotes/upstream/master: (23 commits) modified: view/theme/smoothly/style.css modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break). Diabook - first part of clean-up to make the theme maintainable. modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/profile_vcard.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php new file: view/theme/smoothly/vcard-widget.tpl rev update modified: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/default.php modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css new file: view/theme/smoothly/tobottom.png modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php IT: update to the strings DE: update to the strings new file: view/theme/smoothly/css/typography.css modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me. Friendicaland undefined fn: init_groups_visitor in mod_profile, rev update Diabook - remove redundant TPL to bring back all admin settings CS: update to the strings ES: update to the strings FR: update to the strings ...	2012-10-24 05:41:11 -04:00
pixelroot	cc59cb2755	modified: view/theme/smoothly/style.css	2012-10-24 11:13:12 +02:00
pixelroot	fe4e6f05d7	modified: view/theme/smoothly/css/typography.css ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2012-10-24 10:33:39 +02:00
Thomas Willingham	a8084fa540	Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break).	2012-10-23 20:05:55 +01:00
Thomas Willingham	35a44d8d27	Diabook - first part of clean-up to make the theme maintainable.	2012-10-23 19:20:49 +01:00
pixelroot	e43097dbc1	modified: view/theme/smoothly/css/typography.css ... modified: view/theme/smoothly/style.css	2012-10-23 15:47:48 +02:00
pixelroot	136175047d	modified: view/theme/smoothly/profile_vcard.tpl ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php new file: view/theme/smoothly/vcard-widget.tpl	2012-10-23 14:23:28 +02:00
pixelroot	5f61290811	modified: view/theme/smoothly/css/typography.css ... modified: view/theme/smoothly/style.css	2012-10-23 10:58:50 +02:00
pixelroot	f8787b6762	modified: view/theme/smoothly/default.php ... modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css new file: view/theme/smoothly/tobottom.png	2012-10-23 10:22:39 +02:00
pixelroot	215f084a2e	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2012-10-23 09:24:19 +02:00
pixelroot	e4ab5dd32f	new file: view/theme/smoothly/css/typography.css ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2012-10-22 16:53:56 +02:00
Thomas Willingham	05bfd3bbf7	DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me.	2012-10-22 01:49:35 +01:00
Thomas Willingham	1b9438120c	Diabook - remove redundant TPL to bring back all admin settings	2012-10-21 18:44:23 +01:00
pixelroot	5016a589fb	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2012-10-19 11:53:22 +02:00
friendica	2347a4326c	get rid of 'Friendika'	2012-10-18 21:51:45 -07:00
Simon L'nu	6ee4e4a93d	Merge remote-tracking branch 'remotes/upstream/master' ... * remotes/upstream/master: imagick exception rev update diabook: use proper defaults in popup sidebar config diabook boxes: use a common hide/show form entry definition remove lots of duplicated code in diabook config handling	2012-10-18 11:30:58 -04:00
Thomas Willingham	2940f25df9	Merge pull request #514 from hmeine/master ... Cleanups in diabook theme code	2012-10-16 09:05:50 -07:00
Hans Meine	ba503b9927	diabook: use proper defaults in popup sidebar config	2012-10-16 13:44:27 +02:00
Hans Meine	d0775be2e2	diabook boxes: use a common hide/show form entry definition	2012-10-16 13:42:18 +02:00
Hans Meine	2d614b6700	remove lots of duplicated code in diabook config handling	2012-10-16 13:33:53 +02:00
Simon L'nu	2c15bdd99e	merge HEAD ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-10-15 22:48:25 -04:00
fermionic	2f3d118e77	Merge pull request #508 from fermionic/no-theme-control-of-live-update-location ... allow themes to decide where live updates appear	2012-10-10 17:34:28 -07:00
Zach Prezkuta	0d56f82efa	frost style improvements; various tweaks	2012-10-09 09:44:56 -06:00
Zach Prezkuta	0ea89852d2	allow themes to decide where live updates appear	2012-10-09 09:41:33 -06:00
Thomas Willingham	ffe7209114	Darkzero - make "visible to" legible.	2012-10-06 01:18:03 +01:00
Zach Prezkuta	5f2826f84e	update themes for new All Networks option	2012-10-04 19:59:30 -06:00
Thomas Willingham	d33abe2de9	Dispy - selecting any network and then switching back to "all networks" ... didn't work. Remove nets.tpl to make it use the default one.	2012-10-04 23:19:50 +01:00
pixelroot	ceb8b8b77f	new file: view/theme/smoothly/file.gif ... modified: view/theme/smoothly/search_item.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2012-10-04 16:37:02 +02:00
Christian Vogeley	44acbb25e4	Bring back BB-Code in comments	2012-10-02 21:29:00 +02:00
Zach Prezkuta	e850e0c6d5	frost suport for categories and folder updates	2012-10-01 14:22:32 -06:00
fabrixxm	9d4fdee65d	Merge pull request #500 from fabrixxm/quattro-fontsoptions ... Quattro fixes	2012-10-01 07:05:58 -07:00
Fabrixxm	c7a4c08081	quattro: fix jot "video link" tooltip	2012-10-01 09:59:55 -04:00
Fabrixxm	871f182414	quattro: add quattro-lilac to theme Makefile	2012-10-01 09:53:02 -04:00
Fabrixxm	ca34d89482	quattro: fix post tags style, add icons for mentions, folders and categories	2012-10-01 09:38:25 -04:00
Fabrixxm	9d738570ee	quattro: options for posts and textareas font size	2012-10-01 08:58:05 -04:00
Zach Prezkuta	cee50502d3	toggle mobile on all themes; Frost updates	2012-09-29 17:47:47 -06:00
Fabrixxm	de076afd6b	quattro: update wall_thread.tpl to separate tags/mentions/folder/category display	2012-09-28 10:17:26 -04:00
Fabrixxm	574631c17a	Merge remote branch 'friendica/master' into quattro-fontsoptions	2012-09-28 10:06:00 -04:00
friendica	9337441491	class not id	2012-09-27 02:54:14 -07:00
friendica	d615f0b563	forumlist changes	2012-09-27 02:47:50 -07:00
friendica	4a8100a409	frost-mobile - everything is walltowall	2012-09-25 21:55:53 -07:00
friendica	2cacbdb9e7	Merge https://github.com/friendica/friendica into pull	2012-09-25 19:11:58 -07:00
friendica	e433f20cd8	sort out the 'delete selected' mess	2012-09-25 19:10:46 -07:00
pixelroot	75d65db785	Merge remote branch 'upstream/master'	2012-09-25 12:00:29 +02:00
pixelroot	0bf9ff5821	modified: view/theme/smoothly/events_reminder.tpl ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2012-09-25 11:59:58 +02:00
friendica	245d9f0aca	one template to rule them all	2012-09-25 01:31:48 -07:00
pixelroot	0592a9e3ca	modified: view/theme/smoothly/login.tpl ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2012-09-24 16:07:41 +02:00
friendica	8df6f249fd	Merge https://github.com/friendica/friendica into pull	2012-09-24 01:31:23 -07:00
pixelroot	0834779405	Merge remote branch 'upstream/master'	2012-09-24 10:16:05 +02:00
pixelroot	05223cc325	modified: view/theme/smoothly/search_item.tpl ... modified: view/theme/smoothly/theme.php modified: view/theme/smoothly/wall_item.tpl modified: view/theme/smoothly/wall_thread.tpl modified: view/theme/smoothly/wallwall_item.tpl modified: view/theme/smoothly/wallwall_thread.tpl	2012-09-24 10:15:31 +02:00
friendica	94f3aef1ea	allow a bit more height	2012-09-24 00:46:00 -07:00
friendica	316014e4ea	restore category/file display on dispy/diabook	2012-09-24 00:35:19 -07:00
pixelroot	57849ff959	modified: view/theme/smoothly/style.css	2012-09-21 08:57:22 +02:00
pixelroot	fa2156a9c1	modified: view/theme/smoothly/style.css	2012-09-20 13:26:53 +02:00
pixelroot	8a8fe725af	modified: view/theme/smoothly/style.css	2012-09-20 13:25:12 +02:00
pixelroot	85c0260f33	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2012-09-20 13:15:01 +02:00
pixelroot	12f7c32f9b	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2012-09-20 11:32:55 +02:00
pixelroot	49098ed11d	deleted: view/theme/smoothly/match.tpl ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2012-09-20 09:25:53 +02:00
Zach Prezkuta	1aa111387a	-- Fix Diaspora profile update avatar bugs ... -- Protect BBCode tags inside of [pre] from space re-formatting -- More information in email poll logging -- Frost/Frost Mobile bug fixes	2012-09-19 20:35:39 -06:00
friendica	c11aa30ef4	this is not the best solution, but don't close the comment-bb buttons when you click outside the comment, because the comment-bb buttons are outside the comment and if you click one on an empty comment box the comment goes away completely and the bbcode doesn't get inserted.	2012-09-19 18:24:20 -07:00
friendica	51bee79b21	Merge https://github.com/friendica/friendica into pull ... Conflicts: view/theme/smoothly/follow.tpl	2012-09-19 15:39:19 -07:00
friendica	09a00a9a07	html tag completed early	2012-09-19 15:34:21 -07:00
pixelroot	31064a15ec	modified: view/theme/smoothly/theme.php	2012-09-19 16:16:58 +02:00
pixelroot	a4f25f6eaa	modified: view/theme/smoothly/style.css	2012-09-19 16:14:45 +02:00
pixelroot	05a61b80e2	modified: view/theme/smoothly/follow.tpl ... modified: view/theme/smoothly/jot.tpl modified: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php modified: view/theme/smoothly/wall_item.tpl modified: view/theme/smoothly/wall_thread.tpl modified: view/theme/smoothly/wallwall_item.tpl modified: view/theme/smoothly/wallwall_thread.tpl	2012-09-19 15:53:37 +02:00
Thomas Willingham	96d6d6b988	Pull request #487	2012-09-18 16:15:36 +01:00
Alex	61eb884a20	Update view/theme/smoothly/bottom.tpl	2012-09-18 13:13:05 +03:00
Christian Vogeley	c024ed601e	Remove and ignore .DS_Store	2012-09-17 23:03:34 +02:00
Christian Vogeley	318bc23e8a	Add notifications in title	2012-09-17 20:39:34 +02:00
Thomas Willingham	e34b8e6d46	Pull request #484 (Smoothly)	2012-09-17 18:37:44 +01:00
tomtom84	68c2316ce3	Corrected titlebar notifications in Diabook	2012-09-17 17:54:07 +02:00
Thomas Willingham	11eebf7091	Add titlebar notifications to Dispy.	2012-09-17 14:54:40 +01:00
Thomas Willingham	9cabcad36c	Add title bar notifications to Smoothly	2012-09-17 14:53:17 +01:00
Alex	f558a1fe8d	Merge pull request #482 from pixelroot/master ... bug fix	2012-09-17 05:12:53 -07:00
pixelroot	ede6b4ad12	modified: view/theme/smoothly/style.css	2012-09-17 14:16:13 +02:00
pixelroot	176fe0351a	new file: view/theme/smoothly/shiny.png ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2012-09-17 13:49:09 +02:00
Alex	01daaafc92	Merge pull request #481 from pixelroot/master ... Better mark new posts	2012-09-17 04:46:00 -07:00
pixelroot	cd3938dfda	new file: view/theme/smoothly/default.php ... new file: view/theme/smoothly/footer.tpl new file: view/theme/smoothly/header.tpl modified: view/theme/smoothly/nav.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php	2012-09-17 11:22:12 +02:00
Alex	06c9330c5e	Merge pull request #480 from pixelroot/master ... Bug fixes	2012-09-17 02:20:07 -07:00
Fabrixxm	6deb070890	quattro: first work on font size options	2012-09-17 03:29:58 -04:00
Zach Prezkuta	ab10a7b56b	missed one	2012-09-16 18:57:04 -06:00
Zach Prezkuta	3c7419ec57	various bug fixes	2012-09-16 18:56:31 -06:00
Tobias Diekershoff	d29da99dbd	frost: added some missing baseurls to nav.tpl	2012-09-16 18:33:55 +02:00
friendica	2abbd1dc19	permissions selector showing up for guests, testbubble and smoothly	2012-09-15 20:21:17 -07:00
pixelroot	816680ca85	new file: view/theme/smoothly/bottom.tpl ... new file: view/theme/smoothly/js/jquery.autogrow.textarea.js new file: view/theme/smoothly/js/modernizr.custom.2.5.3.js new file: view/theme/smoothly/js/modernizr.custom.2.5.3.min.js	2012-09-14 19:08:39 +02:00
pixelroot	3c846547f7	modified: view/theme/smoothly/style.css	2012-09-14 19:08:21 +02:00
Alex	7ae1e4620d	Merge pull request #476 from pixelroot/master ... new funktion	2012-09-14 10:07:17 -07:00
pixelroot	6537a94b1a	new file: view/theme/smoothly/down.png	2012-09-14 17:55:27 +02:00
pixelroot	a300973084	modified: view/theme/smoothly/style.css	2012-09-14 17:55:17 +02:00
Alex	5d22b13242	Merge pull request #475 from pixelroot/master ... Bugs	2012-09-14 08:53:27 -07:00
Tobias Diekershoff	cb1c9de069	quattro: lilac color schema	2012-09-14 17:01:26 +02:00
Tobias Diekershoff	882f437149	quattro: mail link to profile page	2012-09-14 15:35:40 +02:00
pixelroot	252e112ad5	modified: view/theme/smoothly/style.css	2012-09-14 12:46:32 +02:00
Alex	98540b630e	Merge pull request #474 from pixelroot/master ... Bug fix	2012-09-14 03:43:48 -07:00
pixelroot	e78b86f534	modified: view/theme/smoothly/style.css	2012-09-14 11:57:13 +02:00
Alex	9c7d5d42e1	Merge pull request #473 from pixelroot/master ... Editor redesign	2012-09-14 02:54:30 -07:00
pixelroot	bdc5a3ab29	deleted: view/theme/smoothly/group_edit.tpl	2012-09-14 10:16:35 +02:00
Alex	ac0ad8fecf	Merge pull request #472 from pixelroot/master ... Group-Edit bug	2012-09-14 01:14:48 -07:00
pixelroot	d002573543	deleted: view/theme/smoothly/default.php ... modified: view/theme/smoothly/nav.tpl	2012-09-14 09:55:54 +02:00
Alex	2a404ae6dd	Merge pull request #471 from pixelroot/master ... Theme Smoothly	2012-09-14 00:54:54 -07:00
pixelroot	1c4bea295f	new file: view/theme/smoothly/default.php	2012-09-14 09:33:47 +02:00
pixelroot	d1984c4c64	modified: view/theme/smoothly/nav.tpl ... modified: view/theme/smoothly/style.css	2012-09-14 09:33:21 +02:00
pixelroot	bff9c3d460	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php	2012-09-14 08:50:10 +02:00
friendica	32d4a359f1	reverse the default newuser privacy setting to public. Sites can over-ride.	2012-09-13 19:11:07 -07:00
Thomas Willingham	290da6c845	Merge pull request #469 from pixelroot/master ... Theme Smoothly	2012-09-13 07:59:16 -07:00
pixelroot	0cc661dd9c	modified: view/theme/smoothly/style.css	2012-09-13 16:50:55 +02:00
pixelroot	664680cdd8	modified: view/theme/smoothly/style.css	2012-09-13 16:30:12 +02:00
friendica	d3699498ac	Merge pull request #468 from pixelroot/master ... Theme Smoothly	2012-09-13 03:50:55 -07:00
pixelroot	a1ed9c72c2	modified: view/theme/smoothly/star.png ... modified: view/theme/smoothly/theme.php	2012-09-13 11:41:14 +02:00
pixelroot	2b9c2b2d1d	modified: view/theme/smoothly/style.css	2012-09-13 09:54:27 +02:00
pixelroot	931e1c6c66	modified: view/theme/smoothly/style.css	2012-09-13 09:48:02 +02:00
pixelroot	16e35d1787	new file: view/theme/smoothly/message_side.tpl	2012-09-13 09:35:12 +02:00
pixelroot	4ba7ce0308	modified: view/theme/smoothly/peoplefind.tpl ... modified: view/theme/smoothly/style.css	2012-09-13 09:34:50 +02:00
Zach Prezkuta	e8acdb31bc	add mobile toggle to frost mobile	2012-09-12 21:35:51 -06:00
pixelroot	864e2c03d9	modified: view/theme/smoothly/style.css	2012-09-12 17:25:44 +02:00
pixelroot	e3d20b51c8	modified: view/theme/smoothly/style.css	2012-09-12 16:27:31 +02:00
pixelroot	a3add1d851	modified: view/theme/smoothly/profile_vcard.tpl ... modified: view/theme/smoothly/style.css	2012-09-12 16:20:44 +02:00
tobiasd	250c615058	Merge pull request #466 from pixelroot/master ... Theme Smoothly	2012-09-12 07:02:40 -07:00
pixelroot	77aee41280	modified: view/theme/smoothly/style.css	2012-09-12 15:49:18 +02:00
pixelroot	a283d6844c	modified: view/theme/smoothly/theme.php	2012-09-12 14:44:42 +02:00
pixelroot	207451d82d	modified: view/theme/smoothly/style.css	2012-09-12 14:42:10 +02:00
fermionic	984274659d	Merge pull request #464 from pixelroot/master ... theme smoothly	2012-09-11 07:27:19 -07:00
pixelroot	5ae445b1ff	new file: view/theme/smoothly/generic_links_widget.tpl ... modified: view/theme/smoothly/style.css	2012-09-11 15:23:49 +02:00
pixelroot	4cc4404752	new file: view/theme/smoothly/arrow.png ... new file: view/theme/smoothly/categories_widget.tpl modified: view/theme/smoothly/style.css	2012-09-11 14:02:36 +02:00
pixelroot	30a9db78f5	modified: view/theme/smoothly/style.css	2012-09-11 11:25:01 +02:00
pixelroot	5f7f1fb7b1	modified: view/theme/smoothly/nav.tpl ... modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php new file: view/theme/smoothly/totop.png	2012-09-11 11:06:55 +02:00
friendica	fa65db9aa1	bring back comment edit buttons	2012-09-10 18:06:18 -07:00
friendica	4b7c6329e9	Merge pull request #462 from CyberDomovoy/threaded_items ... Threaded items, objects	2012-09-10 16:19:13 -07:00
fermionic	9e9765a89f	Merge pull request #463 from pixelroot/master ... Version 0.5	2012-09-10 08:08:24 -07:00
pixelroot	9685ba3fbc	modified: view/theme/smoothly/style.css	2012-09-10 16:31:36 +02:00
pixelroot	ee20708f75	modified: view/theme/smoothly/style.css	2012-09-10 16:21:54 +02:00
pixelroot	b5dee575a8	modified: style.css	2012-09-10 15:38:44 +02:00
pixelroot	e51440ec98	modified: view/theme/smoothly/style.css	2012-09-10 15:19:43 +02:00
pixelroot	264f32db80	modified: view/theme/smoothly/style.css	2012-09-10 14:58:57 +02:00
pixelroot	aef0824cc8	modified: view/theme/smoothly/style.css	2012-09-10 14:52:47 +02:00
pixelroot	c059f92b5a	modified: view/theme/smoothly/style.css	2012-09-10 14:36:51 +02:00
pixelroot	7603e2de75	deleted: view/theme/smoothly/comment_item.tpl ... deleted: view/theme/smoothly/moderated_comment.tpl modified: view/theme/smoothly/style.css	2012-09-10 14:18:24 +02:00
pixelroot	e492664325	new file: view/theme/smoothly/follow.tpl ... new file: view/theme/smoothly/peoplefind.tpl modified: view/theme/smoothly/style.css	2012-09-10 12:30:34 +02:00
pixelroot	f96b91c254	modified: view/theme/smoothly/style.css	2012-09-10 11:01:43 +02:00
Domovoy	bb68461c6d	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items ... Conflicts: include/conversation.php	2012-09-10 09:19:08 +02:00
friendica	0d9ffd07c2	remove mobile file	2012-09-10 00:15:01 -07:00
Tobias Diekershoff	63ab82d3dd	frost-mobile: was missing infront of the nav-images	2012-09-09 13:26:15 +02:00
fermionic	1088257aad	Merge pull request #461 from pixelroot/master ... Version 0.4	2012-09-08 07:33:26 -07:00
pixelroot	a04d0e6832	deleted: view/theme/smoothly/mobile	2012-09-08 09:26:13 +02:00
pixelroot	b6d310675b	deleted: view/theme/smoothly/icons/dot.png ... deleted: view/theme/smoothly/js/jquery.ae.image.resize.js deleted: view/theme/smoothly/js/jquery.ae.image.resize.min.js	2012-09-08 09:25:06 +02:00
pixelroot	393a91ea78	modified: view/theme/smoothly/comment_item.tpl ... new file: view/theme/smoothly/dot.png new file: view/theme/smoothly/moderated_comment.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php deleted: view/theme/smoothly/icons/dot.png deleted: view/theme/smoothly/js/jquery.ae.image.resize.js deleted: view/theme/smoothly/js/jquery.ae.image.resize.min.js	2012-09-08 09:24:37 +02:00
pixelroot	002168ebd9	new file: view/theme/smoothly/js/jquery.ae.image.resize.js ... new file: view/theme/smoothly/js/jquery.ae.image.resize.min.js modified: view/theme/smoothly/theme.php	2012-09-08 08:54:18 +02:00
Zach Prezkuta	63d02d98c5	add settings sections and add contacts; other tweaks and fixes	2012-09-07 12:17:03 -06:00
pixelroot	c616b05a33	modified: view/theme/smoothly/jot.tpl ... modified: view/theme/smoothly/style.css	2012-09-07 17:13:51 +02:00
pixelroot	9f7fbbdee3	modified: view/theme/smoothly/style.css	2012-09-07 16:32:20 +02:00
pixelroot	8685ca5a7f	new file: view/theme/smoothly/mobile	2012-09-07 10:10:25 +02:00
pixelroot	1157b627af	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/theme.php view/theme/smoothly/mobile	2012-09-07 10:09:24 +02:00
Zach Prezkuta	af3e36f665	mark all mobile themes	2012-09-06 17:30:24 -06:00
Zach Prezkuta	77529ccdf1	allow individual choice of mobile themes	2012-09-06 17:24:34 -06:00
fermionic	41439804f4	Merge pull request #456 from pixelroot/master ... New Theme "Smoothly"	2012-09-06 11:08:48 -07:00
pixelroot	6a46717e1a	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/wallwall_thread.tpl	2012-09-06 16:25:16 +02:00
pixelroot	6ac28c97f1	modified: view/theme/smoothly/jot.tpl ... modified: view/theme/smoothly/style.css	2012-09-06 15:50:02 +02:00
pixelroot	a6f7ff686c	modified: view/theme/smoothly/style.css ... modified: view/theme/smoothly/wallwall_thread.tpl	2012-09-06 14:15:38 +02:00
pixelroot	a888b59c42	modified: view/theme/smoothly/login.tpl ... modified: view/theme/smoothly/style.css	2012-09-06 13:25:13 +02:00
pixelroot	5c91ca9687	new file: view/theme/smoothly/icons/dot.png ... new file: view/theme/smoothly/lang_selector.tpl modified: view/theme/smoothly/login.tpl modified: view/theme/smoothly/style.css new file: view/theme/smoothly/wall_thread.tpl new file: view/theme/smoothly/wallwall_thread.tpl	2012-09-06 12:04:56 +02:00
pixelroot	0d9f6c89cc	modified: view/theme/smoothly/comment_item.tpl ... modified: view/theme/smoothly/contact_template.tpl modified: view/theme/smoothly/jot-header.tpl modified: view/theme/smoothly/jot.tpl modified: view/theme/smoothly/login.tpl modified: view/theme/smoothly/photo_top.tpl modified: view/theme/smoothly/profile_entry.tpl modified: view/theme/smoothly/profile_vcard.tpl modified: view/theme/smoothly/style.css modified: view/theme/smoothly/theme.php view/theme/smoothly/icons/ view/theme/smoothly/lang_selector.tpl view/theme/smoothly/wall_thread.tpl view/theme/smoothly/wallwall_thread.tpl	2012-09-06 11:17:17 +02:00
pixelroot	5e3076b5d2	view/theme/smoothly/icons/ ... view/theme/smoothly/lang_selector.tpl view/theme/smoothly/wall_thread.tpl view/theme/smoothly/wallwall_thread.tpl	2012-09-06 09:44:15 +02:00
Zach Prezkuta	c6f4404914	conversation.tpl doesnt appear to be necessary	2012-09-05 11:12:08 -06:00
Zach Prezkuta	0d45fec969	add threading files to make testbubble not broken with threading	2012-09-05 11:11:03 -06:00
pixelroot	92a9070e1e	view/theme/smoothly/lang_selector.tpl	2012-09-05 16:04:29 +02:00
pixelroot	e326e3e5d0	modified: view/theme/smoothly/style.css	2012-09-05 13:29:45 +02:00
pixelroot	89adfbeb80	deleted: view/theme/smoothly/back-gradient.jpg ... modified: view/theme/smoothly/style.css	2012-09-05 10:28:15 +02:00
pixelroot	de9bcb5825	new file: view/theme/smoothly/login.tpl	2012-09-05 09:46:26 +02:00
pixelroot	2d37a18513	view/theme/smoothly/login.tpl	2012-09-05 09:42:52 +02:00
Zach Prezkuta	79012bf888	conversation needs preview parameter	2012-09-04 18:47:49 -06:00
pixelroot	05dda2f226	new file: view/theme/smoothly/back-gradient.jpg ... new file: view/theme/smoothly/calendar.png new file: view/theme/smoothly/comment_item.tpl new file: view/theme/smoothly/connect.png new file: view/theme/smoothly/contact_template.tpl new file: view/theme/smoothly/conversation.tpl new file: view/theme/smoothly/group_drop.tpl new file: view/theme/smoothly/group_edit.tpl new file: view/theme/smoothly/group_side.tpl new file: view/theme/smoothly/groups.png new file: view/theme/smoothly/icons.png new file: view/theme/smoothly/icons.svg new file: view/theme/smoothly/jot-header.tpl new file: view/theme/smoothly/jot.tpl new file: view/theme/smoothly/lock.cur new file: view/theme/smoothly/login-bg.gif new file: view/theme/smoothly/lrarrow.gif new file: view/theme/smoothly/mail_head.tpl new file: view/theme/smoothly/match.tpl new file: view/theme/smoothly/menu-user-pin.jpg new file: view/theme/smoothly/menu-user-pin.png new file: view/theme/smoothly/nav-bg.png new file: view/theme/smoothly/nav.tpl new file: view/theme/smoothly/nets.tpl new file: view/theme/smoothly/next.png new file: view/theme/smoothly/notifications.png new file: view/theme/smoothly/photo-menu.jpg new file: view/theme/smoothly/photo_album.tpl new file: view/theme/smoothly/photo_top.tpl new file: view/theme/smoothly/photo_view.tpl new file: view/theme/smoothly/photography.png new file: view/theme/smoothly/premium.png new file: view/theme/smoothly/prev.png new file: view/theme/smoothly/profile_entry.tpl new file: view/theme/smoothly/profile_vcard.tpl new file: view/theme/smoothly/saved_searches_aside.tpl new file: view/theme/smoothly/screenshot.jpg new file: view/theme/smoothly/screenshot.png new file: view/theme/smoothly/search.png new file: view/theme/smoothly/search_item.tpl new file: view/theme/smoothly/star.png new file: view/theme/smoothly/style.css new file: view/theme/smoothly/theme.php new file: view/theme/smoothly/user.png new file: view/theme/smoothly/wall_item.tpl new file: view/theme/smoothly/wallwall_item.tpl	2012-09-02 13:11:17 +02:00
pixelroot	0aebf15f03	deleted: view/theme/softy/back-gradient.jpg ... deleted: view/theme/softy/calendar.png deleted: view/theme/softy/comment_item.tpl deleted: view/theme/softy/connect.png deleted: view/theme/softy/contact_template.tpl deleted: view/theme/softy/conversation.tpl deleted: view/theme/softy/group_drop.tpl deleted: view/theme/softy/group_edit.tpl deleted: view/theme/softy/group_side.tpl deleted: view/theme/softy/groups.png deleted: view/theme/softy/icons.png deleted: view/theme/softy/icons.svg deleted: view/theme/softy/jot-header.tpl deleted: view/theme/softy/jot.tpl deleted: view/theme/softy/lock.cur deleted: view/theme/softy/login-bg.gif deleted: view/theme/softy/lrarrow.gif deleted: view/theme/softy/mail_head.tpl deleted: view/theme/softy/match.tpl deleted: view/theme/softy/menu-user-pin.jpg deleted: view/theme/softy/menu-user-pin.png deleted: view/theme/softy/nav-bg.png deleted: view/theme/softy/nav.tpl deleted: view/theme/softy/nets.tpl deleted: view/theme/softy/next.png deleted: view/theme/softy/notifications.png deleted: view/theme/softy/photo-menu.jpg deleted: view/theme/softy/photo_album.tpl deleted: view/theme/softy/photo_top.tpl deleted: view/theme/softy/photo_view.tpl deleted: view/theme/softy/photography.png deleted: view/theme/softy/premium.png deleted: view/theme/softy/prev.png deleted: view/theme/softy/profile_entry.tpl deleted: view/theme/softy/profile_vcard.tpl deleted: view/theme/softy/saved_searches_aside.tpl deleted: view/theme/softy/screenshot.jpg deleted: view/theme/softy/screenshot.png deleted: view/theme/softy/search.png deleted: view/theme/softy/search_item.tpl deleted: view/theme/softy/star.png deleted: view/theme/softy/style.css deleted: view/theme/softy/theme.php deleted: view/theme/softy/user.png deleted: view/theme/softy/wall_item.tpl deleted: view/theme/softy/wallwall_item.tpl view/theme/smoothly/	2012-09-02 13:09:16 +02:00
Fabrixxm	02037e345d	quattro: fix attachments icons, fix wall-to-wall comments, style blockquote element, bigger text in textareas	2012-09-01 04:52:01 -04:00
friendica	2ace7d6646	Merge pull request #451 from fabrixxm/master ... fixes and tweaks	2012-08-31 01:26:03 -07:00
Fabrixxm	51686cce01	quattro: remove 'experimental'	2012-08-31 03:32:10 -04:00
Fabrixxm	ad45d9a78a	quattro: fix live update	2012-08-31 03:31:33 -04:00
pixelroot	9346de5686	deleted: view/theme/softy/style.alex ... deleted: view/theme/softy/style.alt	2012-08-30 16:50:22 +02:00
pixelroot	d96e3d95c1	new file: view/theme/softy/back-gradient.jpg ... new file: view/theme/softy/calendar.png new file: view/theme/softy/comment_item.tpl new file: view/theme/softy/connect.png new file: view/theme/softy/contact_template.tpl new file: view/theme/softy/conversation.tpl new file: view/theme/softy/group_drop.tpl new file: view/theme/softy/group_edit.tpl new file: view/theme/softy/group_side.tpl new file: view/theme/softy/groups.png new file: view/theme/softy/icons.png new file: view/theme/softy/icons.svg new file: view/theme/softy/jot-header.tpl new file: view/theme/softy/jot.tpl new file: view/theme/softy/lock.cur new file: view/theme/softy/login-bg.gif new file: view/theme/softy/lrarrow.gif new file: view/theme/softy/mail_head.tpl new file: view/theme/softy/match.tpl new file: view/theme/softy/menu-user-pin.jpg new file: view/theme/softy/menu-user-pin.png new file: view/theme/softy/nav-bg.png new file: view/theme/softy/nav.tpl new file: view/theme/softy/nets.tpl new file: view/theme/softy/next.png new file: view/theme/softy/notifications.png new file: view/theme/softy/photo-menu.jpg new file: view/theme/softy/photo_album.tpl new file: view/theme/softy/photo_top.tpl new file: view/theme/softy/photo_view.tpl new file: view/theme/softy/photography.png new file: view/theme/softy/premium.png new file: view/theme/softy/prev.png new file: view/theme/softy/profile_entry.tpl new file: view/theme/softy/profile_vcard.tpl new file: view/theme/softy/saved_searches_aside.tpl new file: view/theme/softy/screenshot.jpg new file: view/theme/softy/screenshot.png new file: view/theme/softy/search.png new file: view/theme/softy/search_item.tpl new file: view/theme/softy/star.png new file: view/theme/softy/style.alex new file: view/theme/softy/style.alt new file: view/theme/softy/style.css new file: view/theme/softy/theme.php new file: view/theme/softy/user.png new file: view/theme/softy/wall_item.tpl new file: view/theme/softy/wallwall_item.tpl	2012-08-30 16:42:50 +02:00
Domovoy	ef52ff6b01	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-08-30 07:47:21 +02:00
Zach Prezkuta	2ef1081c68	make the show more line look nicer	2012-08-28 20:19:47 -06:00
fermionic	9ae5ae6df5	Merge pull request #448 from fermionic/limit-items-on-all-pages ... limit number of items on profile page too	2012-08-28 19:03:15 -07:00
fermionic	8c064069d9	Merge pull request #443 from fermionic/new-users-privacy-settings ... automatically make posts private for new users	2012-08-28 19:02:51 -07:00
Tobias Diekershoff	d9ffb0578c	quattro: display date info as "ago" with mouse over date stamp	2012-08-27 19:47:04 +02:00
Tobias Diekershoff	cf91a7f79a	quattro: mail_display has no ago information so don't display it	2012-08-27 19:39:31 +02:00
Tobias Diekershoff	036d5db0c0	quattro: use "ago" for date information and on mouse the date stamp	2012-08-27 19:32:23 +02:00
Tobias Diekershoff	37a0504f96	quattro: expanded the new prvmessage field a bit	2012-08-27 08:13:07 +02:00
Zach Prezkuta	c681e69794	limit number of items on profile page too; add show more back to Frost mobile; some show more fixes	2012-08-26 15:21:26 -06:00
Zach Prezkuta	a77081f659	remove show more/less from frost mobile--it is too great a load	2012-08-26 09:31:37 -06:00
Zach Prezkuta	0fe1727d74	remove show more/less animation on mobile	2012-08-26 09:22:49 -06:00
Zach Prezkuta	7c9c92e542	update version	2012-08-25 22:43:32 -06:00
Zach Prezkuta	193cc2c537	try to get rid of scrollbars in Frost	2012-08-25 22:42:12 -06:00
Zach Prezkuta	f062ccbb66	add documentation; add to admin panel; some tweaks and interface stuff	2012-08-25 15:03:16 -06:00
fermionic	5cb618bcf1	Merge pull request #444 from fermionic/frost-notifications-sometimes-dont-show ... restore nav element to login pages, since system messages are sent in it	2012-08-25 09:10:01 -07:00
Zach Prezkuta	3413cc1006	restore nav element to login pages, since system messages are sent in it	2012-08-25 10:08:25 -06:00
Zach Prezkuta	54d4fc73c4	fix image and file upload on frost moble; add support to frost for local post time	2012-08-24 21:25:39 -06:00
Domovoy	5dd3e8a990	One click comments on threaded items. ... comment-wwedit-wrapper and wall-item-outside-wrapper get the additional class "threaded" when applicable.	2012-08-23 13:09:35 +02:00
friendica	ff0e0782a5	restore old comment behaviour when threading turned off	2012-08-21 19:41:50 -07:00
Tobias Diekershoff	d470496ead	Quattro: added localtime timestamp title to entries	2012-08-20 11:20:49 +02:00
Zach Prezkuta	b4a4ccfb2b	include login style when necessary	2012-08-18 14:47:59 -06:00
Zach Prezkuta	045f98cddd	another javascript	2012-08-16 21:51:36 -06:00
Thomas Willingham	ee998864e6	Make Vier threaded comments not broken. ... These should be inherited from Quattro really, but aren't.	2012-08-16 18:21:33 +01:00
Zach Prezkuta	3531704d08	admin page selector for mobile theme	2012-08-15 08:54:30 -06:00
Tobias Diekershoff	52908d5e80	lets mark mobile themes similar to experimental ones	2012-08-15 10:15:21 +02:00
Zach Prezkuta	77626cca74	missed something again	2012-08-14 19:54:22 -06:00
Zach Prezkuta	45b21c1d20	basic updates for Dispy and Diabook to try to make them at least not broken with threading updates	2012-08-14 19:42:07 -06:00
fermionic	8d89a915fc	Merge pull request #434 from fermionic/frost-update-for-threaded-comments ... sigh I always miss something when copying over	2012-08-11 19:53:08 -07:00
Zach Prezkuta	91aacdbb3d	sigh I always miss something when copying over	2012-08-11 20:51:51 -06:00
friendica	6348634a1b	Merge https://github.com/friendica/friendica into pull ... Conflicts: view/wall_thread.tpl	2012-08-11 15:42:48 -07:00
friendica	1cd23860cb	rev update	2012-08-11 15:39:45 -07:00
Zach Prezkuta	5890e3fa3a	update frost mobile TODO	2012-08-11 14:43:13 -06:00
Zach Prezkuta	5e09fc31f5	Threading updates ... - Add rudimentary thread handling to Frost - Fix possible CSS bug in several themes from threading update - Add ability for themes to prevent threading	2012-08-11 14:36:58 -06:00
Zach Prezkuta	bcf214debb	readability in TODO	2012-08-10 08:37:31 -06:00
Zach Prezkuta	d9279da369	- Frost Mobile: redo CSS to adjust automatically to the screen width ... - Frost Mobile: various tweaks and fixes - Allow themes to limit number of items on the Network page	2012-08-10 08:34:00 -06:00
Fabrixxm	ec3d8a80cd	quattro: fix collapsed thread, fix comment box, style previev comment, add 'expand / collapse" thread	2012-08-10 06:27:01 -04:00
Fabrixxm	0f15c117ee	quattro: move comment box for top-level item at the end of comments list	2012-08-10 04:53:39 -04:00
Fabrixxm	c4bff3d393	quattro: add comment tools icons, fix hide/show comment tools	2012-08-10 04:29:22 -04:00
Fabrixxm	64a6e8693c	quattro: remove unused parameter 'comment' from function cmtBbClose	2012-08-10 04:27:50 -04:00
Domovoy	9c920fd7b9	Merge pull request #5 from fabrixxm/threaded_items ... Threaded items support for Quattro theme	2012-08-09 02:14:22 -07:00
Domovoy	f3b1391501	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-08-07 09:40:21 +02:00
friendica	3032d663f6	Merge pull request #427 from fermionic/frost-embedded-videos ... allow themes to change the size of embedded videos	2012-08-06 15:58:17 -07:00
Simon L'nu	7ceb213859	add a 'manage' icon to clarify things ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-08-06 17:05:25 -04:00
Simon L'nu	76e1e07571	Merge remote-tracking branch 'remotes/upstream/master' ... * remotes/upstream/master: rev update Frost-mobile: media query in css for tablets expire issue rev update	2012-08-06 13:18:00 -04:00
Zach Prezkuta	d8a13d6e8d	allow themes to change the size of embedded videos	2012-08-06 09:59:57 -06:00
Fabrixxm	4062312e9c	quattro: collaps threaded items	2012-08-06 04:48:24 -04:00
Fabrixxm	fd7ea5cc91	quattro: support threaded comments	2012-08-05 16:55:20 -04:00
Christian Vogeley	e6067e6694	Frost-mobile: media query in css for tablets ... Use space more efficiently on tablets in frost-mobile theme. Tested with iPad 1.	2012-08-05 16:08:07 +02:00
Domovoy	e247915f48	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items ... Conflicts: include/conversation.php	2012-08-05 13:43:53 +02:00
Simon L'nu	3d0fc813dc	Merge remote-tracking branch 'remotes/upstream/master' ... * remotes/upstream/master: missed an instance of $mobileapp in switch to generic app label ImageMagick rotates CW while imagerotate() rotates CCW update main frost version update version and todo -- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) -- More HTML cleanup in TPL files -- Various Frost bug fixes and tweaks put back notags fix angle char storage and transmission, rev update Darkzero/NS .contact-photo-menu rev update	2012-08-04 23:41:51 -04:00
Zach Prezkuta	ed9811762d	missed an instance of $mobileapp in switch to generic app label	2012-08-04 21:05:25 -06:00
Zach Prezkuta	1f8182a453	update main frost version	2012-08-04 14:05:56 -06:00
Zach Prezkuta	849720f160	update version and todo	2012-08-04 14:04:18 -06:00
Zach Prezkuta	63628910b2	-- Allow themes to specify an "app" name for posted status updates and comments (via a generic and translateable $sourceapp parameter) ... -- More HTML cleanup in TPL files -- Various Frost bug fixes and tweaks	2012-08-04 14:02:39 -06:00
Domovoy	8742beb772	Flatten children when threads are disabled	2012-08-03 22:28:21 +02:00
Domovoy	75700a725e	Comment box is inside the item	2012-08-03 19:18:56 +02:00
Domovoy	66848b0471	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items ... Conflicts: update.php	2012-08-03 18:57:37 +02:00
Thomas Willingham	208019ea9c	Darkzero/NS .contact-photo-menu	2012-08-03 03:07:29 +01:00
Simon L'nu	9433d229ed	Merge remote-tracking branch 'remotes/upstream/master' ... * remotes/upstream/master: parse_url: Fixed a problem in the detection if there was an image or not. Additionally removed some test content. rev update Changed markdown to enable diaspora postings with images that contain links bbcode: two new bbcode elements (style, class) for CSS Moving the index creation commands into a readme file due to the fact that creating of these indexes is really slow. network: Caching of images scale_external_images: Fix: Hadn't looked for pictures in the format [img=XxY] Further performance improvements Speed improvements in the database	2012-08-02 12:46:36 -04:00
Michael Vogel	b904a21134	Merge remote branch 'upstream/master'	2012-08-02 10:27:11 +02:00
Simon L'nu	31eff37693	Merge remote-tracking branch 'remotes/upstream/master' ... * remotes/upstream/master: ugly fix to make editplain work quattro: readd sparkle cursor quattro: style for "show more" addon tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat. logic was reversed - should work now fix almost all errant divs in view/ and frost folders Provide backend ability to poke as a comment rather than top-level post rev update	2012-08-01 22:59:54 -04:00
Zach Prezkuta	3e8e1ab830	ugly fix to make editplain work	2012-08-01 19:09:28 -06:00
Michael Vogel	04c31d194f	Merge remote branch 'upstream/master' ... Conflicts: update.php	2012-08-02 00:21:14 +02:00
Michael Vogel	bed99674d2	bbcode: two new bbcode elements (style, class) for CSS	2012-08-02 00:13:37 +02:00
Fabrixxm	fde3edaa21	quattro: readd sparkle cursor	2012-08-01 04:45:27 -04:00
Fabrixxm	bf04fb450a	quattro: style for "show more" addon	2012-08-01 04:41:21 -04:00
Zach Prezkuta	fc22c356ff	fix almost all errant divs in view/ and frost folders	2012-07-31 22:43:18 -06:00
Simon L'nu	0e7f6d1417	Merge remote-tracking branch 'remotes/upstream/master' ... * remotes/upstream/master: fix /display bug; oembed audio bug; other tweaks Frost: reduce DOM elements by about 20%; other tweaks and fixes rev update errant div in events_reminder.tpl pass deleted flag to display rev update fix filer bug; some interface tweaks Update view/theme/frost/nav.tpl Update view/theme/frost-mobile/nav.tpl don't show birthday/event details on mobile devices rev update remove server-specific change update version of frost and frost-mobile Modify Javascript to improve page loading times rev update Friendicaland got bigger.	2012-07-31 23:16:56 -04:00
Zach Prezkuta	885bb50f0d	fix /display bug; oembed audio bug; other tweaks	2012-07-31 18:53:18 -06:00
Zach Prezkuta	b522ffeea5	Frost: reduce DOM elements by about 20%; other tweaks and fixes	2012-07-31 08:00:50 -06:00
Domovoy	07f87848b4	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-07-30 13:36:33 +02:00
Zach Prezkuta	067865db9e	fix filer bug; some interface tweaks	2012-07-29 14:49:12 -06:00
Domovoy	30d7db5e42	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-07-29 22:43:49 +02:00
fermionic	4f13618b18	Merge pull request #414 from 23n/patch-1 ... Update view/theme/frost-mobile/nav.tpl	2012-07-29 12:36:22 -07:00
Domovoy	8ea3087342	Collapsing is back for threaded comments. ... Comment box is displayed at the end of the thread. Comments on comments are all collapsed	2012-07-29 17:13:21 +02:00
23n	5b5e4b6cb7	Update view/theme/frost/nav.tpl ... moved identity/page management-link to system-menu	2012-07-29 15:28:59 +03:00
23n	0f1b33a278	Update view/theme/frost-mobile/nav.tpl ... move identity management link to menu	2012-07-29 15:07:52 +03:00
Domovoy	10eb873f7c	Merge branch 'master' of https://github.com/friendica/friendica into threaded_items	2012-07-29 10:03:17 +02:00
Zach Prezkuta	231b37217b	update version of frost and frost-mobile	2012-07-28 10:03:56 -06:00
Zach Prezkuta	1f09e7ad23	Modify Javascript to improve page loading times ... 1. Add template category 'end' that places content right before final </body> tag 2. Move most Javascript from tpl files into one cacheable file, theme.js 3. Load scripts at end of the HTML document instead of in the header 4. Minify several Javascript files Note that the second and third things were only done for Frost and Frost Mobile. Doing it for every theme means going through every .tpl for every theme and rearranging the Javascript, which is tedious.	2012-07-28 09:57:16 -06:00
Domovoy	eaf0d04bfb	Comment box is now inside the item. Makes it easier to know what we are commenting on.	2012-07-27 22:58:51 +02:00
Domovoy	d558d25540	CommentBox is now hidden by default, this can be toggled with a fake link	2012-07-27 22:47:18 +02:00
Domovoy	8ecf8167db	Threaded comments are starting to work. ... For now, only on normal view, and not during update	2012-07-27 22:08:57 +02:00
Simon L'nu	c5603cf756	fixed head.tpl before the last pull. hadn't pushed and merged with upstream yet. ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-07-25 22:35:50 -04:00
Simon L'nu	794ae669ce	fixes to cursor ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-07-25 22:28:09 -04:00
Fabrixxm	727c93cb8c	quattro: add id to items container div ... needed to make commit 4c6a4321 work	2012-07-25 08:12:21 -04:00
Zach Prezkuta	2e080f594e	update head.tpl for dispy	2012-07-24 18:29:23 -06:00
friendica	57a75d240b	Merge pull request #406 from fermionic/frost-theme ... Introducing Frost	2012-07-24 15:28:16 -07:00
Zach Prezkuta	9378bc1375	disable tos and privacy links	2012-07-24 09:27:27 -06:00
Zach Prezkuta	178329b6dc	disable tos and privacy links	2012-07-24 09:26:12 -06:00
Zach Prezkuta	f9809102a2	Introducing Frost Mobile	2012-07-24 09:16:51 -06:00
Zach Prezkuta	8126e8ea47	Introducing Frost	2012-07-24 09:15:57 -06:00
friendica	b78bd8cc94	duplicate input names	2012-07-19 19:48:33 -07:00
Simon L'nu	021f0829e6	re-add the sparkle stuff ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-07-15 12:03:53 -04:00
friendica	15cae001d9	move plink sparkles to the right html element in dispy	2012-07-13 04:22:42 -07:00
Simon L'nu	10ce535cac	add doctitle thingy, and update cursor ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-07-13 04:35:16 -04:00
Simon L'nu	d08a97bb9f	add some sparkle ;) ... Signed-off-by: Simon L'nu <simon.lnu@gmail.com>	2012-07-13 02:37:45 -04:00
Thomas Willingham	bd08a6b565	Add sparkle cursor to Quattro/Vier/TestBubble	2012-07-12 19:21:21 +01:00
friendica	085b589468	add some sparkle to plinks	2012-07-11 21:04:08 -07:00
tomtom84	f475850739	diabook: add notification in website-title, whenever new notifications arrive	2012-07-08 21:50:17 +02:00
Vasudev Kamath	ba4db236ec	Merge branch 'master' of git://github.com/friendica/friendica	2012-07-06 22:47:27 +05:30
friendica	8b19168999	a bit more colour	2012-07-05 22:20:27 -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
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
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
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
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
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
friendica	dd001e32f4	rev update	2012-06-06 16:02:10 -07:00
Vasudev Kamath	079fdecff1	Merge branch 'master' of git://github.com/friendica/friendica	2012-06-04 19:59:23 +05:30
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
Tobias Diekershoff	959b264c44	quattro: admin panel styling and 1st buttons for addon/theme overview	2012-06-03 22:32:42 +02:00
friendica	d27c6de84e	add hometown to profiles	2012-06-02 20:58:20 -07:00
friendica	1180919c89	some zero theming on settings page	2012-05-30 16:30:51 -07:00
friendica	88a0d6a1d5	private group tests, cont.	2012-05-29 22:57:15 -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	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
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
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
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
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
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
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
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
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
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
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
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
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	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
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	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
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
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
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
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	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	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
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
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
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
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