3282 commits

Author	SHA1	Message	Date
Michael Vogel	08696acb18	Merge remote-tracking branch 'upstream/develop' into 1503-faster-tags	2015-03-08 03:23:49 +01:00
Michael Vogel	67d39770ed	Improved the margins of the headers	2015-03-07 21:12:18 +01:00
Tobias Diekershoff	96a5257d9c	RO: update to the strings	2015-03-05 22:48:50 +01:00
Michael Vogel	52e33d50ad	Changing header sizes and changing the header type of oembed data.	2015-03-01 21:58:31 +01:00
Michael Vogel	da49814cbb	Use a header element for the oembed data.	2015-03-01 21:24:10 +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
fabrixxm	eb1f21d1e5	Merge pull request #1412 from annando/1502-vier-plus-default ... "plus" is now the default style at "vier" for new installations	2015-02-23 08:51:31 +01:00
Michael Vogel	f3cc065e66	Show the profile visibility only for Friendica contacts.	2015-02-21 20:03:02 +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	8179f2f65e	Only show the relation on native networks.	2015-02-20 23:56:41 +01:00
Michael Vogel	a8a37a35db	Only show the options that fit to the current network.	2015-02-20 23:12:04 +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
Fabrixxm	b7a50a24c7	Merge branch 'release-3.3.3' into develop	2015-02-18 08:38:06 +01:00
Michael Vogel	4b7ff42a89	Bugfix: See issue 1338	2015-02-17 19:48:02 +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
Fabrixxm	9d3fb417c2	Escape values to input fields (and some 'title' and 'alt')	2015-02-16 09:30:12 +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
Tobias Diekershoff	e3b6770ad4	CS, ZH-CN: update to the strings	2015-02-12 07:59:21 +01:00
Tobias Diekershoff	400e11fd9f	ZH-CN update to the strings	2015-02-10 07:47:26 +01:00
Tobias Diekershoff	4e4702fb8b	CS, IT: update to the strings	2015-02-09 19:53:35 +01:00
Fabrixxm	f4f0f2bbc7	update IT strings	2015-02-09 11:55:14 +01:00
Tobias Diekershoff	93cb464d79	DE update to the strings	2015-02-09 11:19:56 +01:00
Michael Vogel	21c63e8b65	Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape	2015-02-09 10:16:48 +01:00
Tobias Diekershoff	18cfb5e726	Merge pull request #1377 from tobiasd/20150209cs ... CS update to the strings	2015-02-09 08:45:48 +01:00
Tobias Diekershoff	898d4b2a62	CS update to the strings	2015-02-09 07:57:03 +01:00
Michael Vogel	842ac46857	Scrape now contains the number of contacts as well.	2015-02-08 23:35:29 +01:00
Michael Vogel	7e9ae24511	Moved several settings from .htconfig.php to the admin settings page.	2015-02-08 20:35:40 +01:00
Michael Vogel	8871591a98	Merge remote-tracking branch 'upstream/develop' into 1502-altpager-default ... Conflicts: mod/admin.php	2015-02-08 13:26:28 +01:00
Tobias Diekershoff	b4dc344f9c	Merge pull request #1374 from annando/1502-noscrape-always-active ... Noscrape is now enabled all the time	2015-02-08 12:48:13 +01:00
Tobias Diekershoff	1418d6bc27	Merge pull request #1373 from annando/1502-bugfix-admin-aside ... Bad HTML in the admin side menu for webfinger and probe	2015-02-08 12:47:46 +01:00
Michael Vogel	1781fbff13	Bad HTML in the admin side menu for webfinger and probe	2015-02-08 12:12:19 +01:00
Michael Vogel	f931eba7f2	Noscrape is now enabled all the time.	2015-02-08 12:07:35 +01:00
Michael Vogel	1d48ab0191	"altpager" is now the standard value and can be disabled. Depending upon the user reactions we can disable it in an upcoming version.	2015-02-08 11:54:42 +01:00
Tobias Diekershoff	cea445de2e	FR update for the strings	2015-02-08 10:44:47 +01:00
Tobias Diekershoff	5aba3abfc1	CS DE FR: update to the strings	2015-02-05 11:06:23 +01:00
Tobias Diekershoff	485432e734	FR: some more updates to the strings	2015-02-04 11:54:13 +01:00
Tobias Diekershoff	14dec94d33	DE FR: update to the strings	2015-02-04 11:41:06 +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
Tobias Diekershoff	09b90244c3	Merge pull request #1344 from annando/1502-new-vier-version ... New version for "Vier"	2015-02-02 21:50:54 +01:00
Michael Vogel	9c0dc86eea	Merge pull request #1342 from tobiasd/20150202_admin ... added diagnostics tools to the admin side panel	2015-02-02 21:14:41 +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
Tobias Diekershoff	8a17c3d348	added diagnostics tools to the admin side panel	2015-02-02 18:26:38 +01:00
Michael Vogel	1fb79a1a59	Merge pull request #1333 from tobiasd/20150131_ptbr ... PT-BR: update to the strings	2015-02-01 16:40:24 +01:00
Silke Meyer	c90e47556a	added setting for server's sender email address	2015-01-31 15:54:12 +01:00
Tobias Diekershoff	ac86aa5822	PT-BR: update to the strings	2015-01-31 08:42:36 +01:00