friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
10,653 Commits 2 Branches 63 Tags 237 MiB
Commit Graph

10653 Commits

Author SHA1 Message Date
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
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
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
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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 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
Tobias Diekershoff 1075fa2c38 Merge pull request #2009 from annando/1511-vier-mobile2 
Vier: Mobile mode should be better now
 2015-11-04 06:22:41 +01:00
Michael Vogel 5b2e1188c0 Vier: Network name, "ago" and the quote description are now smaller when mobile. 2015-11-04 00:07:05 +01:00
Michael Vogel 546fd6cbbe Merge remote-tracking branch 'upstream/develop' into 1511-vier-mobile2 2015-11-03 23:56:57 +01:00
Michael Vogel 3b11436b02 Merge pull request #1989 from rabuzarus/allfriends 
template-rework: let common friends and allfriends use viewcontact_te…
 2015-11-03 23:27:24 +01:00
Michael Vogel 451b07cfe7 Mobile should be better now 2015-11-03 23:11:36 +01:00
Michael Vogel eff6f3a57d On small computers the stylesheet changed to mobile by accident. 2015-11-03 19:14:28 +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
Tobias Diekershoff 162931be91 Merge pull request #2006 from annando/1511-vier-mobile 
Vier is now a little bit more mobile ready.
 2015-11-03 07:30:36 +01:00
fabrixxm b10f9fdb04 Merge pull request #2007 from annando/1511-network-timeout 
Bugfix: The timeout value of z_fetch_url couldn't be set manually
 2015-11-03 07:17:13 +01:00
Michael Vogel e3fdb33df0 Vier: Added the credits to the pages without left sidebar 2015-11-03 01:19:22 +01:00
Michael Vogel 6a15dded0e Bugfix: The timeout value of z_fetch_url couldn't be set manually 2015-11-03 00:48:49 +01:00