2802 commits

Author	SHA1	Message	Date
Michael Vogel	830870c58e	Fix for issue 2060: When password is provided during the register process now the user is redirected correctly.	2015-11-14 08:07:09 +01:00
Tobias Diekershoff	009b3364e5	Merge pull request #2074 from fabrixxm/issue_2071 ... Use static css in install procedure	2015-11-13 12:50:41 +01:00
Fabrixxm	0a9e017d34	Installer use static css, fix #2071	2015-11-13 10:56:06 +01:00
Michael Vogel	ab1edca0be	Profile photos are now having an extension	2015-11-13 10:15:30 +01:00
Michael Vogel	6ddf62bdf7	Merge remote-tracking branch 'upstream/develop' into 1511-avatar	2015-11-13 09:48:34 +01:00
Michael Vogel	11905c0bec	The avatar picture wasn't updated at the contact table	2015-11-13 08:45:14 +01:00
Michael Vogel	5a8d66e2d4	Just removed blanks with tabs	2015-11-12 23:34:33 +01:00
Tobias Diekershoff	69076b9a01	Merge pull request #2053 from annando/1511-only-supported-themes ... Only show supported themes on the admin site.	2015-11-08 18:39:07 +01:00
Michael Vogel	e803e56eea	Only show supported themes on the admin site.	2015-11-08 18:35:39 +01:00
Tobias Diekershoff	686ba3fcb0	Merge pull request #2052 from fabrixxm/issue_1718 ... duepuntozero, vier: add unread messages per group	2015-11-08 18:29:15 +01:00
fabrixxm	c700a6fb37	duepuntozero, vier: add unread messages per group	2015-11-08 18:02:04 +01:00
Tobias Diekershoff	e6202defd1	Merge pull request #2049 from annando/1511-only-valid-contacts ... Only show valid contacts on the group page	2015-11-08 16:46:45 +01:00
Michael Vogel	1c5eaa646c	Only show valid contacts on the group side	2015-11-08 16:41:00 +01:00
Tobias Diekershoff	631afe5810	Merge pull request #2035 from FlxAlbroscheit/develop ... Preview the last 5 conversations in message-sidebar	2015-11-08 16:03:04 +01:00
fabrixxm	e6a8a7c8a9	Merge pull request #2048 from strk/group_post ... Include per-group count of unseen items in /ping output	2015-11-08 16:01:19 +01:00
Sandro Santilli	d31c372376	Revert the rename of <groups>	2015-11-08 15:56:43 +01:00
Sandro Santilli	e28072f548	Fix bugs and rename <groups> to <group_posts>	2015-11-08 15:56:08 +01:00
FlxAlbroscheit	613cf41fd6	Preview last five conversations in message-sidebar	2015-11-08 15:45:42 +01:00
Sandro Santilli	ba158dfeb1	Include per-group count of unseen items in /ping output ... See #1718 Unfinished work	2015-11-08 15:33:12 +01:00
Tobias Diekershoff	c0e87b2bea	Merge pull request #2045 from annando/1511-dirfind-addr ... You can now discover previously unknown users via the dirsearch	2015-11-08 15:19:11 +01:00
Michael Vogel	c2beab0d56	Fixed an undefined variable	2015-11-08 15:17:08 +01:00
Michael Vogel	7de6f23f4a	Now it is possible to search for @http://profile...	2015-11-08 15:00:52 +01:00
Michael Vogel	e12b0d27bb	You can now search for @username@domain.tld in dirfind and the search will resolve that.	2015-11-08 14:48:47 +01:00
fabrixxm	ae9c9829fa	Remove language selectors from themes ... This is now a user setting	2015-11-08 14:42:54 +01:00
fabrixxm	fb3ac68cc0	Add user language in settings, use that field as language for UI	2015-11-08 14:23:49 +01:00
fabrixxm	24d807221b	Image filebrowser dialog links images to image page ... fix #1991	2015-11-08 12:05:23 +01:00
fabrixxm	28a8c2369a	Not current theme settings in admin page ... fix #2022	2015-11-07 21:22:55 +01:00
FlxAlbroscheit	14dff6b0e0	Preview last five conversations in message-sidebar	2015-11-07 18:53:32 +01:00
Tobias Diekershoff	83c45d8d4b	Merge pull request #2029 from tugelbend/develop ... changed syntax to work with PHP 5.3 #2027	2015-11-07 16:34:13 +01:00
hauke	f3eebda4fa	changed syntax to work with PHP 5.3 #2027	2015-11-07 16:24:59 +01:00
Michael Vogel	3ccff0c77f	Merge pull request #2023 from tobiasd/20151107-registertext ... Following n4rky to resolve #1898	2015-11-07 16:02:26 +01:00
Tobias Diekershoff	9a1c57f1bc	Following n4rky to resolve #1898	2015-11-07 13:19:55 +01:00
Tobias Diekershoff	bb5f7c4db7	Merge pull request #2020 from fabrixxm/install_checks ... Install checks	2015-11-07 11:12:37 +01:00
fabrixxm	6befca288f	Check for mcrypt_create_iv() for RINO2, update link to cron documentation	2015-11-07 11:03:08 +01:00
Tobias Diekershoff	4e7bf0028c	Merge pull request #2019 from rabuzarus/0611_directory ... simple photo_menu for directory	2015-11-07 06:54:16 +01:00
fabrixxm	16123f5ad5	Check for ImageMagick and for GIF support	2015-11-07 00:22:26 +01:00
rabuzarus	df36ea0d03	simple photo_menu for directory	2015-11-07 00:08:35 +01:00
fabrixxm	5f6ea6357d	Add 'Reload active themes' to admin ... It will call 'uninstall()' and 'install()' on every active themes	2015-11-06 23:53:10 +01:00
Michael Vogel	0f41f35041	The contact template now displays the address if available	2015-11-06 00:47:54 +01:00
rabuzarus	a0ae6eb905	template-rework:little cleanup	2015-11-03 14:33:17 +01:00
rabuzarus	e785759a8b	template-rework:make use of get_contact_details_by_url()	2015-11-03 14:31:15 +01:00
rabuzarus	f196389580	Merge develop into allfriends	2015-11-02 14:31:20 +01:00
Michael Vogel	709aac0652	Only offer the choice to activate Diaspora and OStatus if the system is ready for it	2015-11-01 13:55:49 +01:00
Michael Vogel	2f47d63a29	Merge pull request #2000 from tobiasd/20151027-credits ... a credits page	2015-10-31 22:34:30 +01:00
Tobias Diekershoff	cfc9d2b88f	Merge pull request #1998 from annando/1510-network-profile2 ... New function for fetching contact data	2015-10-31 19:02:01 +01:00
Tobias Diekershoff	7d0ea70cc1	Merge pull request #2001 from annando/1510-empty-poco ... Bugfix: /poco was always empty	2015-10-31 12:48:30 +01:00
Michael Vogel	7cf4468353	Bugfix: /poco was always empty	2015-10-31 10:32:01 +01:00
Michael Vogel	09ff2f0dd5	Renamed the function	2015-10-31 00:01:33 +01:00
Tobias Diekershoff	c00847a79d	use section_title.tpl for page title	2015-10-30 18:05:45 +01:00
rabuzarus	fc37f49f23	network.php: add a descriptive comment	2015-10-30 12:47:48 +01:00