Commit Graph

  • 3ccff0c77f Merge pull request #2023 from tobiasd/20151107-registertext Michael Vogel 2015-11-07 16:02:26 +01:00
  • 4528529968 Merge pull request #2005 from tobiasd/20151101-dev Michael Vogel 2015-11-07 16:01:46 +01:00
  • 5cebc6d9b1 we found a dev format Tobias Diekershoff 2015-11-07 15:39:55 +01:00
  • b609aca456 Merge pull request #2026 from silke/vagrant-update Tobias Diekershoff 2015-11-07 15:12:09 +01:00
  • a5af773bc8 Configuration for Vagrant running Ubuntu 14.04 Silke Meyer 2015-11-07 14:55:58 +01:00
  • 3fa381cbdf Merge pull request #2024 from annando/1511-api-bugfix Tobias Diekershoff 2015-11-07 14:51:11 +01:00
  • 88e1ac9654 API Bugfix: This fixes the problem that posts to AndStatus appeared as empty posts Michael Vogel 2015-11-07 14:36:00 +01:00
  • 9a1c57f1bc Following n4rky to resolve #1898 Tobias Diekershoff 2015-11-07 13:19:55 +01:00
  • f1a48a81f4 Activate logging in vagrant VM Silke Meyer 2015-11-07 12:21:00 +01:00
  • 0d6ec70a68 Merge pull request #2021 from fabrixxm/php_arrays Silke Meyer 2015-11-07 12:25:51 +01:00
  • 80b62071e1 Use old style array declaration fabrixxm 2015-11-07 12:21:54 +01:00
  • bb5f7c4db7 Merge pull request #2020 from fabrixxm/install_checks Tobias Diekershoff 2015-11-07 11:12:37 +01:00
  • 6befca288f Check for mcrypt_create_iv() for RINO2, update link to cron documentation fabrixxm 2015-11-07 11:03:08 +01:00
  • 4e7bf0028c Merge pull request #2019 from rabuzarus/0611_directory Tobias Diekershoff 2015-11-07 06:54:16 +01:00
  • 16123f5ad5 Check for ImageMagick and for GIF support fabrixxm 2015-11-07 00:22:26 +01:00
  • a1da54834b Merge pull request #2018 from fabrixxm/admin_theme_reload Tobias Diekershoff 2015-11-07 00:09:58 +01:00
  • df36ea0d03 simple photo_menu for directory rabuzarus 2015-11-07 00:08:35 +01:00
  • 5f6ea6357d Add 'Reload active themes' to admin fabrixxm 2015-11-06 23:53:10 +01:00
  • ed03a941ed Merge pull request #2016 from fabrixxm/template_vars_hook Tobias Diekershoff 2015-11-06 20:03:38 +01:00
  • 0aa69f134f Fix template_var hook fabrixxm 2015-11-06 19:52:00 +01:00
  • 1053fe91c8 Merge pull request #2015 from fabrixxm/template_vars_hook Tobias Diekershoff 2015-11-06 19:39:42 +01:00
  • 545a7a80e4 Add 'template_vars' hook fabrixxm 2015-11-06 19:33:14 +01:00
  • a687999d42 Merge pull request #2014 from annando/1511-gcontaxt-update Tobias Diekershoff 2015-11-06 11:01:28 +01:00
  • 0f563525bd Optical adjustments for contacts/set "last_failure" when inaccessible Michael Vogel 2015-11-06 09:15:20 +01:00
  • 721e7e410c Merge pull request #2013 from annando/1511-addr2 Tobias Diekershoff 2015-11-06 06:57:06 +01:00
  • f42a3c9bc6 Update the contact table as well. Michael Vogel 2015-11-06 01:19:37 +01:00
  • 0f41f35041 The contact template now displays the address if available Michael Vogel 2015-11-06 00:47:54 +01:00
  • 2e81d0a2b3 Fetch the "addr" value whenever it is empty Michael Vogel 2015-11-05 10:55:00 +01:00
  • be067bcf96 Merge pull request #2011 from annando/1511-gcontact-addr Tobias Diekershoff 2015-11-05 09:10:25 +01:00
  • d6080f4c76 The "addr" field is now in the global contacts as well. Michael Vogel 2015-11-05 08:37:00 +01:00
  • ff15521e38 Merge pull request #2010 from annando/probeurl-diaspora Tobias Diekershoff 2015-11-05 06:50:23 +01:00
  • a193a482cd Friendica contacts where detected as OStatus contacts when they should be Diaspora contacts Michael Vogel 2015-11-05 00:42:38 +01:00
  • 1075fa2c38 Merge pull request #2009 from annando/1511-vier-mobile2 Tobias Diekershoff 2015-11-04 06:22:41 +01:00
  • 5b2e1188c0 Vier: Network name, "ago" and the quote description are now smaller when mobile. Michael Vogel 2015-11-04 00:07:05 +01:00
  • 546fd6cbbe Merge remote-tracking branch 'upstream/develop' into 1511-vier-mobile2 Michael Vogel 2015-11-03 23:56:57 +01:00
  • 3b11436b02 Merge pull request #1989 from rabuzarus/allfriends Michael Vogel 2015-11-03 23:27:24 +01:00
  • 451b07cfe7 Mobile should be better now Michael Vogel 2015-11-03 23:11:36 +01:00
  • eff6f3a57d On small computers the stylesheet changed to mobile by accident. Michael Vogel 2015-11-03 19:14:28 +01:00
  • a0ae6eb905 template-rework:little cleanup rabuzarus 2015-11-03 14:33:17 +01:00
  • e785759a8b template-rework:make use of get_contact_details_by_url() rabuzarus 2015-11-03 14:31:15 +01:00
  • 162931be91 Merge pull request #2006 from annando/1511-vier-mobile Tobias Diekershoff 2015-11-03 07:30:36 +01:00
  • b10f9fdb04 Merge pull request #2007 from annando/1511-network-timeout fabrixxm 2015-11-03 07:17:13 +01:00
  • e3fdb33df0 Vier: Added the credits to the pages without left sidebar Michael Vogel 2015-11-03 01:19:22 +01:00
  • 6a15dded0e Bugfix: The timeout value of z_fetch_url couldn't be set manually Michael Vogel 2015-11-03 00:48:49 +01:00
  • 1831066259 Vier is now a little bit more mobile ready. Michael Vogel 2015-11-02 23:12:09 +01:00
  • f196389580 Merge develop into allfriends rabuzarus 2015-11-02 14:31:20 +01:00
  • 4525db2c4a Small fix: one "mistpark" left in doc/Settings.md fabrixxm 2015-11-02 09:35:07 +01:00
  • 939de1ec7d Merge pull request #2004 from annando/1511-ostatus-diaspora Tobias Diekershoff 2015-11-01 14:31:55 +01:00
  • 1a42e31718 mark the development version Tobias Diekershoff 2015-11-01 14:26:06 +01:00
  • 709aac0652 Only offer the choice to activate Diaspora and OStatus if the system is ready for it Michael Vogel 2015-11-01 13:55:49 +01:00
  • 288d4e0d7b Merge pull request #2003 from annando/1511-vier-styles Tobias Diekershoff 2015-11-01 10:08:22 +01:00
  • 6a53e3959f Vier: The different styles are now working with the right menubar Michael Vogel 2015-11-01 09:45:02 +01:00
  • 3317d7a288 Merge pull request #2002 from annando/1511-cid Tobias Diekershoff 2015-11-01 09:02:09 +01:00
  • b87d7ef1af Return the contact id at "all_friends" and "common_contacts" Michael Vogel 2015-11-01 08:54:44 +01:00
  • 2f47d63a29 Merge pull request #2000 from tobiasd/20151027-credits Michael Vogel 2015-10-31 22:34:30 +01:00
  • cfc9d2b88f Merge pull request #1998 from annando/1510-network-profile2 Tobias Diekershoff 2015-10-31 19:02:01 +01:00
  • 7d0ea70cc1 Merge pull request #2001 from annando/1510-empty-poco Tobias Diekershoff 2015-10-31 12:48:30 +01:00
  • 0a90f689ac Merge pull request #1999 from rabuzarus/3010_prv_network Michael Vogel 2015-10-31 10:49:01 +01:00
  • 7cf4468353 Bugfix: /poco was always empty Michael Vogel 2015-10-31 10:32:01 +01:00
  • 09ff2f0dd5 Renamed the function Michael Vogel 2015-10-31 00:01:33 +01:00
  • c00847a79d use section_title.tpl for page title Tobias Diekershoff 2015-10-30 18:05:45 +01:00
  • fc37f49f23 network.php: add a descriptive comment rabuzarus 2015-10-30 12:47:48 +01:00
  • 56c9f23e99 prvgroup mentioning in status_editor rabuzarus 2015-10-30 01:59:17 +01:00
  • f3ce812a9e New function for fetching contact data Michael Vogel 2015-10-30 01:30:42 +01:00
  • 44c3c9f569 intro note Tobias Diekershoff 2015-10-29 22:10:24 +01:00
  • 3be34f82ee get special contributors into the credits Tobias Diekershoff 2015-10-29 22:05:48 +01:00
  • f283ae143a Merge pull request #1997 from rabuzarus/2910_vier_fix_forums fabrixxm 2015-10-29 16:02:17 +01:00
  • f0f3360c4b vier: include private forums in forum widget rabuzarus 2015-10-29 15:34:55 +01:00
  • 6799c90012 link the credits page from the help pages Tobias Diekershoff 2015-10-29 07:58:05 +01:00
  • a48156aab6 display names listed in credits.txt from /credits Tobias Diekershoff 2015-10-29 07:13:29 +01:00
  • bc8c6eb455 python script to generate the credits.txt from git log and translator names Tobias Diekershoff 2015-10-29 07:12:50 +01:00
  • dff1a73bd3 basic styling of the credits list Tobias Diekershoff 2015-10-29 07:11:36 +01:00
  • fb4adc83dc Merge pull request #1995 from rabuzarus/2810_fbrowser fabrixxm 2015-10-29 08:41:21 +01:00
  • 6f601bf47d Merge pull request #1996 from annando/1510-profile-network-page Tobias Diekershoff 2015-10-29 08:39:56 +01:00
  • 2e316b5cf2 Show the profile in the network view when viewing single contacts Michael Vogel 2015-10-29 08:10:39 +01:00
  • d2dfe54fc7 Merge pull request #1994 from tobiasd/20151028-issue1974 Michael Vogel 2015-10-28 23:30:16 +01:00
  • e88d9153a1 fbrowser: exclude Contact Photos rabuzarus 2015-10-28 23:22:42 +01:00
  • 8eda86d8bf lower number of postings displayed per page for not logged in users Tobias Diekershoff 2015-10-28 19:01:45 +01:00
  • 2205c372db Merge pull request #1990 from annando/1510-contact-reworked fabrixxm 2015-10-28 12:09:16 +01:00
  • 5a58f55a36 Set the maximum avatar size to 80 pixels Michael Vogel 2015-10-28 00:18:56 +01:00
  • aee4522ad4 The contact page now shows the connection status. Michael Vogel 2015-10-27 23:10:52 +01:00
  • 299c8b83ac template-rework: let common friends and allfriends use viewcontact_template.tpl rabuzarus 2015-10-27 15:27:26 +01:00
  • 367699f785 Merge pull request #1987 from annando/1510-manage-enhancements Tobias Diekershoff 2015-10-27 09:01:35 +01:00
  • 11a7eb8d8f Merge pull request #1985 from annando/1510-vier-optimize-touch Tobias Diekershoff 2015-10-27 08:59:47 +01:00
  • 4079084492 Merge pull request #1975 from rabuzarus/template_rework Tobias Diekershoff 2015-10-27 08:59:03 +01:00
  • 9984856207 Merge pull request #1988 from annando/1510-more-networks fabrixxm 2015-10-27 08:26:34 +01:00
  • 57bbe037a7 New network types NNTP and iCal Michael Vogel 2015-10-27 07:49:02 +01:00
  • 99ee45e627 The username is now a link Michael Vogel 2015-10-26 23:11:42 +01:00
  • 7b1a957474 template-rework: try to fix double entries at match.php rabuzarus 2015-10-26 16:15:08 +01:00
  • 9d720f69aa template-rework: don't show the findpeople_widget on contact edit page rabuzarus 2015-10-26 13:36:01 +01:00
  • ac744b61f9 Some small optical and structural changes to the manage template Michael Vogel 2015-10-26 08:16:37 +01:00
  • a8ef43e80e Merge pull request #1984 from rabuzarus/manage Michael Vogel 2015-10-26 07:52:56 +01:00
  • fdda4be452 manage-selector: use an easier sql querry rabuzarus 2015-10-26 00:19:55 +01:00
  • 4f9ec8efac Vier: The usability with a touch device is improved Michael Vogel 2015-10-25 21:01:39 +01:00
  • 87c559d605 manage-selector: sql - check for same baseurl rabuzarus 2015-10-25 18:04:20 +01:00
  • 4c263aa4ac Merge develop into manage rabuzarus 2015-10-25 16:57:04 +01:00
  • 03ff349a94 Merge pull request #1982 from annando/1510-reduced-profile Tobias Diekershoff 2015-10-25 16:54:24 +01:00
  • bb4efb01a7 Merge pull request #1980 from annando/1510-coord-ostatus Tobias Diekershoff 2015-10-25 16:53:17 +01:00
  • 12d9c46ec5 Merge pull request #1979 from annando/1510-gnusocial Tobias Diekershoff 2015-10-25 16:52:38 +01:00
  • 4e78d439e2 Merge pull request #1978 from annando/1510-bad-servers Tobias Diekershoff 2015-10-25 16:52:10 +01:00