3578 commits

Author	SHA1	Message	Date
rabuzarus	2aad62190f	template rework: use viewcontact_template.tpl also for directory	2015-10-22 22:48:49 +02:00
rabuzarus	f9c0c1d696	template rework: use viewcontact_template.tpl for contact dealing pages	2015-10-18 17:12:48 +02:00
rabuzarus	4c1c614fa6	Merge viewcontact into template_rework	2015-10-17 22:28:09 +02:00
rabuzarus	452a3011f7	Merge suggest into template_rework	2015-10-17 22:22:52 +02:00
rabuzarus	dbf1f9efcd	Merge dirfind into template_rework	2015-10-17 22:22:35 +02:00
rabuzarus	4b8ca578d1	dirfind: move pagination into template	2015-10-17 22:09:19 +02:00
rabuzarus	b9d9bf8ecd	directory: move pagination into template	2015-10-17 21:45:55 +02:00
rabuzarus	6d559bf8a9	viewcontact: use section_title.tpl as headding	2015-10-17 21:40:41 +02:00
rabuzarus	9176e739a4	sugest.php: themeable as whole page	2015-10-17 21:25:21 +02:00
rabuzarus	72896b0f6b	unify directory page	2015-10-17 19:45:57 +02:00
rabuzarus	20bb16859f	dirfind.php: move html to templates	2015-10-17 00:19:01 +02:00
rabuzarus	6ebb21a935	directory.php: move html to templates	2015-10-16 21:44:10 +02:00
Tobias Diekershoff	a961c29d05	Merge pull request #1962 from annando/1510-attend-vier ... Vier: Some small changes in the template for events	2015-10-14 06:42:50 +02:00
Michael Vogel	66ea33623b	Vier: Some small changes in the template for events	2015-10-13 20:15:01 +02:00
Tobias Diekershoff	db14dc13c3	DE: update to the strings	2015-10-13 17:35:08 +02:00
Tobias Diekershoff	1df5a7212b	DE: translation of the attend strings THX to Abrax	2015-10-13 17:06:35 +02:00
Tobias Diekershoff	154c55b36e	Merge pull request #1957 from fabrixxm/duepuntozeroattend ... attend functionality for duepuntozero	2015-10-12 21:16:40 +02:00
fabrixxm	fd8e8d005a	attend functionality for duepuntozero	2015-10-12 20:09:33 +02:00
fabrixxm	735755aa0e	Merge pull request #1956 from tobiasd/20151012-de ... DE Update to the translation, thx Abrax	2015-10-12 19:04:51 +02:00
Tobias Diekershoff	5839242792	DE Update to the translation, thx Abrax	2015-10-12 18:08:11 +02:00
Tobias Diekershoff	da8c81a12e	cleanup forgotten lines	2015-10-12 15:58:34 +02:00
Tobias Diekershoff	3debdf0a91	attend functionality for quattro theme (part of #1953)	2015-10-12 15:34:18 +02:00
Tobias Diekershoff	ce03ccc95c	Merge pull request #1929 from rabuzarus/event-attendance ... port of reds event attendance feature	2015-10-12 15:10:03 +02:00
Michael Vogel	adba75600a	Vier: Support for the new IFTTT addon.	2015-10-11 23:36:23 +02:00
rabuzarus	649578ae33	Merge develop-new into event-attendance-new ... Conflicts: include/conversation.php	2015-10-11 19:39:55 +02:00
Michael Vogel	efbdb57f92	Reworked contact relations between Friendica and Diaspora	2015-10-10 11:06:18 +02:00
Tobias Diekershoff	26983bafff	Merge pull request #1944 from annando/1510-proxy-picture-size ... Picture size and bugfix for contact names with "<" and ">"	2015-10-08 08:03:42 +02:00
Michael Vogel	61c3ce7a21	Bugfix: The contact names had to be escaped	2015-10-08 00:25:55 +02:00
Michael Vogel	1f0b759e2f	Added resize possibility to proxy function	2015-10-07 08:25:10 +02:00
Tobias Diekershoff	b4ec07ab27	IT: update to the strings	2015-10-07 06:20:54 +02:00
Michael Vogel	607817d1b3	Vier: Avoid an error when calling the admin settings of "vier" when "vier" is not activated.	2015-10-05 17:38:57 +02:00
Michael Vogel	d3ac3f8490	Added the contact menu to the search as well.	2015-10-05 08:08:59 +02:00
Michael Vogel	72ecb9e67b	Bugfix: Repairing a contact was more like killing the contact ...	2015-10-04 19:39:55 +02:00
Tobias Diekershoff	9f68676db6	Merge pull request #1934 from annando/1510-better-notification ... Let the notification look more like the follow dialog	2015-10-04 17:49:02 +02:00
Michael Vogel	4003b9cc5d	Let the notification look more like the follow dialog	2015-10-04 17:18:58 +02:00
Tobias Diekershoff	e1f3f2bc6c	Merge pull request #1933 from annando/1510-follow-more-data ... Show more information when following a new contact	2015-10-04 17:02:27 +02:00
Tobias Diekershoff	18e8d0de59	Merge pull request #1932 from annando/1510-vier-2 ... Small optical changes in "vier"	2015-10-04 17:01:25 +02:00
Michael Vogel	83ea4f7253	transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues.	2015-10-04 15:55:24 +02:00
Michael Vogel	d0ae5ce326	Show more information when following a new contact	2015-10-04 14:41:39 +02:00
Michael Vogel	1d71dde7ef	Beautyfied code. Link to "follow" on community profiles	2015-10-04 14:40:02 +02:00
Michael Vogel	3b18c6cb0c	Small optical changes in "vier"	2015-10-04 12:24:00 +02:00
Tobias Diekershoff	01d38a353c	DE update to the translation	2015-10-04 09:23:58 +02:00
Tobias Diekershoff	05b2836d66	Merge pull request #1926 from annando/1510-permit-crawler ... New option to permit crawlers	2015-10-04 08:53:32 +02:00
Michael Vogel	42ad8c2b25	New template for http status messages	2015-10-03 23:19:09 +02:00
Michael Vogel	3ae0deadb6	The right side now contains much stuff from diabook - but completely reworked.	2015-10-03 12:55:55 +02:00
Michael Vogel	47c855388e	Vier: Menu at the right side (inspired and copyied from diabook)	2015-10-01 08:19:35 +02:00
Tobias Diekershoff	d6beb7db1f	add a header to seperate the beginning of week settings	2015-10-01 06:19:57 +02:00
Michael Vogel	5fe357ee75	Rearrange the navigation bar on smaller windows	2015-09-30 21:59:55 +02:00
Michael Vogel	389b7de451	Setting for the first day of the week	2015-09-30 19:18:13 +02:00
Michael Vogel	68a6f0298e	The events moved from the profile to the navigation bar - for supported themes	2015-09-30 18:50:44 +02:00
rabuzarus	7cb4ea52fd	port of the event attendance feature of red matrix with example implementation for vier theme.	2015-09-30 16:58:02 +02:00
rabuzarus	f5c7006f30	rest of the consensus porting work and integration into friendica ... Credits to Mike Macgirvin for the code	2015-09-30 14:38:13 +02:00
Michael Vogel	6e981ed798	Merge remote-tracking branch 'upstream/develop' into 1509-i18n-events	2015-09-29 10:35:50 +02:00
Michael Vogel	c33957a6e9	Internationalisation of events/Move events to the navigation bar	2015-09-27 14:00:15 +02:00
Tobias Diekershoff	28df4b2cd0	PL update to the strings	2015-09-24 22:09:39 +02:00
Michael Vogel	25fc2c9799	Some changes to stay compatible to Diaspora	2015-09-19 14:00:33 +02:00
Tobias Diekershoff	976a2be1f7	Merge pull request #1892 from annando/1509-vier-attachements ... Now attachments of the type "application" are displayed as well.	2015-09-18 21:11:57 +02:00
Michael Vogel	6be65f4eae	Now attachments of the type "application" are displayed as well.	2015-09-18 21:09:31 +02:00
Tobias Diekershoff	dbc9d87156	DE update to the strings	2015-09-17 14:24:07 +02:00
Michael Vogel	5ac38b7f99	There is now only one central parameter for the global directory.	2015-09-15 22:29:02 +02:00
Tobias Diekershoff	8504cf4f05	Merge pull request #1880 from annando/1509-performance ... Some settings to control the system load	2015-09-06 09:02:27 +02:00
Michael Vogel	c6d9b2da23	New setting for requery days	2015-09-05 10:54:39 +02:00
Tobias Diekershoff	4db21f85c4	DE, ES, IT: update to the translations	2015-09-01 15:12:09 +02:00
Tobias Diekershoff	32c063b9a5	IT update to the translations	2015-08-31 19:02:12 +02:00
Tobias Diekershoff	3665ab3de0	FR update to the translations	2015-08-31 19:01:56 +02:00
Tobias Diekershoff	fe5a5c72f5	ES update to the translations	2015-08-31 19:01:42 +02:00
Tobias Diekershoff	af48217465	Merge pull request #1870 from annando/1508-soapbox ... Soapbox-Improvements	2015-08-31 06:53:54 +02:00
Michael Vogel	56ae056f1d	The "manage" option list is now larger.	2015-08-30 22:45:48 +02:00
Michael Vogel	cc3419f101	Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu ... Conflicts: mod/dfrn_notify.php	2015-08-30 10:44:29 +02:00
Tobias Diekershoff	9aa1e22047	CS update to the strings	2015-08-30 07:24:39 +02:00
Michael Vogel	31fffcf281	Accidentally removed a file	2015-08-29 17:09:25 +02:00
Michael Vogel	82e682ef45	The click behaviour of the top menu bar is now changed completely	2015-08-29 10:14:41 +02:00
Michael Vogel	e25457ab68	Merge remote-tracking branch 'upstream/develop' into 1508-vier-popup-menu	2015-08-28 14:16:52 +02:00
Michael Vogel	319df2ed66	The menu bar isn't clickable anymore	2015-08-28 11:36:43 +02:00
Michael Vogel	14af9cd2e8	Remove the unneeded menu buttons-	2015-08-27 00:50:04 +02:00
Michael Vogel	92fbf1bcbd	Vier: Use CSS for popup menu	2015-08-27 00:02:06 +02:00
Tobias Diekershoff	7da830c9f6	DE update to the strings	2015-08-26 16:40:31 +02:00
Michael Vogel	6942b16ef5	See issue 1855. OOhembed is removed.	2015-08-25 19:50:23 +02:00
Michael Vogel	b1dddd2936	Only offer forum search in local mode.	2015-08-25 05:54:50 +02:00
Michael Vogel	d1647222d3	Vier: The "register" page now looks better.	2015-08-24 19:03:03 +02:00
Tobias Diekershoff	cc145f0e25	Merge pull request #1850 from tobiasd/20150824-de ... DE updated translation	2015-08-24 14:27:13 +02:00
Tobias Diekershoff	26c5c7991a	Merge pull request #1849 from fabrixxm/issue-1841 ... filebrowser: link image to original picture, show error messages	2015-08-24 14:26:09 +02:00
Tobias Diekershoff	489e90281a	DE updated translation	2015-08-24 14:21:22 +02:00
fabrixxm	cbabac298d	filebrowser: link image to original picture, show error messages	2015-08-24 13:54:41 +02:00
Michael Vogel	3bca2db11b	Don't show search options in side bar.	2015-08-24 12:12:14 +02:00
Michael Vogel	3ff196f00d	Now you can set search options so that searching for contacts or forums isn't occult science anymore.	2015-08-24 11:55:29 +02:00
Tobias Diekershoff	fc18123082	Merge pull request #1837 from fabrixxm/feature-1796 ... add support for oneline,in-text code tag	2015-08-23 17:27:45 +02:00
fabrixxm	2d75e1f422	add support for oneline,in-text code tag	2015-08-20 15:08:55 +02:00
fabrixxm	81d1dfc006	add 'reload active plugins' button in admin/plugins	2015-08-20 15:01:15 +02:00
Michael Vogel	e6b85c822d	frost-mobile has now a link to the original post. See issue 1793	2015-08-18 20:30:01 +02:00
Michael Vogel	6ae34f4802	Merge pull request #1828 from tobiasd/20150816-fix1621 ... add the profile url to the settings pages as alternative to the webfi…	2015-08-17 21:51:03 +02:00
Tobias Diekershoff	b67adebd9c	DE update to the strings	2015-08-17 12:02:03 +02:00
Tobias Diekershoff	621dec1606	reconstruct the description for more flexible translations	2015-08-17 07:20:50 +02:00
Tobias Diekershoff	eea258f74c	add the profile url to the settings pages as alternative to the webfinger. See issue 1621	2015-08-16 22:39:08 +02:00
Michael Vogel	c2a1cf958d	The addon "statistics_json" becomes the system setting "nodeinfo"	2015-08-16 21:45:51 +02:00
Tobias Diekershoff	4ca515ab33	Merge pull request #1823 from annando/issue-1348 ... The login form in the aside section should look now better	2015-08-15 07:19:05 +02:00
Michael Vogel	72c8fff909	Improved register link and open-id input.	2015-08-15 07:08:32 +02:00
Michael Vogel	efec7e973e	This hopefully will solve issue 1348	2015-08-14 23:32:10 +02:00
Tobias Diekershoff	bb4e339d8f	DE update to the strings	2015-08-14 13:03:55 +02:00
Michael Vogel	887372a0d7	Bugfix: Conversations with Diaspora now work reliable	2015-08-13 22:49:57 +02:00