12360 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Michael Vogel	266fea3874	Merge remote-tracking branch 'upstream/develop' into 1606-contact-id	2016-06-21 00:10:24 +02:00
rabuzarus	5324023d52	Merge pull request #2627 from annando/1606-diaspora-uri ... Diaspora: Try to fetch the uri if we already received the message	2016-06-20 23:43:40 +02:00
Michael Vogel	a657377616	Diaspora: Try to fetch the uri if we already received the message	2016-06-20 22:48:55 +02:00
Michael Vogel	40a44f1571	Some manual revert ...	2016-06-20 22:48:09 +02:00
Michael Vogel	467176fa65	Diaspora: Ensure that we always store the correct URI	2016-06-20 22:43:14 +02:00
Michael Vogel	939bd965c5	Search query optimized	2016-06-20 22:03:40 +02:00
Michael Vogel	b411380c4c	Merge pull request #2625 from rabuzarus/1906-event-test ... frio: disable the events module link in the profile tab	2016-06-20 14:26:27 +02:00
rabuzarus	80f5065eb0	frio: disable the events module link in the profile tab	2016-06-20 13:44:11 +02:00
Michael Vogel	65b541413f	Merge remote-tracking branch 'upstream/develop' into 1606-contact-id	2016-06-20 07:28:47 +02:00
Michael Vogel	140886a6a5	Updated database.sql	2016-06-20 06:29:56 +02:00
Michael Vogel	9aa5c2f821	Merge pull request #2623 from rabuzarus/1906-event-test ... implement a public calendar for vistors of someones profile page	2016-06-20 06:23:25 +02:00
Tobias Diekershoff	9ea9494a9e	Merge pull request #2620 from dissolve/2617 ... recreate fix for #2617 on correct branch	2016-06-20 00:06:52 +02:00
rabuzarus	7495a34b32	implement a public calendar for vistors of someones profile page	2016-06-19 22:04:34 +02:00
Michael Vogel	51b5d16f1b	Improved SQL queries	2016-06-19 21:41:06 +02:00
Michael Vogel	0adff6f6b8	Fix for author-thumb/owner-thumb - DFRN: Relocate stuff	2016-06-19 20:01:25 +02:00
Michael Vogel	91db7a549c	Optimised the amount of function for the item query	2016-06-19 08:32:38 +02:00
Michael Vogel	c3ed6f7d01	Improved default value handling	2016-06-19 01:22:32 +02:00
Michael Vogel	e512a83ecc	Massively updated avatar handling	2016-06-19 01:07:20 +02:00
Michael Vogel	d0033ca5cf	Merge pull request #2621 from rabuzarus/1206-events-template ... frio - events - fix double click on date	2016-06-18 21:32:07 +02:00
rabuzarus	ee0942b96d	frio - events - fix double click on date	2016-06-18 15:23:35 +02:00
Michael Vogel	bf2e23c205	Merge pull request #2616 from rabuzarus/1206-events-template ... use standard templates in events + frio templates for events	2016-06-18 15:01:00 +02:00
Michael Vogel	1b896fd16d	Merge pull request #2615 from rabuzarus/1606-texthighlight ... port of Hubzillas code highlight feature	2016-06-18 14:56:54 +02:00
Ben Roberts	22de27327c	recreate fix for #2617 on correct branch	2016-06-18 08:16:09 -04:00
rabuzarus	b977efc95c	code highlight - some spacing for readability	2016-06-17 15:29:01 +02:00
rabuzarus	48a77af49d	frio - events - delete unneeded css	2016-06-17 14:52:42 +02:00
rabuzarus	134d5949d5	frio - events - restore lost css bracket after merging develop branch	2016-06-17 14:39:59 +02:00
rabuzarus	d0900c5389	Merge develop into 1206-events-template - restore gitignore	2016-06-17 14:35:24 +02:00
rabuzarus	7dc5fc8b9f	Merge develop into 1206-events-template ... Conflicts: view/theme/frio/css/style.css	2016-06-17 14:33:08 +02:00
rabuzarus	4313982e02	frio - event - code clean up + docu	2016-06-17 14:27:33 +02:00
rabuzarus	606f42701c	frio - event - some js and template refactoring + event view css styling	2016-06-17 14:09:18 +02:00
rabuzarus	0148d0e5d2	frio - event - correct some js	2016-06-17 11:18:54 +02:00
rabuzarus	2f266382c5	code highlight - add docu	2016-06-17 11:02:27 +02:00
rabuzarus	c99da380cf	frio: events - adapt changes to the templates of the other themes	2016-06-17 10:33:12 +02:00
rabuzarus	8b4c416713	frio: events - split event form in different sections	2016-06-16 20:16:16 +02:00
rabuzarus	0167a2bd61	port of Hubzillas code highlight feature	2016-06-16 11:38:12 +02:00
Michael Vogel	8762fb671f	Merge remote-tracking branch 'upstream/develop' into 1606-contact-id	2016-06-16 10:48:52 +02:00
Michael Vogel	76abade4d8	Merge pull request #2613 from rabuzarus/1506-frio_bookmarklet ... frio: open jot modal automatically on bookmarklet page	2016-06-16 06:37:27 +02:00
rabuzarus	7b602a20e6	frio - bookmarklet - open jot only if it is available	2016-06-16 00:27:45 +02:00
rabuzarus	dfce0f5b64	frio: open jot modal automatically on bookmarklet page	2016-06-16 00:20:00 +02:00
Tobias Diekershoff	e63e2a4c6c	Merge pull request #2612 from annando/1606-dfrn-relocate ... dfrn relocate: addr field added, gcontact update added	2016-06-15 23:13:20 +02:00
Michael Vogel	3c9a80a31c	dfrn relocate: addr field added, gcontact update added	2016-06-15 21:23:22 +02:00
Michael Vogel	0e35427dfc	New fields "author-id" and "owner-id" in the item table	2016-06-15 21:20:55 +02:00
Tobias Diekershoff	5ec7626b12	Merge pull request #2610 from rabuzarus/1406-frio-search-fix ... frio: fix searchbox - comment tag wasn't closed	2016-06-14 13:44:14 +02:00
rabuzarus	7ec13d4534	frio: fix searchbox - comment tag wasn't closed	2016-06-14 10:41:14 +02:00
rabuzarus	3f67e694bf	Merge pull request #2609 from annando/1606-categories ... Categories were missing	2016-06-14 10:05:07 +02:00
Michael Vogel	7f5a2d5c23	Categories were missing	2016-06-14 09:50:17 +02:00
rabuzarus	3a240b73a5	Merge pull request #2607 from annando/1606-time-travel ... Avoid time travel in posts (received before created)	2016-06-14 01:09:37 +02:00
Michael Vogel	a05f0c39a6	Merge remote-tracking branch 'upstream/develop' into 1606-time-travel	2016-06-13 22:32:40 +02:00
rabuzarus	6e354eca14	Merge pull request #2606 from annando/1606-network-order ... Bugfix: Items weren't sorted correctly	2016-06-13 22:26:10 +02:00
Michael Vogel	81395fe385	Avoid time travel in posts (received before created)	2016-06-13 22:21:33 +02:00