clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
17,061 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

1783 Commits

Author SHA1 Message Date
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
fabrixxm 77a54c66be Merge pull request #998 from annando/master 
"Vier": New font version, fallback for oembed, more tracking variables removed
 2014-05-29 14:04:04 +02:00
Michael Vogel b6c1d7dc2b fetching the hostname from the .htpreconfig.php if present 2014-05-29 11:40:54 +02:00
tobiasd 5a55541dbd rev up 2014-05-25 08:00:22 +02:00
Michael Vogel 2846dfeb05 Ther eis now a user setting to disabled notices. The Diaspora reshare now checks for empty values. 2014-04-26 02:22:30 +02:00
Michael Vogel 77986d76fa Preparations for statusnet connector import 2014-04-04 10:40:46 +02:00
Michael Vogel 6b8585d48d Database stuff. New table "thread". Changing "left join" to "inner join", removing "limit 1" at update and delete. 2014-03-09 09:19:14 +01:00
Michael Vogel 17236b1801 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	include/acl_selectors.php
 2014-01-13 19:59:34 +01:00
Michael Vogel 43e916e81a New network constant for the Diaspora posting connector. 2014-01-13 19:57:15 +01:00
tobiasd b23ce65035 rev update 2014-01-06 07:36:57 +01:00
Michael Vogel aed28a24f1 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/crepair.php
 2014-01-05 16:22:42 +01:00
Michael Vogel 28df35052a Send notifications for each new post of a contact, option for creating a summary for a feed post 2014-01-05 16:10:02 +01:00
tobiasd 0d159a77a7 rev update 2014-01-03 10:02:17 +01:00
tobiasd 573e0128d6 rev update 2013-12-31 18:01:20 +01:00
Michael Vogel 5130b19f5e API: API is reworked in many parts so that it should be compatible to more statusnet clients then before (like AndStatus) 2013-12-15 23:00:47 +01:00
Michael Vogel e0cf2c5167 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
	mod/settings.php
 2013-12-02 00:33:46 +01:00
Michael Vogel 6684107b66 multiple admin mails. It is now possible to define more than one admin mail address. You can now add multiple addresses, separated by comma. 2013-12-02 00:11:31 +01:00
Mats Sjöberg 2859ce1483 Initial implementation of internal PuSH server in Friendica. It has been tested with GNU Social/StatusNet, and subscribe, unsubscribe and pushing new items seem to work. 2013-11-21 21:44:18 +02:00
tobiasd 8feeba7af5 rev update 2013-11-07 10:06:10 +01:00
Michael Vogel 53c06a3625 Several performance improvements. 2013-11-02 10:49:44 +01:00
Michael Vogel 711972a166 Merge remote-tracking branch 'upstream/master' 2013-10-25 23:35:03 +02:00
Michael Vogel 0ffeb4cf92 New field "network" in item table to speed up the system. 2013-10-25 23:33:53 +02:00
fabrixxm 6a2a54c9be Merge pull request #792 from annando/master 
Bugfix: The function "exif_imagetype" doesn't seem to be available at every system. So we emulate it.
 2013-10-23 00:02:51 -07:00
Michael Vogel 5b6e16d193 The emulation for the exif function is now much more sleaker 2013-10-22 16:19:55 +02:00
Michael Vogel d6f3de09e8 Bugfix: The function "exif_imagetype" doesn't seem to be available at every system. So we emulate it. 2013-10-22 16:08:29 +02:00
Fabrixxm 008eef17c0 clear_cache() check if cache dir is writable before opening it 2013-10-21 14:03:01 -04:00
tobiasd 6f5589fed3 rev update 2013-10-20 15:31:10 +02:00
Fabrixxm bf4246842a bump version to 3.2, add changelog 2013-10-14 03:53:23 -04:00
Michael Vogel d5ae5ecedd - Improved speed due to forced indexes when showing items. 
- Possibility to setup a hostname
 2013-09-15 10:40:58 +02:00
Michael Vogel 159a7bda85 Prepearations for queueing of twitter messages 2013-09-05 08:34:54 +02:00
Michael Vogel 34e7206ba4 Preparations for the pumpio synchronisation. 2013-08-28 08:56:48 +02:00
friendica bfc9cfb82f put tags in items 2013-06-26 04:02:04 -07:00
friendica 407473f2ce Merge https://github.com/friendica/friendica into pull 2013-06-21 05:02:43 -07:00
friendica 1c10cf1ad7 -- #039; is not a tag 2013-06-21 05:00:30 -07:00
Fabrixxm faa510befc move html from paginate functions to template 2013-06-13 08:12:15 -04:00
friendica 2464915817 don't try to parse empty xml with simplepie, throws conversion warning 2013-06-12 21:41:07 -07:00
friendica b60e42d2fa provide bbcode translation for imported red zmg tag (img tag with zot-id) 2013-05-28 04:52:22 -07:00
friendica 0cc641fbbc messaging 2013-05-22 22:30:53 -07:00
friendica ed6ca1d384 rev update 2013-05-21 22:37:51 -07:00
friendica a1c4d0ca93 fix include paths when started via cmdline 2013-05-20 17:36:29 -07:00
friendica 6ec1bd2fa8 double quotes in title mess up editpost 2013-05-18 16:02:31 -07:00
friendica 0ce68665c6 check_config is gone - use check_db 2013-05-13 17:22:07 -07:00
friendica aee7429967 Merge https://github.com/friendica/friendica into pull 2013-05-11 17:04:51 -07:00
friendica e8fc26e74e rev update 2013-05-11 17:04:23 -07:00
fermionic 3a13aba62e Merge pull request #674 from fermionic/20130503-basic-video-support 
basic video playback support using VideoJS
 2013-05-11 08:33:36 -07:00
friendica 2c8d33a6e2 rev update 2013-05-09 01:15:22 -07:00
Zach Prezkuta fec4581f34 basic video playback support using VideoJS 2013-05-03 18:17:56 -06:00
friendica ed5768c4a3 optimise cachefile logic - still not sure why the cachefile profiling was getting triggered on a site with no cachefile configured 2013-05-02 21:59:20 -07:00
friendica 185d29c41e undefined element 2013-05-02 21:42:34 -07:00
friendica 61a0f9c196 bug #540 and hush up a couple of log messages that are way too verbose 2013-04-28 04:30:20 -07:00
friendica 1ed6a2bd3d rev update 2013-04-25 02:36:52 -07:00
friendica f090564f0f Merge https://github.com/friendica/friendica into pull 2013-04-23 18:51:50 -07:00
friendica f4b3cf980d rev update 2013-04-23 18:51:35 -07:00
Fabrixxm d36292c532 template: set smarty3 as default template engine in theme info array. 
remove commented code from get_markup_template.
add check for $root/$filename in get_template_file.
 2013-04-23 03:35:31 -04:00
Fabrixxm ddf1caf0fd template engine rework 
- use smarty3 as default engine
- new pluggable template engine system
 2013-04-23 03:27:52 -04:00
friendica bc68892cf9 rev update 2013-04-21 16:07:02 -07:00
friendica a13e7b8a38 rev update 2013-04-19 04:51:43 -07:00
friendica 9660117c70 sync username when changed in either the default profile or the settings page 2013-04-04 15:10:14 -07:00
friendica 8b51ffefc0 Merge https://github.com/friendica/friendica into pull 2013-04-03 16:29:13 -07:00
friendica db0bb50e37 rev update 2013-04-03 16:28:49 -07:00
Matthew Exon 5b158dbcfb Make the content type available after calling fetch_url 2013-04-01 12:36:43 +08:00
friendica 17cb682ed0 rm addon.old 2013-03-19 03:30:50 -07:00
friendica 1ff37ca4c1 double encode any text that is destined for meta fields. 2013-03-18 16:40:33 -07:00
friendica 59c03edbc9 fix util/config 2013-03-02 15:44:00 -08:00
friendica 5205a374ee block injection vector 2013-02-26 17:33:18 -08:00
friendica 6e21534f23 Merge https://github.com/friendica/friendica into pull 2013-02-22 17:12:14 -08:00
friendica c8717ede42 rev update 2013-02-22 17:12:03 -08:00
zottel a17dd541ee reorder the update of the item table as instructed by Michael Vogel 2013-02-22 13:26:11 +01:00
friendica 280b72b9e6 Merge https://github.com/friendica/friendica into pull 2013-02-21 16:43:01 -08:00
friendica 615b060352 rev update 2013-02-21 16:42:34 -08:00
Michael Vogel 0d4d15c73d Merge remote-tracking branch 'upstream/master' 
Conflicts:
	mod/admin.php
 2013-02-20 21:57:26 +01:00
friendica d653bc4dbd rev update 2013-02-17 17:23:19 -08:00
Michael Vogel 7e154d5e4c plugin: orphaned hooks weren't deleted. 
update: fixing update job for tags.
 2013-02-17 18:05:30 +01:00
Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php
 2013-02-17 12:35:40 +01:00
Fabrixxm f1a0aeb480 Merge remote branch 'friendica/master' 2013-02-15 03:17:59 -05:00
friendica 6242f9a147 add .gif to fix_private_photos checking, try another tactic to reduce notification duplication - check for duplicates after storage rather than before. This tactic worked out well to reduce item duplication. 2013-02-07 23:43:55 -08:00
friendica b6008130c4 Merge pull request #600 from fermionic/20130204-message-button-on-own-profile 
don't show Message button to user on own profile page
 2013-02-05 17:22:25 -08:00
friendica 9bf8364506 rev update 2013-02-05 15:09:28 -08:00
Zach Prezkuta d5af6ebfc1 don't show Message button to user on own profile page 2013-02-04 20:14:50 -07:00
friendica de0098a6b4 rev update 2013-01-29 18:35:25 -08:00
Fabrixxm 5f80467a8f Merge remote branch 'friendica/master' 2013-01-29 05:57:53 -05:00
friendica ccb465eccd Merge pull request #594 from fermionic/20130127-add-event-id-index 
add event-id index to prevent large CPU loads when visiting the events page
 2013-01-27 19:11:58 -08:00
friendica a5ac69c65e Merge pull request #591 from fermionic/20130126-javascript-free-theme 
Decaf mobile: an (almost) Javascript-free theme
 2013-01-27 19:11:36 -08:00
Zach Prezkuta 3f77eb80fe add event-id index to prevent large CPU loads when visiting the events page 2013-01-27 17:52:44 -07:00
Michael Vogel bc972e16ce New function to complete threads from ostatus postings 2013-01-27 23:25:04 +01:00
friendica ce8f31504e rev update 2013-01-27 13:13:08 -08:00
Michael Vogel 2cb576d305 Bugfixing after adding timestamps 2013-01-27 13:57:44 +01:00
Zach Prezkuta 488a38cd85 Decaf mobile: an (almost) Javascript-free theme 2013-01-26 13:01:57 -07:00
Michael Vogel fdee002f73 Several improvements for performance measuring 2013-01-26 18:35:39 +01:00
Michael - piratica.eu 2c93067682 Performance: Adding several variables for performance measuring. 2013-01-26 16:46:43 +01:00
friendica 04b48688b6 add form security to invite page and set maximum per user invites 2013-01-25 13:48:57 -08:00
friendica b3b0a9de24 die forcefully but gracefully on missing api templates 2013-01-23 17:07:55 -08:00
Fabrixxm 8eb781994b profile_vcard: add correct menu for profile editing when multiple profiles are disabled 2013-01-23 09:58:30 -05:00
Michael Vogel 4e3d0018c6 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	boot.php
	include/items.php
	update.php
 2013-01-20 14:07:57 +01:00
Zach Prezkuta bf26af5ac6 insidious set_config bug 2013-01-18 23:38:49 -07:00
friendica 20eb767b7e don't run two processes for every web access (noticed that dbupdate is always started as a background task under normal operation). 2013-01-18 17:37:45 -08:00
friendica 30f1fb2c4d provide a date indication in reshared content 2013-01-15 14:58:50 -08:00
fermionic b42427d576 Merge pull request #586 from fermionic/20130114-maintenance-mode 
check plugins in separate function
 2013-01-14 19:35:46 -08:00
Zach Prezkuta 6d77237f06 check plugins in separate function 2013-01-14 20:31:32 -07:00
friendica 66a6970bb8 config cli will also work with Friendica without change - so bringing it over 2013-01-14 15:50:39 -08:00
Michael Vogel 158bfda0ac Changing the tag system to the "term" table. 2013-01-13 14:50:55 +01:00
Michael Vogel 8cef0fa80d Mentions are now displayed much faster. Attention: The related database update can last more than one minute. 
bbcode: The generated HTML is now cleaned up every time (using the DOM) since it happened that bad html broke the network page.
 2013-01-13 09:37:15 +01:00
friendica 449b44fe4c Merge https://github.com/friendica/friendica into pull 2013-01-12 15:09:35 -08:00
friendica b5c0714bc4 fix live update on display page 2013-01-12 15:08:59 -08:00
friendica 8b643d4c88 Merge pull request #581 from fermionic/20130112-backport-red-smarty-improvements 
fixes and tweaks to Smarty processing
 2013-01-12 12:28:14 -08:00
Zach Prezkuta 1507ec37a4 give post a chance to arrive before rejecting photos from Diaspora 2013-01-12 06:52:15 -07:00
Zach Prezkuta 609c45e791 fixes and tweaks to Smarty processing 2013-01-12 05:58:54 -07:00
friendica f620495c7a App::get_template_engine() redeclared 2013-01-10 22:34:25 -08:00
friendica 6881edf1f7 Merge https://github.com/friendica/friendica into pull 2013-01-10 22:27:53 -08:00
friendica dfee9faca5 rev update 2013-01-10 22:27:41 -08:00
Zach Prezkuta bce29054b9 allow Smarty use on international templates 2013-01-10 21:46:48 -07:00
Michael Vogel 61c78711df Preparations for a new tag structure. Tags are now stored in a dedicated table. 2013-01-11 01:20:16 +01:00
friendica 51eb0cd59d rev update 2013-01-10 01:08:36 -08:00
friendica de0315396c missing session template_engine calls 2013-01-08 12:24:13 -08:00
friendica 4ab363ed71 bypass smarty wherever using intltext_templates (install, register, friend confirmation emails, etc.) 2013-01-07 20:14:00 -08:00
friendica 07ba4da634 email header encoding everywhere 2013-01-04 15:47:29 -08:00
friendica 8209ae6455 Merge https://github.com/friendica/friendica into pull 2013-01-04 15:14:33 -08:00
friendica 9fbaa0d383 rev update 2013-01-04 15:14:00 -08:00
friendica c0fd572fec Merge pull request #574 from fermionic/20130103-always-load-theme-in-mod_init 
Finalize theme decision in a module's _init function
 2013-01-04 14:36:47 -08:00
Zach Prezkuta 0ba1bdbb08 profile_uid bug in boot.php 2013-01-03 10:53:11 -07:00
Zach Prezkuta fdd142c42e never use profile_load outside of a module's _init() function 2013-01-03 10:47:45 -07:00
friendica e394ccd0a8 If we're going to encode the email headers, we probably should use the encoded version rather than the original 2013-01-03 03:47:08 -08:00
friendica 66b1448cdb rev update 2013-01-01 17:32:46 -08:00
friendica 017042d5d4 rev update 2012-12-31 14:54:04 -08:00
friendica 215a7f139c make smarty error reporting a bit less chatty 2012-12-30 00:29:07 -08:00
friendica 05996457f9 receiving post from archived Diaspora contacts 2012-12-29 02:35:41 -08:00
friendica 255771f295 rev update 2012-12-27 13:36:23 -08:00
friendica 792b4f63e7 remove dashes from variable names in profile_vcard.tpl 2012-12-26 13:20:18 -08:00
friendica f519b90737 Merge https://github.com/friendica/friendica into pull 2012-12-26 13:09:20 -08:00
friendica 2684981941 rev update 2012-12-26 13:09:00 -08:00
Zach Prezkuta 263fe0f6bc revert unnecessary variable name changes 2012-12-26 10:42:01 -07:00
Zach Prezkuta 189c8ccf6f some missed templates 2012-12-25 12:28:24 -07:00
Zach Prezkuta 11c06e21b7 simplify by making Smarty include directives behave like Friendica native ones 2012-12-25 11:55:57 -07:00
fermionic a0d7f7a6d3 Merge pull request #550 from fermionic/20121222-use-smarty-template-engine 
only use Smarty if the view/smarty3/ directory is writable
 2012-12-23 05:19:02 -08:00
Zach Prezkuta 53a4cf5339 only use Smarty if the view/smarty3/ directory is writable; location bug fix 2012-12-23 06:16:35 -07:00
friendica 453082516e Merge https://github.com/friendica/friendica into pull 2012-12-22 22:59:37 -08:00
friendica 6b36927d32 rev update 2012-12-22 22:59:12 -08:00
Zach Prezkuta 96ed0a7791 Implement Smarty3 2012-12-22 12:57:29 -07:00
friendica ac18d7289b Merge https://github.com/friendica/friendica into pull 2012-12-19 03:16:18 -08:00
friendica 0f13995035 rev update 2012-12-19 03:15:48 -08:00
Michael Vogel a6b1275f16 Merge remote-tracking branch 'upstream/master' 2012-12-17 10:32:53 +01:00
friendica 3f63a69d7a divide by zero on incorrectly specified oembed thumbnail size 2012-12-16 17:58:12 -08:00
Michael Vogel 46c5a97a20 New caching system for photos 2012-12-14 22:47:30 +01:00
friendica 6faadc9662 anybody can see the "remove category" link, though it doesn't do anything if you aren't the owner. Can't believe this has gone so long without being reported. 2012-12-13 14:15:18 -08:00
friendica 5d757b0668 add sample nginx config from Olaf Conradi to mods directory 2012-12-12 15:54:13 -08:00
friendica bc3a704e02 bug #517 - ensure wall owner can always comment on walltowall posts to their own wall, this seems to have been lost during the objectification of conversations 2012-12-09 13:44:48 -08:00
friendica 6e7e41360f rev update 2012-12-07 15:58:42 -08:00
friendica 376bf517a4 bug #516 - set writable on first poll 2012-12-06 13:59:20 -08:00
friendica d193093106 rev update 2012-12-04 14:08:55 -08:00
friendica 8ab24858fb fix "insert web link" for those without richtext feature enabled 2012-12-03 16:31:28 -08:00
friendica ee0def3ef5 rev update 2012-12-02 13:47:24 -08:00
friendica b130c892b2 features categories were un-translatable 2012-11-28 19:25:09 -08:00
friendica 32868dab79 catch stragglers in "chunked" delivery mode 2012-11-27 15:17:41 -08:00
friendica 5d904a9fa8 improve performance of photo upload page 2012-11-25 19:34:54 -08:00
friendica bb51be4ea8 rev update 2012-11-25 19:21:08 -08:00
friendica ff9c19d75a Merge https://github.com/friendica/friendica into pull 2012-11-22 20:55:03 -08:00
friendica 278f30790a rev update 2012-11-22 20:54:44 -08:00
friendica 226d1ba7c1 Merge pull request #537 from fermionic/20121121-features 
Port Features from Red
 2012-11-22 20:54:16 -08:00
Zach Prezkuta 94204d9160 implement features 2012-11-22 09:14:22 -07:00
friendica d3b2b1b7ec rev update 2012-11-21 15:40:07 -08:00
friendica f1c579e74a Merge https://github.com/friendica/friendica into pull 2012-11-18 23:50:37 -08:00
friendica 53a908a3d7 fix directory 2012-11-18 23:44:03 -08:00
friendica 70d0ed9402 log directory updates 2012-11-18 22:53:01 -08:00
Michael Vogel f17377e6de New cache system with subdirectories 2012-11-17 00:50:39 +01:00
friendica ab0dc3131a fix wallmessage 2012-11-14 13:59:31 -08:00
friendica 66f0cf9f5b rev update 2012-11-13 17:15:17 -08:00
friendica 009744af50 allow posted ACLs to be comma-delimited string besides the default array 2012-11-11 13:56:21 -08:00
friendica a807206804 Merge https://github.com/friendica/friendica into pull 2012-11-11 00:30:37 -08:00
friendica de5a21bec4 improve recognition of tumblr feeds. I hope we don't need special feed logic to find the feeds for every site on the web. We were so far beyond this ten years ago. 2012-11-11 00:28:21 -08:00
friendica 0e95b6b527 Merge pull request #531 from fabrixxm/master 
"Move Account" docs
 2012-11-10 03:06:28 -08:00
Fabrixxm cafb4d62f4 a little bit of phpdoc 2012-11-09 02:43:22 -05:00
friendica 083d660f61 Merge https://github.com/friendica/friendica into pull 2012-11-08 16:32:25 -08:00
friendica 9b629186a9 rev update 2012-11-08 16:29:54 -08:00
Zach Prezkuta e116712bf5 add ability to remember logged in user after browser closes 2012-11-07 18:59:30 -07:00
Zach Prezkuta 999c3439e6 fix mobile photo uploads; better theme control; frost improvements 2012-11-06 08:43:19 -07:00
friendica 776552226b Merge https://github.com/friendica/friendica into pull 2012-11-06 01:10:36 -08:00
friendica fd4d35b16c set writable for ostatus followers 2012-11-06 01:10:12 -08:00
Fabrixxm 5b4944fe8e Merge remote-tracking branch 'remotes/friendica/master' into moveme 2012-11-05 09:37:58 +01:00
friendica caebcc5e83 rev update 2012-11-04 13:43:28 -08:00
friendica f076d7f0dc Merge https://github.com/friendica/friendica into pull 2012-11-03 14:44:46 -07:00
friendica 3303d9db75 put 1i8n position orders in welcome string 2012-11-03 14:43:48 -07:00
fermionic d3290f314f Merge pull request #521 from fermionic/20121101-updates 
Various updates
 2012-11-02 12:26:49 -07:00
friendica 08121ad6b4 rev update 2012-11-01 17:21:39 -07:00
Zach Prezkuta e9b26ffbb3 prevent double posting of status updates and comments 2012-11-01 17:14:42 -06:00
Fabrixxm 1a3a5ee8d9 moveme: first successful relocated user 2012-10-31 17:13:45 +01:00
friendica 68da185cce rev update 2012-10-30 14:23:11 -07:00
friendica 0fe9019c08 rev update 2012-10-29 21:01:15 -07:00
friendica 81a21257c3 rev update 2012-10-27 15:42:23 -07:00
friendica 88c8387c44 revive "mark everything seen" on main network page - see comments 2012-10-26 14:29:42 -07:00
friendica 89d0b6926c rev update 2012-10-23 03:29:27 -07:00
friendica 02251f23df undefined fn: init_groups_visitor in mod_profile, rev update 2012-10-21 14:41:10 -07:00
friendica 2347a4326c get rid of 'Friendika' 2012-10-18 21:51:45 -07:00
friendica b39d9d3e71 rev update 2012-10-17 15:22:09 -07:00
friendica a02e5f692e disabling auto_redir until we prevent it from infinite looping 2012-10-15 16:28:43 -07:00
friendica dec5298248 rev update 2012-10-14 17:16:25 -07:00