Commit graph

1677 commits

Author SHA1 Message Date
Tobias Diekershoff
598a9f76a6 Merge pull request #2658 from annando/1607-maxload
Central Backend/Frontend detection when checking for overload
2016-07-02 21:52:48 +02:00
Michael Vogel
e4c6cfd2d8 Moves the function "is_result" from dba to dbm. 2016-07-02 14:00:42 +02:00
Michael Vogel
91e20f2f9b Remove unused function 2016-07-02 13:42:42 +02:00
Michael Vogel
7d531afd00 Merge branch 'rewrites/is_filled_array_introduced' of git://github.com/Quix0r/friendica into Quix0r-rewrites/is_filled_array_introduced
Conflicts:
	boot.php
2016-07-02 13:38:23 +02:00
Michael Vogel
b3c8ff836d Backend/Frontend detection when checking for overload 2016-07-02 08:54:57 +02:00
Michael Vogel
c7373dcec4 author-id/owner-id: Post update function/added database documentation 2016-06-23 21:15:54 +02:00
Michael Vogel
0e35427dfc New fields "author-id" and "owner-id" in the item table 2016-06-15 21:20:55 +02:00
fabrixxm
0f8148a4cb Merge pull request #2353 from shtrom/issue757-https-reverse-proxy-headers-on-develop
Enable SSL on standard and well-known HTTP headers
2016-06-10 08:36:11 +02:00
rabuzarus
15959d7767 Renamed "Nickname or Email address:" in "Nickname or Email" 2016-06-09 13:12:39 +02:00
Michael Vogel
fc66a86dc5 Some optimized sql queries 2016-06-06 22:57:27 +02:00
Michael Vogel
ea3a6ec6eb Some more cleanup and code removal. 2016-06-05 20:01:38 +02:00
Michael Vogel
22676f7e21 Issue 2063: Define the constant SIGTERM if not defined 2016-05-22 12:31:32 +02:00
rabuzarus
d454905d3c infinite_scroll: move js from index.php to main.js 2016-05-11 01:52:05 +02:00
Michael Vogel
017bfe17f8 Speeding up the gcontact search 2016-04-17 13:46:49 +02:00
Michael Vogel
9f57425d08 Post update ist now done. 2016-04-03 16:36:05 +02:00
Michael Vogel
beb1e04069 New field in item table ("shadow") that indicates if there is a shadow entry 2016-04-03 13:48:31 +02:00
Roland Haeder
9cfc249b12
Moved is_filled_array() to both dba classes and named it is_result().
Please see ticket #2390 for full discussion.

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-12 18:54:55 +01:00
Roland Haeder
c60605ce0c
Merge branch 'develop' of github.com:friendica/friendica into rhaeder-develop 2016-03-12 18:50:14 +01:00
Michael Vogel
3189f0e23c Another fix for "goaway". Hopefully now finale. 2016-03-11 20:43:31 +01:00
Michael Vogel
c30b369a1a Added documentation 2016-03-08 22:42:37 +01:00
Michael Vogel
65d6d45f8c Changed parameter order 2016-03-08 22:28:49 +01:00
Michael Vogel
beb2346cfc The function to check for maxload and the lockfile is centralized 2016-03-08 20:28:09 +01:00
Michael Vogel
4bd1061a09 Only import OStatus threads if we follow the thread starter 2016-03-06 14:53:30 +01:00
Roland Haeder
08630ca6f8
Merge branch 'rewrites/is_filled_array_introduced' into rhaeder-develop 2016-03-04 22:53:42 +01:00
Roland Haeder
b56a9bfacc
Fixes E_WARNING from foreach() because count() seem to return TRUE even when $r is no array ?!
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-04 22:53:22 +01:00
Roland Haeder
5a439a31f3
Fixes E_WARNING from foreach() because count() seem to return TRUE even when $r is no array ?!
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-04 22:46:30 +01:00
Roland Haeder
4ec377008d Introduced is_filled_array() + added some missing array initialization
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 18:31:49 +01:00
Roland Haeder
858438daec
More calls replaced with is_filled_array(), ticket #2390
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 16:04:18 +01:00
fabrixxm
04ccd9a776 Merge pull request #2388 from Quix0r/fixes/prevent-e_notice_boot_php
Prevent some E_NOTICE
2016-03-01 15:50:20 +01:00
Roland Haeder
aa548be3b9
Introduced is_filled_array() + added some missing array initialization
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:33:54 +01:00
Roland Haeder
f10d2afca0
Prevent some E_NOTICE in boot.php
Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:32:19 +01:00
Roland Haeder
04a7d6384e
No need to set $a->theme_info = array() everywhere if you can define it in App
itself.

Signed-off-by: Roland Haeder <roland@mxchange.org>
2016-03-01 14:27:38 +01:00
Michael Vogel
7d4c99ebbc "get_baseurl" and "z_root" are disappearing ... 2016-02-17 23:47:32 +01:00
Michael Vogel
c770b00d6d Merge remote-tracking branch 'upstream/develop' into 1602-mixed-content 2016-02-17 12:18:46 +01:00
Michael Vogel
8af8567567 Some more ... 2016-02-17 12:18:36 +01:00
Michael Vogel
c5b724828a Just some more removed baseurls ... 2016-02-17 08:08:28 +01:00
Michael Vogel
f7537c9e90 Remove the baseurl where possible to avoid mixed content 2016-02-17 00:01:24 +01:00
Michael Vogel
ade5ef7065 Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie 2016-02-16 07:58:01 +01:00
Michael Vogel
88018b6e73 Merge remote-tracking branch 'upstream/develop' into 1602-remove-simplepie 2016-02-14 20:57:57 +01:00
Michael Vogel
b0548018d8 Simplepie is removed since we don't use it anymore 2016-02-14 19:50:59 +01:00
Olivier Mehani
e5c7a0cf93 Enable SSL on standard and well-known HTTP headers
Look for the `Forwarded` header with `proto=https`, as specified
in RFC7239 (strictly expecting no whitespace around the = sign).
This also add similar support for `X-Forwarded-Proto: https`,
`Front-End-Https: on` and `X-Forwarded-Ssl: on` (all case-sensitive).

Also add some documentation about this, and an NginX configuration
example, in INSTALL.txt

This should fix #757.

Signed-off-by: Olivier Mehani <shtrom+friendica@ssji.net>
2016-02-14 13:28:59 +11:00
Michael Vogel
9261154eab Merge remote-tracking branch 'upstream/develop' into 1602-gcontact-cleanup 2016-02-13 20:12:31 +01:00
Michael Vogel
2ca6cdf6b6 Improvements how gcontact entries are updated 2016-02-13 12:26:58 +01:00
Fabrixxm
c6514d58db add composer-derived autoloader 2016-02-09 11:07:37 +01:00
Michael Vogel
4d33441c2e DB Version was forgotten ... 2016-01-29 03:51:12 +01:00
Michael Vogel
62de6be495 Switched to static methods for DFRN 2016-01-25 15:20:58 +01:00
Michael Vogel
5769c08cbc This line vanished accidentally ... 2016-01-16 09:16:51 +01:00
Michael Vogel
571d1544e4 I guess it is enough to set a variable to zero once ... 2016-01-16 08:58:22 +01:00
Michael Vogel
092c2e5433 Removed some test code 2016-01-15 23:32:13 +01:00
Michael Vogel
90a8d6f0f5 Several performance improvements 2016-01-15 23:27:25 +01:00
Michael Vogel
d5e1f33506 OEmbed and parse_url are now cached in dedicated tables 2016-01-14 23:59:51 +01:00
Michael Vogel
c4ba035ee3 Add some analysing stuff, rendered value is written now more often 2016-01-14 21:56:37 +01:00
Michael Vogel
75e2ec01fe The gcontact will now be connected to the items 2016-01-05 15:34:27 +01:00
fabrixxm
cf86162a08 Merge pull request #2214 from rabuzarus/2612_db_docu
add db documentation to the help pages
2015-12-28 10:22:33 +01:00
rabuzarus
038611bcb4 add documentation 2015-12-28 03:17:55 +01:00
fabrixxm
44afff9514 Merge pull request #2198 from rabuzarus/2312_code_cleanup
boot.php - code cleanup + doxygen
2015-12-27 18:20:48 +01:00
Tobias Diekershoff
8d8dc2d060 Merge pull request #2197 from annando/1512-ostatus-comment
Reworked delivery and notifier process - changed OStatus behaviour
2015-12-27 15:58:32 +01:00
rabuzarus
7530c950e3 help - make use of subfolders 2015-12-26 16:06:38 +01:00
rabuzarus
8e83e423f4 boot.php - doxygen - organize constants in groups 2015-12-25 20:58:26 +01:00
rabuzarus
64989781ff add custom tag @hooks to boot.php & identity.php 2015-12-25 18:36:13 +01:00
rabuzarus
e42bbcd6c4 boot.php - small clean up 2015-12-24 11:58:42 +01:00
rabuzarus
40b0d383d5 boot.php - code cleanup + doxygen 2015-12-24 01:31:17 +01:00
Fabrixxm
abe0d22784 Update codename 2015-12-22 16:43:07 +01:00
Michael Vogel
307beb47fd Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-comment
Conflicts:
	include/ostatus.php
2015-12-22 11:25:37 +01:00
Fabrixxm
71255d04a2 Friendica 3.5-dev 2015-12-22 10:52:00 +01:00
Fabrixxm
21f044e305 Friendica 3.4.3 2015-12-22 10:45:43 +01:00
Michael Vogel
ca4be3ded3 Don't generate a guid shorter than 13 characters 2015-12-16 10:47:26 +01:00
Michael Vogel
6e03477598 Sometimes the function "sys_getloadavg" doesn't return an array. This is a workaround. 2015-12-15 23:26:58 +01:00
Michael Vogel
57576e09ed Avoid problems with wrong configured server variables 2015-12-08 19:53:01 +01:00
Michael Vogel
d7fc8d7c12 Add an additional way to fetch the basepath (See pull request 2161) 2015-12-08 08:17:29 +01:00
fabrixxm
29e9a7947e Update FRIENDICA_VERSION 2015-12-07 23:24:55 +01:00
Michael Vogel
f406e5ddbd Issue 1921: Disable the auto update 2015-12-06 00:18:59 +01:00
Tobias Diekershoff
51d392b97f add the module to the page title 2015-12-01 14:19:06 +01:00
Michael Vogel
e43c7a4447 Merge pull request #2061 from rabuzarus/0711_forumlist
move forumlist addon to core
2015-11-17 08:46:15 +01:00
rabuzarus
902735f6d4 forumlist: dbupdate 2015-11-11 23:39:14 +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
Michael Vogel
d6080f4c76 The "addr" field is now in the global contacts as well. 2015-11-05 08:37:00 +01:00
Tobias Diekershoff
1a42e31718 mark the development version 2015-11-01 14:26:06 +01:00
Michael Vogel
57bbe037a7 New network types NNTP and iCal 2015-10-27 07:49:02 +01:00
rabuzarus
649578ae33 Merge develop-new into event-attendance-new
Conflicts:
	include/conversation.php
2015-10-11 19:39:55 +02:00
Michael Vogel
bb0dff2c75 Improved contact menu 2015-10-10 16:23:20 +02:00
Michael Vogel
68a6f0298e The events moved from the profile to the navigation bar - for supported themes 2015-09-30 18:50:44 +02:00
rabuzarus
7cb4ea52fd port of the event attendance feature of red matrix with example implementation for vier theme. 2015-09-30 16:58:02 +02:00
rabuzarus
0077494396 make event confirmation work 2015-09-30 14:35:17 +02:00
rabuzarus
37fccee503 first work for consensus 2015-09-30 14:34:10 +02:00
Michael Vogel
5d5d85eb4a Merge remote-tracking branch 'upstream/develop' into 1509-worker 2015-09-29 10:25:59 +02:00
Fabrixxm
2376cf143c Bump Friendica version 2015-09-29 09:25:59 +02:00
Michael Vogel
a9fdba638f Avoiding errors when checking for the lockpath 2015-09-19 11:30:19 +02:00
Michael Vogel
3ace2136f0 Checking includes for valid paths 2015-09-13 18:47:10 +02:00
Michael Vogel
0a2c161230 Fork as many processes as possible from the start on. 2015-09-12 17:51:27 +02:00
Michael Vogel
ce9b4e868b Database update for worker 2015-09-11 21:56:37 +02:00
Michael Vogel
d3a6ebfe7e The worker is now working 2015-09-10 23:10:31 +02:00
Michael Vogel
17b1d45968 Worker: New method for running background processes 2015-09-09 22:42:31 +02:00
Michael Vogel
b52bc71c6c Now you can define the duration of the cache entries. 2015-08-24 17:24:14 +02:00
Michael Vogel
123ad84689 Make the hardcoded path to dir.friendica.com configurable 2015-08-23 11:05:10 +02:00
Michael Vogel
59b2891737 The temp path now contains the host name. That should help with servers with multiple installations 2015-08-11 23:26:00 +02:00
Michael Vogel
6ab304b564 Bugfix: Fetching data from noscrape had several issues 2015-07-30 16:30:18 +02:00
root
54a5a80b24 Poco: New fields for last contact and last failure of a contact. 2015-07-17 01:08:28 +02:00
Michael Vogel
05f8abcfa6 OStatus: Handling of unsupported verbs 2015-07-15 18:27:44 +02:00
Fabrixxm
c03c06cf30 Update version 2015-07-06 12:49:43 +02:00
rabuzarus
a0b522c3be fix toggle mobile/desktop view 2015-07-02 02:55:03 +02:00
rabuzarus
7c3af0d3ed fix for mobile-view on system pages 2015-07-02 02:15:36 +02:00
rabuzarus
92a7a62608 fix mobile-view 2015-07-01 16:22:08 +02:00
rabuzarus
4463ae11d8 change profile_url in profile_uid 2015-06-28 13:32:03 +02:00
rabuzarus
373bb0822b get the themes settings of foreign profiles 2015-06-27 14:10:43 +02:00
rabuzarus
787604026f move some identity based functions to identity.php 2015-06-26 18:57:20 +02:00
fabrixxm
d2a593b4a0 Merge pull request #1693 from rabuzarus/events-reminder
use title in events-reminder
2015-06-25 15:06:55 +02:00
rabuzarus
b6b000dd59 delete $md (event-links) because event ID is used 2015-06-25 14:21:12 +02:00
rabuzarus
bc2117c68a one whitespace 2015-06-25 13:50:48 +02:00
Michael Vogel
e9542a8d17 OStatus: Support for events and questions 2015-06-21 22:36:24 +02:00
Michael Vogel
c8430f4c44 Moved all OStatus code in a single file. 2015-06-20 14:40:30 +02:00
Michael Vogel
c89c0916e2 Better detection for the mobile client to avoid "{0}" in notifications. 2015-06-13 20:23:26 +02:00
rabuzarus
5f088954be make full title without dots 2015-06-11 00:43:34 +02:00
rabuzarus
66a51f37b2 use title in events reminder not description 2015-06-09 14:26:47 +02:00
Michael Vogel
bea70296bf Fixes slow performance after one of the last pull requests. 2015-06-02 22:07:39 +02:00
Michael Vogel
d42cea51a2 The item id is now stored in every notification as well 2015-04-16 07:18:06 +02:00
Michael Vogel
9a35e861ce New field in the contact table to better detect "dead profiles" 2015-04-12 11:40:38 +02:00
Michael Vogel
98bf8d85fa The "fastlane" can be removed there. 2015-04-09 19:35:17 +02:00
Michael Vogel
015ebd7d1b "fastlane" should now work with remote adding as well. 2015-04-09 00:33:45 +02:00
Michael Vogel
1cacf64724 Merge pull request #1469 from fabrixxm/changelog
Update codename and CHANGELOG
2015-04-02 23:14:40 +02:00
fabrixxm
f93e9751b8 Update codename and CHANGELOG 2015-04-02 22:05:52 +02:00
Michael Vogel
97244fa487 Now past events aren't shown at any circumstance. 2015-04-01 23:11:18 +02:00
Michael Vogel
25299f0604 Events from the past aren't shown anymore (hopefully) 2015-04-01 22:25:53 +02:00
Tobias Diekershoff
58ac6bde09 Merge pull request #1455 from pztrn/master
Do not attempt to create itemcache directory if it already exist.
2015-03-29 16:05:57 +02:00
Stanislav N.
bcf7ade40d Typo 2015-03-29 17:01:51 +05:00
Stanislav N.
6e27510173 Do not try to create itemcache directory if it already exist.
On FreeBSD, with more-or-less default PHP configuration, when mkdir() is called on already existing directory - it will produce a warning, that could flood all over cron mail. To prevent that flooding a directory existing should be checked.
2015-03-29 16:56:26 +05:00
Michael Vogel
51cd55c8ad Some more logging added for the DDoS prevention 2015-03-28 08:49:24 +01:00
Michael Vogel
0206f447e1 Preventing a DDoS with the zrl parameter. 2015-03-28 08:29:01 +01:00
Beanow
e016db8bc6 Version bump, 3.4.0 2015-03-22 15:25:31 +01:00
Tobias Diekershoff
82abc32a14 Merge pull request #1426 from annando/1503-term-search
The index for the term search is now massively improved
2015-03-12 07:15:05 +01:00
Michael Vogel
bf61620bd2 The index changed, so the database version must be increased as well. 2015-03-10 07:58:49 +01:00
Michael Vogel
94302a7924 Reworked guid function. 2015-03-09 20:59:57 +01:00
Michael Vogel
7c4a1a059d New fields for the term table, improved query for the tag search. Changed the cache handling for rendered bbcode. 2015-03-07 21:24:39 +01:00
Fabrixxm
caa21e6021 Merge branch 'master' into develop 2015-02-24 09:09:02 +01:00
Fabrixxm
6a5bb80c82 Friendica 3.3.3
See CHANGELOG
2015-02-24 09:00:37 +01:00
Michael Vogel
4a1105ede6 scrape/noscrape now contains the date the profile was last updated or the last message was sent. 2015-02-18 23:40:46 +01:00
Michael Vogel
219932f692 Removed Statusnet from the counting of contacts for scrape/noscrape 2015-02-17 19:27:13 +01:00
Michael Vogel
a26d04574d Merge remote-tracking branch 'upstream/develop' into 1502-contacts-in-scrape 2015-02-17 19:18:17 +01:00
Michael Vogel
d1d794f1ab The global contacts now contain a "generation" value that defines how we know this contact 2015-02-15 10:52:45 +01:00
Michael Vogel
05319083c6 Take the UID from another place. 2015-02-09 21:45:17 +01:00
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
tobiasd
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
Tobias Diekershoff
32278e6fe2 revup 2014-08-07 08:46:29 +02:00
Michael Vogel
ed1dce93d6 Usage of /display/(guid) as path instead of /display/(user)/(id)
Bugfix for adding tags to photos
2014-07-22 00:36:20 +02:00
Michael Vogel
5ed5773f57 The temporary paths (temp, lock, itemcache) are now detected automatically when used. 2014-06-23 01:24:39 +02:00
Michael Vogel
297d8a6cc6 The icon for the website is now changeable in the config 2014-06-17 20:11:35 +02:00
fabrixxm
adefb06ff7 Merge pull request #1008 from annando/master
Expire, "attachment" element and database structure
2014-06-14 20:05:10 +02:00
tobiasd
310ad912fa rev up
in preperation for the big pull
2014-06-14 14:09:18 +02:00
Michael Vogel
48e2b422dd Preparation for an bidirectional app.net connector 2014-06-04 21:25:31 +02:00
Michael Vogel
0c77cee667 New database update system that uses the database structure defined in dbstructure.php 2014-06-04 00:44:58 +02:00
tobiasd
248b4fbcce rev up 2014-05-29 14:44:19 +02:00