Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-10 09:02:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
11500 commits 3 branches 64 tags 245 MiB
Commit graph

1484 commits

Author SHA1 Message Date
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