10681 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	e74916d395	Merge pull request #2042 from tobiasd/develop ... some icons were added to the ShaShape iconset	2015-11-08 12:44:44 +01:00
Tobias Diekershoff	4b9fa3fb7e	some icons were added to the ShaShape iconset	2015-11-08 12:33:48 +01:00
Tobias Diekershoff	44cb02f6da	Merge pull request #2041 from fabrixxm/issue_1991 ... File and Image dialog fixes	2015-11-08 12:18:16 +01:00
Tobias Diekershoff	baf8eb5081	Merge pull request #2040 from annando/issue-2038 ... Bugfix for non working pagination in GNU Social	2015-11-08 12:13:07 +01:00
fabrixxm	24d807221b	Image filebrowser dialog links images to image page ... fix #1991	2015-11-08 12:05:23 +01:00
fabrixxm	0363bab040	js: add new Dialog object ... The Dialog is used by code to show urls in colorbox. Templates can overwrite `show()` function to change its behaviour	2015-11-08 12:01:19 +01:00
Michael Vogel	27b166caf6	Bugfix for not working pagination in GNU Social	2015-11-08 11:10:20 +01:00
Tobias Diekershoff	e4b2ef84b1	Merge pull request #2039 from silke/docs-de ... Neue Version der SSL-Hilfe auf deutsch	2015-11-08 10:30:09 +01:00
Silke Meyer	79402e41c7	Updated German translation	2015-11-08 10:21:13 +01:00
Silke Meyer	9cc668d5be	fixed typo	2015-11-08 10:13:38 +01:00
Tobias Diekershoff	50b3232bb0	Merge pull request #2037 from fabrixxm/issue_2022 ... Not current theme settings in admin page	2015-11-07 21:25:52 +01:00
fabrixxm	28a8c2369a	Not current theme settings in admin page ... fix #2022	2015-11-07 21:22:55 +01:00
Tobias Diekershoff	4126f9ab51	Merge pull request #2036 from silke/docs ... Docs	2015-11-07 20:59:01 +01:00
Silke Meyer	f6d1205b04	Updated content.	2015-11-07 20:43:04 +01:00
Tobias Diekershoff	294b4ecf5e	Merge pull request #2034 from fabrixxm/issue_1986 ... fix the contact photo menu	2015-11-07 20:29:20 +01:00
Tobias Diekershoff	882e10c6e1	Merge pull request #2032 from fabrixxm/cron_update_suggestions ... cron: move update_suggestions in separated thread	2015-11-07 20:27:53 +01:00
Silke Meyer	2445fe9be9	Markdown headings	2015-11-07 18:26:48 +01:00
fabrixxm	35302d4274	fix the contact photo menu ... fix "should open a new tab" attribute fix javascript deletion dialog (fix #1986)	2015-11-07 18:25:35 +01:00
fabrixxm	fa0acba49e	Merge pull request #2030 from tobiasd/20151107-shashape ... initial commit of the ShaShape iconset by Andi Stadler	2015-11-07 18:07:17 +01:00
Silke Meyer	f582d63ab2	Threw out information about typos. They can always occur.	2015-11-07 17:56:47 +01:00
Silke Meyer	e257572719	Reformatted SSL documentation to one sentence per line before working on the content.	2015-11-07 17:54:59 +01:00
fabrixxm	d5a32ef214	cron: move update_suggestions in separated thread ... Move the call in discover_poco.php. This should fix expiration and other cron related issues	2015-11-07 17:52:52 +01:00
Tobias Diekershoff	26b1c55368	Merge pull request #2031 from tugelbend/develop ... adding Imagick to vagrant installation	2015-11-07 17:17:43 +01:00
hauke	78cc32031a	... and force the install	2015-11-07 17:14:00 +01:00
hauke	1213243f98	fix: wrong package name	2015-11-07 17:13:31 +01:00
hauke	6292077fea	adding Imagick to vagrant installation as it is needed for none-jpg-image-processing	2015-11-07 17:06:36 +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
Tobias Diekershoff	b3e3149e50	wrong filename	2015-11-07 16:30:31 +01:00
Tobias Diekershoff	f2013951a9	wrong filename	2015-11-07 16:28:31 +01:00
hauke	f3eebda4fa	changed syntax to work with PHP 5.3 #2027	2015-11-07 16:24:59 +01:00
Tobias Diekershoff	0c6097fbcd	initial commit of the ShaShape iconset by Andi Stadler	2015-11-07 16:24:22 +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
Michael Vogel	4528529968	Merge pull request #2005 from tobiasd/20151101-dev ... mark the development version	2015-11-07 16:01:46 +01:00
Tobias Diekershoff	5cebc6d9b1	we found a dev format	2015-11-07 15:39:55 +01:00
Tobias Diekershoff	b609aca456	Merge pull request #2026 from silke/vagrant-update ... Vagrant update	2015-11-07 15:12:09 +01:00
Silke Meyer	a5af773bc8	Configuration for Vagrant running Ubuntu 14.04	2015-11-07 14:55:58 +01:00
Tobias Diekershoff	3fa381cbdf	Merge pull request #2024 from annando/1511-api-bugfix ... API Bugfix: Posts to AndStatus appeared as empty posts	2015-11-07 14:51:11 +01:00
Michael Vogel	88e1ac9654	API Bugfix: This fixes the problem that posts to AndStatus appeared as empty posts	2015-11-07 14:36:00 +01:00
Tobias Diekershoff	9a1c57f1bc	Following n4rky to resolve #1898	2015-11-07 13:19:55 +01:00
Silke Meyer	f1a48a81f4	Activate logging in vagrant VM	2015-11-07 12:28:41 +01:00
Silke Meyer	0d6ec70a68	Merge pull request #2021 from fabrixxm/php_arrays ... Use old style array declaration	2015-11-07 12:25:51 +01:00
fabrixxm	80b62071e1	Use old style array declaration	2015-11-07 12:21:54 +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
Tobias Diekershoff	a1da54834b	Merge pull request #2018 from fabrixxm/admin_theme_reload ... Add 'Reload active themes' to admin	2015-11-07 00:09:58 +01:00