1840 commits

Author	SHA1	Message	Date
rabuzarus	d8c0c62331	work on supported themes to use new acl	2015-06-26 15:44:32 +02:00
rabuzarus	afd1e0e6d0	make use of global.css	2015-05-31 13:55:21 +02:00
rabuzarus	553a152345	Merge photo-template into develop	2015-05-29 16:24:58 +02:00
rabuzarus	5cbb5b140c	css work	2015-05-29 16:08:17 +02:00
fabrixxm	8990a22dc0	duepuntozer: style video delete button	2015-05-24 10:35:55 +02:00
fabrixxm	d204e2524b	vier: style video delete button	2015-05-24 10:34:17 +02:00
fabrixxm	646ea377ac	quattro: readd video delete button styles ... because i'm not so good at resolving merge conflicts...	2015-05-24 10:28:15 +02:00
fabrixxm	b29b01fad4	Merge branch 'develop' into issue-1574	2015-05-24 10:26:21 +02:00
fabrixxm	4554526515	Merge pull request #1570 from rabuzarus/archive-widget ... port of red matrix archive widget	2015-05-24 10:18:10 +02:00
fabrixxm	3a71978b0d	Merge pull request #1598 from rabuzarus/datepicker ... new datetimepicker for event creation	2015-05-24 10:16:29 +02:00
fabrixxm	7c2608e07d	quattro: style video delete button	2015-05-23 22:51:34 +02:00
rabuzarus	5e6c140fc1	add double click on calendar day for frost theme	2015-05-23 20:02:57 +02:00
rabuzarus	6731ffbfc8	event preview for frost theme	2015-05-23 19:23:32 +02:00
rabuzarus	3504b3b94f	make frost + frost-mobile work with datepicker	2015-05-23 18:49:56 +02:00
rabuzarus	76283ff205	cleanup quattro less file	2015-05-23 17:50:18 +02:00
rabuzarus	9c803f7dbb	quattro css changes added to the less file	2015-05-23 17:45:44 +02:00
rabuzarus	30348a1bc0	port of red matrix archive-widget	2015-05-19 01:03:08 +02:00
Johannes Schwab	107b495183	fix infinite scrolling with frost-mobile	2015-04-07 13:26:09 +02:00
Michael Vogel	2eba5a32df	New screenshot for "vier".	2015-03-09 23:21:40 +01:00
Michael Vogel	bf0f7c3d0a	New bbcode elements h1 to h6 for a better conversion of Diaspora content	2015-03-01 20:07:56 +01:00
Michael Vogel	19af382ffb	"plus" is now the default style at "vier" for new installations	2015-02-21 09:44:13 +01:00
Michael Vogel	7e42315d9c	Merge pull request #1408 from tobiasd/issue885 ... decreasing bubble display time in themes from 10s to 5s	2015-02-19 23:02:55 +01:00
Tobias Diekershoff	985d771b13	decreasing bubble display time in themes from 10s to 5s	2015-02-19 21:24:09 +01:00
Michael Vogel	4a1105ede6	scrape/noscrape now contains the date the profile was last updated or the last message was sent.	2015-02-18 23:40:46 +01:00
Michael Vogel	a26d04574d	Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape	2015-02-17 19:18:17 +01:00
Michael Vogel	52de6c11b1	There is now a link to the profile behind the avatar picture on the display page	2015-02-17 17:33:28 +01:00
Johannes Schwab	9f4523dc9a	fix infinite scrolling with frost	2015-02-13 01:21:57 +01:00
Johannes Schwab	12d7ca9b84	improved infinite scrollling	2015-02-13 00:40:59 +01:00
Michael Vogel	842ac46857	Scrape now contains the number of contacts as well.	2015-02-08 23:35:29 +01:00
Michael Vogel	f5ec5a4349	Some diabook features can dramatically slow down the system. There is a new switch to disable this.	2015-02-03 19:59:47 +01:00
Michael Vogel	dbe52c74b5	Added Beanow as author, since he did most of the last changes.	2015-02-02 21:03:14 +01:00
Michael Vogel	9f0e19762e	New version for "Vier". The navigation was restructured and several other stuff was changed as well, thanks to Beanow!	2015-02-02 21:00:32 +01:00
Michael Vogel	6a34210353	Merge remote-tracking branch 'upstream/develop' into 1501-better-contact-list	2015-01-27 10:20:00 +01:00
Michael Vogel	848c09935a	The contact list in mails now contains not only the name but also the address.	2015-01-27 08:04:24 +01:00
fabrixxm	44df625bad	Merge pull request #1305 from tobiasd/20150123-quaddro ... making the ignore button in contact suggestions visible in quattro	2015-01-25 11:59:17 +01:00
Michael Vogel	cb9196f6d6	Issue 1197: New hook for "oembed_fetch_url"	2015-01-25 00:58:51 +01:00
Tobias Diekershoff	a33ca89bb7	adding missing styling to the ignore button in quattro	2015-01-24 07:22:55 +01:00
Tobias Diekershoff	d3bb944700	making the ignore button in contact suggestions visible in quattro	2015-01-23 09:51:24 +01:00
fabrixxm	b2527039b7	add text-only email option ... add a checkbok to notification settings. if checked, html body is not added to email.	2015-01-20 19:19:58 +01:00
Tobias Diekershoff	a21fe4059b	Merge pull request #1285 from annando/1501-enhanced-poco ... "location" and "about" for contacts, improved suggestions, improved contacts exchange	2015-01-09 08:37:05 +01:00
Michael Vogel	b36d799044	Fetching "location" and "about" from diaspora. Displaying them on the "display" page.	2015-01-07 01:46:13 +01:00
Tobias Diekershoff	b0ffe11b21	add thread un/ignore functionality to quattro theme	2015-01-05 09:05:27 +01:00
hauke	a72d60f481	Added h-card and functionality for IndieAuth/Web-sign-in	2014-12-28 15:48:24 +01:00
Michael Vogel	8b433c2d11	Vier: New style "dark"	2014-12-13 23:13:34 +01:00
Silke Meyer	f493252ac8	Use a sans-serif font-family in breathe	2014-12-06 20:05:30 +01:00
fabrixxm	bd0b93e630	Merge pull request #1165 from annando/1409-issue-1157 ... Issue 1157: Unused javascript function is removed.	2014-09-27 19:03:20 +02:00
Michael Vogel	2bbd7ab67f	Issue 1157: Unused javascript function is removed.	2014-09-27 14:17:50 +02:00
hauke	2743514791	bug fix #1135, show more is usable again	2014-09-22 13:53:16 +02:00
fabrixxm	6da5cf8037	fix residual curCSS, should fix #1153	2014-09-20 11:24:06 +02:00
Fabrixxm	d1029e1fb2	tweak quattro theme	2014-09-17 10:59:19 +02:00