Commit graph

148 commits

Author SHA1 Message Date
Michael Vogel
804c04a06f Merge pull request from fabrixxm/revert_db949bb8
Revert "Updated modules to allow for partial overrides without errors"
2016-02-09 06:55:49 +01:00
fabrixxm
0c67c89715 Merge pull request from annando/1601-dfrn-import
Complete rewrite of DFRN import
2016-02-08 15:48:16 +01:00
fabrixxm
b202e02fbf Revert "Updated modules to allow for partial overrides without errors"
This reverts commit db949bb802.
2016-02-07 15:11:34 +01:00
Andrej Stieben
db949bb802 Updated modules to allow for partial overrides without errors
Only define functions if they have not been defined before, e.g. in themes. This makes it possible to override parts of a module and still use the other functions.
2016-02-05 21:52:39 +01:00
Michael Vogel
d408cea871 DFRN import has now gone live 2016-02-05 21:25:20 +01:00
Michael Vogel
c66b4387bf dfrn functions could now work/Removed unused code 2016-01-22 20:26:11 +01:00
Fabrixxm
554948c22a Adds checks for mcrypt module for RINO2
- check for module on install
- check for module when RINO2 is enabled in admin
- check for module when RINO2 is used in communications
2015-09-22 09:50:24 +02:00
Michael Vogel
d1e3ea7b46 Soapbox-Improvements 2015-08-30 19:07:30 +02:00
Michael Vogel
3246352ba8 More detailled log entries 2015-08-29 16:55:25 +02:00
Michael Vogel
38c8431527 Rino Bugfix: A variable was used that never was fetched 2015-08-29 11:38:40 +02:00
Fabrixxm
511c2d2c91 rino: settings in admin, choose lowest common on notify 2015-06-23 17:36:26 +02:00
Fabrixxm
6fbb02fb93 RINO 2 based on php-encryption
reenable RINO 1 functions, add a deprecation note.
use by default RINO 2 , with crypto from php-encryption
fallback to RINO 1 for old nodes.
2015-06-23 16:13:09 +02:00
Fabrixxm
7d83a19fd4 Disable RINO
Comment out functions for RINO crypt and disable RINO request and response.
2015-06-23 12:02:35 +02:00
Michael Vogel
9a414cc4a0 Bugfix: There was a SQL error when trying to deliver friendica posts because of a parameter mismatch 2014-11-15 19:21:54 +01:00
Michael Vogel
030784ad35 Fix for issue "Field 'type' doesn't have a default value" in the challenge table. 2014-11-08 20:52:15 +01:00
Michael Vogel
53c06a3625 Several performance improvements. 2013-11-02 10:49:44 +01:00
Fabrixxm
5b4944fe8e Merge remote-tracking branch 'remotes/friendica/master' into moveme 2012-11-05 09:37:58 +01:00
zottel
7de5c7ebe1 Changes to make contacts delete all content from the user when a user is deleted.
NOTE: I didn't add "AND account_removed = 0" to facebook.php because I don't
have a clone of the addons repository. Please someone do that for me. Thanks.

Please check carefully. I tested locally on my server, but not with other
servers.
2012-11-02 21:43:47 +01:00
Fabrixxm
1a3a5ee8d9 moveme: first successful relocated user 2012-10-31 17:13:45 +01:00
friendica
88a0d6a1d5 private group tests, cont. 2012-05-29 22:57:15 -07:00
Alexander Kampmann
355c42cb30 Merge branch 'master' of https://github.com/friendica/friendica
Conflicts:
	include/config.php
	update.php
2012-04-05 13:39:15 +02:00
friendica
5d0d9f8772 make contact ssl_policy change a function since it is used in a few places 2012-04-02 23:07:26 -07:00
friendica
f4721955db more ssl policy fixes and prevent delivery to soapbox when using local delivery 2012-04-02 21:01:19 -07:00
friendica
e1de2e3de0 don't change ssl settings on local photos for remote contact 2012-04-02 19:38:13 -07:00
friendica
7956c2d08e improved rw notifications 2012-03-28 17:21:56 -07:00
friendica
7684f63ecd track whether contact is a community page or not 2012-03-15 16:38:26 -07:00
friendica
f0a62d8908 ssl_policy stuff 2012-03-14 20:36:23 -07:00
friendica
8aa2552372 add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
Friendika
2802c142cb local_deliver testing 2011-10-06 19:10:57 -07:00
Friendika
e232c50c9e check author url to see if it matches current contact before relay is accepted 2011-10-06 00:26:25 -07:00
Friendika
7d6a67f903 mostly cosmetic changes to make DB tables accurately reflect the conversation members 2011-10-05 19:16:05 -07:00
Friendika
b1e5dfad3c clean up w3c validation and layout for priv mail and lang selector 2011-10-05 15:35:53 -07:00
Friendika
d709225b68 better check for orig post author 2011-10-05 13:11:45 -07:00
Friendika
6ff221d5a1 another typo 2011-10-04 21:53:33 -07:00
Friendika
c2d70d005b and a typo fix 2011-10-04 21:45:15 -07:00
Friendika
159d06df82 notification issue after last checkin 2011-10-04 21:43:21 -07:00
Friendika
11ca81adba keychecks 2011-09-21 05:43:26 -07:00
Friendika
d653d922b1 sorting through key issue 2011-09-19 21:24:16 -07:00
Friendika
fd18b42a5a Check all keys before use 2011-09-19 03:30:59 -07:00
Friendika
2aef98f71d cripple account when expired 2011-09-19 01:17:12 -07:00
Friendika
c0be5bea16 fix warning of self-signed cert for photos of our own contacts in comment notification emails 2011-08-20 18:27:12 -07:00
Friendika
b721fabc3c show lock icon on private events 2011-07-27 02:21:55 -07:00
Friendika
d7154a4606 ability to link contacts that are "really me, but on another system/network". 2011-07-05 19:55:09 -07:00
Friendika
76e56fd44e begin work on relocation conversation 2011-07-05 19:19:11 -07:00
Friendika
0b221e8945 bug move libraries to library - better alignment of like rotator 2011-06-28 21:11:52 -07:00
Friendika
3fe1e19725 pass notify endpoint with friend suggestions 2011-06-26 19:30:57 -07:00
Friendika
59d9070d13 suggestion template 2011-06-25 19:10:38 -07:00
Friendika
a15bd91d17 don't update an event that hasn't changed. 2011-06-23 18:25:33 -07:00
Friendika
c23c366ff6 receive friendship suggestion over the wire (dfrn) and store 2011-06-22 19:08:30 -07:00
Friendika
ca84823437 Dear $username not expanded/replaced in text emails 2011-06-14 20:49:25 -07:00