Commit graph

79 commits

Author SHA1 Message Date
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 885dc1df81 gcontact update script, rebuilt follow page, query speedup for community and network groups 2016-01-10 09:19:00 +01:00
Michael Vogel 709aac0652 Only offer the choice to activate Diaspora and OStatus if the system is ready for it 2015-11-01 13:55:49 +01:00
Michael Vogel 1f0b759e2f Added resize possibility to proxy function 2015-10-07 08:25:10 +02:00
Michael Vogel eefedc019b Merge remote-tracking branch 'upstream/develop' into 1510-diaspora-privacy 2015-10-06 07:41:09 +02:00
Michael Vogel 901b95e935 Hide some profile data if not connected. 2015-10-06 06:56:31 +02:00
Michael Vogel 7ed61b2edc Removed "proxy_parse_html" since it is now done in the bbcode function. 2015-10-05 22:25:14 +02:00
Michael Vogel 8a2d1fe301 Show RedMatrix and use the proxy for the profile pictures 2015-10-04 22:24:58 +02:00
Michael Vogel 72ecb9e67b Bugfix: Repairing a contact was more like killing the contact ... 2015-10-04 19:39:55 +02:00
Michael Vogel 83ea4f7253 transfer some stuff from "follow" to the "notifications" to reduce the differences in the two dialogues. 2015-10-04 15:55:24 +02:00
Michael Vogel ba41336099 Preparation for a not found contact. 2015-10-04 14:49:12 +02:00
Michael Vogel d0ae5ce326 Show more information when following a new contact 2015-10-04 14:41:39 +02:00
Michael Vogel c0e277cec8 Issue 1913: Report invalid feed 2015-10-04 00:28:15 +02:00
Michael Vogel 7c8c8b821a Bugfix: Following mail accounts is now possible again 2015-09-22 22:31:22 +02:00
Michael Vogel d1e3ea7b46 Soapbox-Improvements 2015-08-30 19:07:30 +02:00
Michael Vogel fae3592c79 Bugfix: You wasn't able to add an OStatus contact when you are following the same contact via Statusnet connector. 2015-05-31 13:28:16 +02:00
Michael Vogel f6ea872986 The behaviour when following a new contact is now unified. 2015-04-09 00:10:21 +02:00
Zach Prezkuta e684324032 use explicit include paths 2012-12-28 14:51:50 -07:00
friendica ee42c3be94 cleanup 2012-06-02 23:17:49 -07:00
friendica 82cf664920 turn "follow" into a function 2012-06-02 23:12:20 -07:00
friendica 7b0ded3f14 more private forums, default privacy group for new contacts 2012-05-17 22:44:52 -07:00
friendica df35746639 make mod-follow hookable (e.g. service class limits) and also begin to prepare it for functionalisation 2012-05-07 23:09:57 -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 44c23cda8e theme shakeup commences - themes are now administered in admin panel. 2012-02-23 20:29:09 -08: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
friendica eb05d00794 connect on suggest/match - added to testbubble 2011-12-18 12:51:45 -08:00
friendica 622886a33c make mod-follow "get"-able 2011-12-18 12:41:46 -08:00
friendica 974a52a16d add connect link to friend suggest 2011-12-18 01:08:32 -08:00
friendica 47f369e052 hide some contacts from others 2011-12-05 18:36:26 -08:00
Friendika 573670fa0c more social graph stuff 2011-11-01 16:08:07 -07:00
Friendika d4644d7339 name change continued, social graph tools and stuctures, fix for spanish province name 2011-10-31 20:39:04 -07:00
Friendika 9edf15d3ef structures for batch mode (Diaspora/zot) 2011-09-20 01:49:08 -07:00
Friendika 564ade0685 store key with contact record 2011-08-22 04:55:09 -07:00
Friendika 18c8f4d8b5 wrong record 2011-08-19 05:29:07 -07:00
Friendika 2ef82cd347 redirect to added contact, not self 2011-08-19 05:24:07 -07:00
Friendika ef98c7e020 on follow, land on new contact edit page 2011-08-19 04:52:40 -07:00
Friendika f7a1674cf6 set proper relation for diaspora in mod_follow 2011-08-15 19:15:56 -07:00
Friendika 0729e205c8 diaspora follow from friendika 2011-08-14 20:38:31 -07:00
Friendika 7eb7f77413 use separate hcard from profile url 2011-08-07 19:26:44 -07:00
Friendika 48ffa880f0 cleanup 2011-08-07 16:15:54 -07:00
Friendika 3f25830076 more friendika-z 2011-07-06 20:16:40 -07:00
Friendika df8ac668b8 more calendar work, undo strict_privacy flag to use different approach 2011-06-08 21:06:02 -07:00
Friendika c0094aa4f8 strict privacy mode (Friendika-Z) - refuse to talk to networks with privacy issues 2011-06-06 16:26:11 -07:00
Friendika 44a22c2915 more improvements in twitter handling, reduce duplicates from FB when double friended 2011-05-22 18:40:00 -07:00
Friendika 0dfcbe9c44 better handling of twitter follows, remove ajax anchor /#!/ 2011-05-21 17:13:51 -07:00
Friendika b2e92e0af3 deprecate load_view_file 2011-05-11 04:37:13 -07:00
Friendika c052d68828 don't use load_view_file() except in email templates and install of htconfig - to avoid getting wrong file when package is updated by copying over an older version. 2011-05-10 16:12:50 -07:00
Friendika 29a48de5e2 follow requests most adhere to site allow policy 2011-04-19 16:31:39 -07:00
Friendika 863ddf1676 mail changes 2011-04-16 08:45:08 -07:00