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
|
dc84da520d
|
invite potential connectees to the free social web
|
2012-03-13 15:40:16 -07:00 |
|
Abinoam P. Marques Jr
|
12a8796854
|
mod/dfrn_request.php and templates - Friendika -> Friendica
|
2012-02-20 19:38:43 -03: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
|
e921b97a7f
|
bug #127, add Diaspora notes to Connect (dfrn_request) page, get rid of security warnings
|
2011-09-05 18:34:30 -07:00 |
|
|
Friendika
|
44c47f118c
|
"profile locator/address" is now called "Identity Address" to reduce confusion
|
2011-04-14 20:37:42 -07:00 |
|
|
Friendika
|
70f4f172dc
|
pull strings from connection request templates
|
2010-12-16 19:38:52 -08:00 |
|
|
Friendika
|
4240a23a8a
|
i18n re-arrange
|
2010-11-15 23:27:12 -08:00 |
|
|
Friendika
|
05cd91129e
|
branding
|
2010-11-05 22:20:33 -07:00 |
|
Mike Macgirvin
|
2a23a7e840
|
project rename
|
2010-11-02 20:17:46 -07:00 |
|
|
Mike Macgirvin
|
c16f314ec3
|
two-way subscriptions working with federated social accounts
|
2010-10-25 21:52:30 -07:00 |
|
|
Mike Macgirvin
|
3c440f70c6
|
Provide the ability to subscribe to our user from other federated sites.
This is a read-only relationship until the rest of the salmon
magic-envelope stuff lands
|
2010-10-12 19:32:15 -07:00 |
|
|
Mike Macgirvin
|
9a03834cef
|
simplify wording throughout application to concepts which do not need explanations.
|
2010-09-19 20:52:39 -07:00 |
|
|
Mike Macgirvin
|
11f2eaa16d
|
introduction cleanup - email notification flags
|
2010-07-22 02:13:39 -07:00 |
|
|
Mike Macgirvin
|
ba8da761e6
|
more cleanup - start on ajax
|
2010-07-19 22:52:31 -07:00 |
|
|
Mike Macgirvin
|
6348e70daa
|
Initial checkin
|
2010-07-01 16:48:07 -07:00 |
|