]>
git.mxchange.org Git - friendica.git/log
Silke Meyer [Sat, 7 Nov 2015 11:21:00 +0000 (12:21 +0100)]
Activate logging in vagrant VM
Silke Meyer [Sat, 7 Nov 2015 11:25:51 +0000 (12:25 +0100)]
Merge pull request #2021 from fabrixxm/php_arrays
Use old style array declaration
fabrixxm [Sat, 7 Nov 2015 11:21:54 +0000 (12:21 +0100)]
Use old style array declaration
Tobias Diekershoff [Sat, 7 Nov 2015 10:12:37 +0000 (11:12 +0100)]
Merge pull request #2020 from fabrixxm/install_checks
Install checks
fabrixxm [Sat, 7 Nov 2015 10:03:08 +0000 (11:03 +0100)]
Check for mcrypt_create_iv() for RINO2, update link to cron documentation
Tobias Diekershoff [Sat, 7 Nov 2015 05:54:16 +0000 (06:54 +0100)]
Merge pull request #2019 from rabuzarus/0611_directory
simple photo_menu for directory
fabrixxm [Fri, 6 Nov 2015 23:22:26 +0000 (00:22 +0100)]
Check for ImageMagick and for GIF support
Tobias Diekershoff [Fri, 6 Nov 2015 23:09:58 +0000 (00:09 +0100)]
Merge pull request #2018 from fabrixxm/admin_theme_reload
Add 'Reload active themes' to admin
rabuzarus [Fri, 6 Nov 2015 23:08:35 +0000 (00:08 +0100)]
simple photo_menu for directory
fabrixxm [Fri, 6 Nov 2015 22:53:10 +0000 (23:53 +0100)]
Add 'Reload active themes' to admin
It will call 'uninstall()' and 'install()' on every active themes
Tobias Diekershoff [Fri, 6 Nov 2015 19:03:38 +0000 (20:03 +0100)]
Merge pull request #2016 from fabrixxm/template_vars_hook
Fix template_var hook
fabrixxm [Fri, 6 Nov 2015 18:52:00 +0000 (19:52 +0100)]
Fix template_var hook
move it to smarty3 replate_macro, pass the theme name in $b
Tobias Diekershoff [Fri, 6 Nov 2015 18:39:42 +0000 (19:39 +0100)]
Merge pull request #2015 from fabrixxm/template_vars_hook
Add 'template_vars' hook
fabrixxm [Fri, 6 Nov 2015 18:33:14 +0000 (19:33 +0100)]
Add 'template_vars' hook
Tobias Diekershoff [Fri, 6 Nov 2015 10:01:28 +0000 (11:01 +0100)]
Merge pull request #2014 from annando/1511-gcontaxt-update
Only show accessible contacts (allfriends/common_contacts)
Michael Vogel [Fri, 6 Nov 2015 08:15:20 +0000 (09:15 +0100)]
Optical adjustments for contacts/set "last_failure" when inaccessible
Tobias Diekershoff [Fri, 6 Nov 2015 05:57:06 +0000 (06:57 +0100)]
Merge pull request #2013 from annando/1511-addr2
The address field is now displayed instead of the url - if available
Michael Vogel [Fri, 6 Nov 2015 00:19:37 +0000 (01:19 +0100)]
Update the contact table as well.
Michael Vogel [Thu, 5 Nov 2015 23:47:54 +0000 (00:47 +0100)]
The contact template now displays the address if available
Michael Vogel [Thu, 5 Nov 2015 09:55:00 +0000 (10:55 +0100)]
Fetch the "addr" value whenever it is empty
Tobias Diekershoff [Thu, 5 Nov 2015 08:10:25 +0000 (09:10 +0100)]
Merge pull request #2011 from annando/1511-gcontact-addr
The "addr" field is now in the global contacts as well.
Michael Vogel [Thu, 5 Nov 2015 07:37:00 +0000 (08:37 +0100)]
The "addr" field is now in the global contacts as well.
Tobias Diekershoff [Thu, 5 Nov 2015 05:50:23 +0000 (06:50 +0100)]
Merge pull request #2010 from annando/probeurl-diaspora
Bugfix: Friendica contacts where detected as OStatus contacts
Michael Vogel [Wed, 4 Nov 2015 23:42:38 +0000 (00:42 +0100)]
Friendica contacts where detected as OStatus contacts when they should be Diaspora contacts
Tobias Diekershoff [Wed, 4 Nov 2015 05:22:41 +0000 (06:22 +0100)]
Merge pull request #2009 from annando/1511-vier-mobile2
Vier: Mobile mode should be better now
Michael Vogel [Tue, 3 Nov 2015 23:07:05 +0000 (00:07 +0100)]
Vier: Network name, "ago" and the quote description are now smaller when mobile.
Michael Vogel [Tue, 3 Nov 2015 22:56:57 +0000 (23:56 +0100)]
Merge remote-tracking branch 'upstream/develop' into 1511-vier-mobile2
Michael Vogel [Tue, 3 Nov 2015 22:27:24 +0000 (23:27 +0100)]
Merge pull request #1989 from rabuzarus/allfriends
template-rework: let common friends and allfriends use viewcontact_te…
Michael Vogel [Tue, 3 Nov 2015 22:11:36 +0000 (23:11 +0100)]
Mobile should be better now
Michael Vogel [Tue, 3 Nov 2015 18:14:28 +0000 (19:14 +0100)]
On small computers the stylesheet changed to mobile by accident.
rabuzarus [Tue, 3 Nov 2015 13:33:17 +0000 (14:33 +0100)]
template-rework:little cleanup
rabuzarus [Tue, 3 Nov 2015 13:31:15 +0000 (14:31 +0100)]
template-rework:make use of get_contact_details_by_url()
Tobias Diekershoff [Tue, 3 Nov 2015 06:30:36 +0000 (07:30 +0100)]
Merge pull request #2006 from annando/1511-vier-mobile
Vier is now a little bit more mobile ready.
fabrixxm [Tue, 3 Nov 2015 06:17:13 +0000 (07:17 +0100)]
Merge pull request #2007 from annando/1511-network-timeout
Bugfix: The timeout value of z_fetch_url couldn't be set manually
Michael Vogel [Tue, 3 Nov 2015 00:19:22 +0000 (01:19 +0100)]
Vier: Added the credits to the pages without left sidebar
Michael Vogel [Mon, 2 Nov 2015 23:48:49 +0000 (00:48 +0100)]
Bugfix: The timeout value of z_fetch_url couldn't be set manually
Michael Vogel [Mon, 2 Nov 2015 22:12:09 +0000 (23:12 +0100)]
Vier is now a little bit more mobile ready.
rabuzarus [Mon, 2 Nov 2015 13:31:20 +0000 (14:31 +0100)]
Merge develop into allfriends
fabrixxm [Mon, 2 Nov 2015 08:35:07 +0000 (09:35 +0100)]
Small fix: one "mistpark" left in doc/Settings.md
Tobias Diekershoff [Sun, 1 Nov 2015 13:31:55 +0000 (14:31 +0100)]
Merge pull request #2004 from annando/1511-ostatus-diaspora
Check if Diaspora and OStatus can be enabled at all
Michael Vogel [Sun, 1 Nov 2015 12:55:49 +0000 (13:55 +0100)]
Only offer the choice to activate Diaspora and OStatus if the system is ready for it
Tobias Diekershoff [Sun, 1 Nov 2015 09:08:22 +0000 (10:08 +0100)]
Merge pull request #2003 from annando/1511-vier-styles
Vier: The different styles are now working with the right menubar
Michael Vogel [Sun, 1 Nov 2015 08:45:02 +0000 (09:45 +0100)]
Vier: The different styles are now working with the right menubar
Tobias Diekershoff [Sun, 1 Nov 2015 08:02:09 +0000 (09:02 +0100)]
Merge pull request #2002 from annando/1511-cid
Return the contact id at "all_friends" and "common_contacts"
Michael Vogel [Sun, 1 Nov 2015 07:54:44 +0000 (08:54 +0100)]
Return the contact id at "all_friends" and "common_contacts"
Michael Vogel [Sat, 31 Oct 2015 21:34:30 +0000 (22:34 +0100)]
Merge pull request #2000 from tobiasd/
20151027-credits
a credits page
Tobias Diekershoff [Sat, 31 Oct 2015 18:02:01 +0000 (19:02 +0100)]
Merge pull request #1998 from annando/1510-network-profile2
New function for fetching contact data
Tobias Diekershoff [Sat, 31 Oct 2015 11:48:30 +0000 (12:48 +0100)]
Merge pull request #2001 from annando/1510-empty-poco
Bugfix: /poco was always empty
Michael Vogel [Sat, 31 Oct 2015 09:49:01 +0000 (10:49 +0100)]
Merge pull request #1999 from rabuzarus/3010_prv_network
prvgroup mentioning in status_editor
Michael Vogel [Sat, 31 Oct 2015 09:32:01 +0000 (10:32 +0100)]
Bugfix: /poco was always empty
Michael Vogel [Fri, 30 Oct 2015 23:01:33 +0000 (00:01 +0100)]
Renamed the function
Tobias Diekershoff [Fri, 30 Oct 2015 17:05:45 +0000 (18:05 +0100)]
use section_title.tpl for page title
rabuzarus [Fri, 30 Oct 2015 11:47:48 +0000 (12:47 +0100)]
network.php: add a descriptive comment
rabuzarus [Fri, 30 Oct 2015 00:59:17 +0000 (01:59 +0100)]
prvgroup mentioning in status_editor
Michael Vogel [Fri, 30 Oct 2015 00:30:42 +0000 (01:30 +0100)]
New function for fetching contact data
Tobias Diekershoff [Thu, 29 Oct 2015 21:10:24 +0000 (22:10 +0100)]
intro note
Tobias Diekershoff [Thu, 29 Oct 2015 21:05:48 +0000 (22:05 +0100)]
get special contributors into the credits
fabrixxm [Thu, 29 Oct 2015 15:02:17 +0000 (16:02 +0100)]
Merge pull request #1997 from rabuzarus/2910_vier_fix_forums
vier: include private forums in forum widget
rabuzarus [Thu, 29 Oct 2015 14:34:55 +0000 (15:34 +0100)]
vier: include private forums in forum widget
Tobias Diekershoff [Thu, 29 Oct 2015 06:58:05 +0000 (07:58 +0100)]
link the credits page from the help pages
Tobias Diekershoff [Thu, 29 Oct 2015 06:13:29 +0000 (07:13 +0100)]
display names listed in credits.txt from /credits
Tobias Diekershoff [Thu, 29 Oct 2015 06:12:50 +0000 (07:12 +0100)]
python script to generate the credits.txt from git log and translator names
Tobias Diekershoff [Thu, 29 Oct 2015 06:11:36 +0000 (07:11 +0100)]
basic styling of the credits list
fabrixxm [Thu, 29 Oct 2015 07:41:21 +0000 (08:41 +0100)]
Merge pull request #1995 from rabuzarus/2810_fbrowser
fbrowser: exclude Contact Photos
Tobias Diekershoff [Thu, 29 Oct 2015 07:39:56 +0000 (08:39 +0100)]
Merge pull request #1996 from annando/1510-profile-network-page
Show the profile in the network view when viewing single contacts
Michael Vogel [Thu, 29 Oct 2015 07:10:39 +0000 (08:10 +0100)]
Show the profile in the network view when viewing single contacts
Michael Vogel [Wed, 28 Oct 2015 22:30:16 +0000 (23:30 +0100)]
Merge pull request #1994 from tobiasd/
20151028-issue1974
lower number of postings displayed per page for not logged in users
rabuzarus [Wed, 28 Oct 2015 22:22:42 +0000 (23:22 +0100)]
fbrowser: exclude Contact Photos
Tobias Diekershoff [Wed, 28 Oct 2015 18:01:45 +0000 (19:01 +0100)]
lower number of postings displayed per page for not logged in users
fabrixxm [Wed, 28 Oct 2015 11:09:16 +0000 (12:09 +0100)]
Merge pull request #1990 from annando/1510-contact-reworked
The contact search page now shows the connection status
Michael Vogel [Tue, 27 Oct 2015 23:18:56 +0000 (00:18 +0100)]
Set the maximum avatar size to 80 pixels
Michael Vogel [Tue, 27 Oct 2015 22:10:52 +0000 (23:10 +0100)]
The contact page now shows the connection status.
rabuzarus [Tue, 27 Oct 2015 14:27:26 +0000 (15:27 +0100)]
template-rework: let common friends and allfriends use viewcontact_template.tpl
Tobias Diekershoff [Tue, 27 Oct 2015 08:01:35 +0000 (09:01 +0100)]
Merge pull request #1987 from annando/1510-manage-enhancements
Some small optical and structural changes to the manage template
Tobias Diekershoff [Tue, 27 Oct 2015 07:59:47 +0000 (08:59 +0100)]
Merge pull request #1985 from annando/1510-vier-optimize-touch
Vier: The usability with a touch device is improved
Tobias Diekershoff [Tue, 27 Oct 2015 07:59:03 +0000 (08:59 +0100)]
Merge pull request #1975 from rabuzarus/template_rework
Template rework for contact related pages
fabrixxm [Tue, 27 Oct 2015 07:26:34 +0000 (08:26 +0100)]
Merge pull request #1988 from annando/1510-more-networks
New network types NNTP and iCal
Michael Vogel [Tue, 27 Oct 2015 06:49:02 +0000 (07:49 +0100)]
New network types NNTP and iCal
Michael Vogel [Mon, 26 Oct 2015 22:11:42 +0000 (23:11 +0100)]
The username is now a link
rabuzarus [Mon, 26 Oct 2015 15:15:08 +0000 (16:15 +0100)]
template-rework: try to fix double entries at match.php
rabuzarus [Mon, 26 Oct 2015 12:36:01 +0000 (13:36 +0100)]
template-rework: don't show the findpeople_widget on contact edit page
Michael Vogel [Mon, 26 Oct 2015 07:16:37 +0000 (08:16 +0100)]
Some small optical and structural changes to the manage template
Michael Vogel [Mon, 26 Oct 2015 06:52:56 +0000 (07:52 +0100)]
Merge pull request #1984 from rabuzarus/manage
identity selector use now the profile pics
rabuzarus [Sun, 25 Oct 2015 23:19:55 +0000 (00:19 +0100)]
manage-selector: use an easier sql querry
Michael Vogel [Sun, 25 Oct 2015 20:01:39 +0000 (21:01 +0100)]
Vier: The usability with a touch device is improved
rabuzarus [Sun, 25 Oct 2015 17:04:20 +0000 (18:04 +0100)]
manage-selector: sql - check for same baseurl
rabuzarus [Sun, 25 Oct 2015 15:57:04 +0000 (16:57 +0100)]
Merge develop into manage
Conflicts:
view/global.css
Tobias Diekershoff [Sun, 25 Oct 2015 15:54:24 +0000 (16:54 +0100)]
Merge pull request #1982 from annando/1510-reduced-profile
Profile data are now reduced to only the most important fields
Tobias Diekershoff [Sun, 25 Oct 2015 15:53:17 +0000 (16:53 +0100)]
Merge pull request #1980 from annando/1510-coord-ostatus
OStatus: send the coordinates in an additional field
Tobias Diekershoff [Sun, 25 Oct 2015 15:52:38 +0000 (16:52 +0100)]
Merge pull request #1979 from annando/1510-gnusocial
Statusnet is now GNU Social
Tobias Diekershoff [Sun, 25 Oct 2015 15:52:10 +0000 (16:52 +0100)]
Merge pull request #1978 from annando/1510-bad-servers
Workaround for bad configured servers
Tobias Diekershoff [Sun, 25 Oct 2015 15:51:36 +0000 (16:51 +0100)]
Merge pull request #1983 from annando/1510-ejabberd-auth
Bugfix: Authorization at ejabberd only worked for uid=1
rabuzarus [Sun, 25 Oct 2015 15:49:45 +0000 (16:49 +0100)]
manage-selector: some cleanup and css work
Michael Vogel [Sun, 25 Oct 2015 13:59:39 +0000 (14:59 +0100)]
Merge pull request #1981 from rabuzarus/poke
some work on poke template
rabuzarus [Sun, 25 Oct 2015 13:40:56 +0000 (14:40 +0100)]
poke template: make use of global.css
rabuzarus [Sun, 25 Oct 2015 13:00:08 +0000 (14:00 +0100)]
some inital work to have profile pics on manage page
Michael Vogel [Sun, 25 Oct 2015 09:17:23 +0000 (10:17 +0100)]
Bugfix: Authorization at ejabberd only worked for uid=1
Michael Vogel [Sun, 25 Oct 2015 08:44:12 +0000 (09:44 +0100)]
Merge pull request #1977 from rabuzarus/crepair
move html from crepair.php to template
Michael Vogel [Sun, 25 Oct 2015 08:42:48 +0000 (09:42 +0100)]
Merge pull request #1976 from rabuzarus/tabs-id
tabs have now an ID
Michael Vogel [Sun, 25 Oct 2015 08:15:36 +0000 (09:15 +0100)]
Profile data are now reduced to only the most important fields
projects / friendica.git / log