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
|
76308eca67
|
add toggle to choose sending "friends with" activity even if contact is not hidden
|
2012-02-06 16:41:05 -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
|
c735582ead
|
hide contacts on approval
|
2011-12-29 00:23:05 -08:00 |
|
Friendika
|
23f00aaab4
|
recipient ui, friend suggestions
|
2011-06-26 21:55:24 -07:00 |
|
Friendika
|
1adf69a049
|
more string extraction
|
2010-12-01 20:37:42 -08:00 |
|
Friendika
|
f9d5aafe9c
|
finish moving english files
|
2010-11-16 20:13:18 -08:00 |
|
Friendika
|
4240a23a8a
|
i18n re-arrange
|
2010-11-15 23:27:12 -08:00 |
|
Mike Macgirvin
|
b41218ca30
|
workflow for federated/non-dfrn followers
|
2010-10-24 20:39:24 -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
|
ffb1997902
|
mistpark 2.0 infrasturcture lands
|
2010-09-08 20:14:17 -07:00 |
|
Mike Macgirvin
|
6348e70daa
|
Initial checkin
|
2010-07-01 16:48:07 -07:00 |
|