Commit graph

11115 commits

Author SHA1 Message Date
FlxAlbroscheit
a8c033a7f6 Preview last five conversations in message-sidebar 2015-11-07 18:55:13 +01:00
FlxAlbroscheit
603dad93f3 Preview last five conversations in message-sidebar 2015-11-07 18:54:20 +01:00
FlxAlbroscheit
14dff6b0e0 Preview last five conversations in message-sidebar 2015-11-07 18:53:32 +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
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
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
b3e3149e50 wrong filename 2015-11-07 16:30:31 +01:00
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
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
5cebc6d9b1 we found a dev format 2015-11-07 15:39:55 +01:00
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
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
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
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
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
a1da54834b Merge pull request #2018 from fabrixxm/admin_theme_reload
Add 'Reload active themes' to admin
2015-11-07 00:09:58 +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
ed03a941ed Merge pull request #2016 from fabrixxm/template_vars_hook
Fix template_var hook
2015-11-06 20:03:38 +01:00
fabrixxm
0aa69f134f Fix template_var hook
move it to smarty3 replate_macro, pass the theme name in $b
2015-11-06 19:52:00 +01:00
1053fe91c8 Merge pull request #2015 from fabrixxm/template_vars_hook
Add 'template_vars' hook
2015-11-06 19:39:42 +01:00
fabrixxm
545a7a80e4 Add 'template_vars' hook 2015-11-06 19:33:14 +01:00
a687999d42 Merge pull request #2014 from annando/1511-gcontaxt-update
Only show accessible contacts (allfriends/common_contacts)
2015-11-06 11:01:28 +01:00
Michael Vogel
0f563525bd Optical adjustments for contacts/set "last_failure" when inaccessible 2015-11-06 09:15:20 +01:00
721e7e410c Merge pull request #2013 from annando/1511-addr2
The address field is now displayed instead of the url - if available
2015-11-06 06:57:06 +01:00
Michael Vogel
f42a3c9bc6 Update the contact table as well. 2015-11-06 01:19:37 +01:00
Michael Vogel
0f41f35041 The contact template now displays the address if available 2015-11-06 00:47:54 +01:00
Michael Vogel
2e81d0a2b3 Fetch the "addr" value whenever it is empty 2015-11-05 10:55:00 +01:00
be067bcf96 Merge pull request #2011 from annando/1511-gcontact-addr
The "addr" field is now in the global contacts as well.
2015-11-05 09:10:25 +01:00
Michael Vogel
d6080f4c76 The "addr" field is now in the global contacts as well. 2015-11-05 08:37:00 +01:00
ff15521e38 Merge pull request #2010 from annando/probeurl-diaspora
Bugfix: Friendica contacts where detected as OStatus contacts
2015-11-05 06:50:23 +01:00
Michael Vogel
a193a482cd Friendica contacts where detected as OStatus contacts when they should be Diaspora contacts 2015-11-05 00:42:38 +01:00