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
|
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
|
c00aacf9e5
|
rename
|
2011-10-30 15:12:07 -07:00 |
|
|
Friendika
|
7e2284043f
|
show profile url in ACL hovertips, add fork identifier to json siteinfo
|
2011-09-27 05:02:25 -07:00 |
|
|
Friendika
|
6a9e22550d
|
.
|
2011-09-24 05:45:34 -07:00 |
|
|
Friendika
|
2637831d90
|
some more zot changes migrating back to f9a mainline
|
2011-08-01 21:02:25 -07:00 |
|
|
Friendika
|
944f03d367
|
change license
|
2011-07-17 03:34:16 -07:00 |
|
|
Friendika
|
a82e0e32b3
|
add site info to site json response
|
2011-07-04 00:44:25 -07:00 |
|
|
Friendika
|
20d1de4ced
|
got it wrong - apparently no need to fix json slashes
|
2011-06-02 20:42:09 -07:00 |
|
|
Friendika
|
8510748b19
|
friendika page hook for German impressum
|
2011-05-22 01:15:04 -07:00 |
|
|
Friendika
|
df7a4206b7
|
fix json_encode on url's
|
2011-05-12 02:15:04 -07:00 |
|
Fabio Comuni
|
31aee6b803
|
missing / in admin profile url
|
2011-05-12 10:33:59 +02:00 |
|
|
Fabio Comuni
|
564f9c924a
|
Serve friendika node info as json from url /friendika/json/
|
2011-05-12 10:26:34 +02:00 |
|
|
Friendika
|
76918ed5a5
|
info page
|
2011-03-27 16:35:56 -07:00 |
|