strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
9293 commits 2 branches 55 tags 148 MiB
Commit graph

1386 commits

Author SHA1 Message Date
Michael Vogel 21c63e8b65 Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape 2015-02-09 10:16:48 +01:00
Michael Vogel 842ac46857 Scrape now contains the number of contacts as well. 2015-02-08 23:35:29 +01:00
Michael Vogel 7e9ae24511 Moved several settings from .htconfig.php to the admin settings page. 2015-02-08 20:35:40 +01:00
Michael Vogel 10c7ab76a2 Added thread update for central item storage in the update procedure. 2015-02-08 16:03:23 +01:00
Michael Vogel e02b982f77 Merge remote-tracking branch 'upstream/develop' into 1501-central-item-storage 2015-02-01 13:28:32 +01:00
Michael Vogel e3da549ab5 Reshared diaspora items that aren't on this server are now stored with uid=0 2015-02-01 10:26:35 +01:00
fabrixxm 4cf36ec2cf Update FRIENDICA_VERSION 2015-01-29 09:44:48 +01:00
Michael Vogel 597ef20b71 "about" and "location" is now included in global contacts as well. 2015-01-25 02:29:46 +01:00
Michael Vogel beaca70126 OStatus: Replies now arrive their target. 2015-01-12 00:14:51 +01:00
fabrixxm 418ac91c31 Merge pull request #1274 from annando/issue-1218 
Issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined
 2015-01-09 11:44:38 +01:00
Michael Vogel b36d799044 Fetching "location" and "about" from diaspora. Displaying them on the "display" page. 2015-01-07 01:46:13 +01:00
Michael Vogel 003e87b112 Merge remote-tracking branch 'upstream/develop' into issue-1218 2015-01-04 20:21:49 +01:00
Michael Vogel 11c82816b3 Poco now returns the last update date as well. This date will be stored in the gcontact table. 2015-01-04 19:19:47 +01:00
Michael Vogel cce561708a Replaced $argv and $argc with the $_SERVER array 2015-01-04 13:24:16 +01:00
Michael Vogel a86c143e24 The "scrape" bugfix lead to partly damaged encodings. This is fixed now. 2015-01-04 11:56:41 +01:00
Michael Vogel b5beb4c69a Litte typo ... 2015-01-02 07:50:21 +01:00
Michael Vogel 38a45d325f See issue 1218: generate $argv and $argc from $_SERVER if it wasn't defined. 2015-01-02 00:01:17 +01:00
Fabio Comuni d10c8ddf57 Update version in boot.php 2014-12-26 10:46:10 +01:00
fabrixxm fd61391e3e Merge pull request #1221 from annando/1411-default-value-type 
Fix: "not null" fields were not set
 2014-11-10 09:57:42 +01:00
Michael Vogel 5379e07c4e Setting default values for all database fields. 2014-11-09 13:29:27 +01:00
Michael Vogel 70ba1667e1 It is now possible to define the hostname from the admin page. This should definetely end the problem that the hostname couldn't be detected unter certain conditions. 2014-11-08 00:07:21 +01:00
fabrixxm 86c8362bb8 Bump version to 3.3.1. Add CHANGELOG file 2014-11-06 20:31:27 +01:00
Michael Vogel 691aa17025 fetch further information: it is now possible to define a blacklist for keywords for "fetch further information" 2014-10-30 00:24:23 +01:00
fabrixxm 53f3b8ab53 Merge pull request #1206 from annando/1410-refresh-to-ssl 
Reload a non-ssl-request to a ssl-request. (only when SSL_POLICY_FULL is enabled)
 2014-10-24 10:56:19 +02:00
Michael Vogel 68e75b4623 Reload a non-ssl-request to a ssl-request. (only when SSL_POLICY_FULL is enabled) 2014-10-24 00:52:29 +02:00
Fabrixxm 63168905ec Fix #1190 2014-10-22 09:04:32 +02:00
Fabrixxm c9667bbd69 add codename to useragent string 2014-10-06 10:06:53 +02:00
Fabrixxm e2dc4f922c Friendica 'Ginger' 3.3 2014-10-06 08:56:55 +02:00
Fabrixxm 70659b67d2 comment out multidomain config support 2014-10-01 09:04:06 +02:00
Tobias Diekershoff 81949173c6 RC for 3.3 2014-09-07 20:41:33 +02:00
Tobias Diekershoff e767e2d750 Merge pull request #1131 from fabrixxm/master 
Bug fixes!
 2014-09-07 17:52:52 +02:00
fabrixxm 6db73c0b6d fix update routine to support update from 3.2 
disable PDO support
 2014-09-07 17:28:38 +02:00
Tobias Diekershoff 04da5ed3bb revup after the Hackathon in Berlin 2014-09-07 15:36:23 +02:00
fabrixxm 21b1e09fad Merge remote-tracking branch 'friendica/master' into mail_notification_cleanup 2014-09-07 14:28:03 +02:00
fabrixxm a8c90155f8 db update mail via notification() 
remove last template
 2014-09-07 14:23:03 +02:00
fabrixxm 36a67158d2 Merge pull request #1119 from annando/1409-issue-881 
The useragent string doesn't contains of the words "Mozilla" anymore
 2014-09-07 11:41:51 +02:00
Michael Vogel 7af5c3c560 The useragent string doesn't contains of the words "Mozilla" anymore - but the name "Friendica" and the base url 2014-09-07 10:47:37 +02:00
Michael Vogel a333036f00 API: The command "users/search" is now supported. 2014-09-07 07:32:09 +02:00
Michael Vogel e21bcb82d2 Enhance the database structure checks when they failed. 2014-09-04 09:26:56 +02:00
Michael Vogel 24b3befc4d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	update.php
 2014-09-04 02:29:12 +02:00
Michael Vogel 7eeb320085 It is now possible to ignore threads. 2014-09-04 00:58:52 +02:00
friendica 7673579afc Merge https://github.com/friendica/friendica into pull 2014-09-01 21:46:40 -07:00
friendica 9464af0eef resize the item guid field for protocol compatibility - it's getting truncated. 2014-09-01 21:45:34 -07:00
fabrixxm 070581f793 Merge pull request #1086 from annando/master 
Bugfix: Connecting with other users works again/Some more profile optimizing
 2014-08-28 09:16:26 +02:00
Michael Vogel 4bdd905b3e Only show foreign items if the profile of the user isn't hidden. Show the user's theme - not the theme of the viewed profile. 2014-08-28 01:06:41 +02:00
friendica 03245e4a83 increase guid.guid field length for redmatrix-over-diaspora communications 2014-08-26 19:18:19 -07:00
Michael Vogel 316f0a75cd Showing the network name on the display page. 2014-08-25 16:17:49 +02:00
Michael Vogel dd511ac70a The "display" page now shows the current author profile with a "connect" link (if there is no current connection) 2014-08-25 14:09:56 +02:00
Michael Vogel 53dcecd596 If a user is already connected to another user, then don't show the "connect" link on his profile. 2014-08-21 00:57:54 +02:00
Tobias Diekershoff 1adb31e0f0 revup and regenerating the message.po 2014-08-10 15:15:31 +02:00