Commit graph

2470 commits

Author SHA1 Message Date
Friendika 149d52da8b show correct self profile in api 2011-07-30 20:48:55 -07:00
Friendika 60caffcd77 convert our native pkcs#8 to pkcs#1 for diaspora-public-key xrd field 2011-07-30 01:03:24 -07:00
Friendika 01703f3be6 get_diaspora_key() 2011-07-30 00:51:59 -07:00
Friendika a61ec584d6 basic diaspora decryption 2011-07-30 00:31:00 -07:00
Friendika dbc3283681 api/statusnet/version 2011-07-29 18:21:54 -07:00
Friendika 829dc24464 api/statusnet/config does not require login 2011-07-29 17:01:57 -07:00
Friendika c9d17c78a6 Merge branch 'pull' 2011-07-29 16:05:41 -07:00
Friendika ef47a1cf97 revup 2011-07-29 16:05:16 -07:00
fabrixxm ba0a710208 Merge pull request #150 from fabrixxm/master
some fix
2011-07-29 08:25:44 -07:00
Fabio Comuni ac6945eed1 Merge remote-tracking branch 'friendika/master' 2011-07-29 17:23:09 +02:00
Fabio Comuni b1e766dadb allow GET or POST data in statuses/update 2011-07-29 17:21:02 +02:00
Fabio Comuni 0111a1231c re-add pending registrations in ping.php, for admin side menu 2011-07-29 17:14:35 +02:00
Friendika f47d582736 api/statusnet/config.xml 2011-07-28 21:56:56 -07:00
Friendika 8e30f6a2f4 one more try - do not link numeric hash tags 2011-07-28 21:05:56 -07:00
Friendika 41c7d71e3b make profile-jot-desc track lock state changes 2011-07-28 20:44:35 -07:00
Friendika 9b2ddb2cc2 auto-friend profiles showing up in directory as community pages 2011-07-28 19:18:07 -07:00
Friendika a45b94033e issue with remote mentions 2011-07-28 19:08:38 -07:00
Friendika 8042f874f3 more progress on key conversion functions 2011-07-28 18:16:57 -07:00
Friendika 0a3c9017d0 Merge branch 'pull' 2011-07-28 16:50:44 -07:00
Friendika 04675e3ec3 revup 2011-07-28 16:49:43 -07:00
Tobias Diekershoff b9cd244dd9 Merge pull request #149 from tobiasd/master
wording for StatusNet and Twitter config cleared
2011-07-28 08:40:23 -07:00
Tobias Diekershoff cfc7f8308f Merge branch 'master' of git://github.com/friendika/friendika 2011-07-28 17:36:49 +02:00
Tobias Diekershoff ea0d5d34ac config page formatation issues fixed 2011-07-28 17:34:34 +02:00
Tobias Diekershoff ce36f0bf3d clearing the wordenting for the addon config 2011-07-28 13:25:41 +02:00
Friendika c74f0f0cab show full size photos for album view even when photo has been used as a profile photo 2011-07-28 01:01:19 -07:00
Friendika 822fea9d9d installer text changes 2011-07-27 21:48:02 -07:00
Friendika b721fabc3c show lock icon on private events 2011-07-27 02:21:55 -07:00
Friendika e6c5afdf4f privacy issue introduced yesterday 2011-07-26 22:57:48 -07:00
Friendika c17890ab62 privacy settings on event item not propagated correctly 2011-07-26 22:40:11 -07:00
Friendika 94e027af67 deal with browser pre-fetch of the ACL img template '{0}' 2011-07-26 19:20:29 -07:00
Friendika 454ff3c7f0 configurable format for date input selectors 2011-07-25 20:59:25 -07:00
Friendika 1441fce04e ignore any fully numeric hash tag 2011-07-25 20:21:16 -07:00
Friendika 06802dd8fe auto focus jot editor 2011-07-25 20:10:21 -07:00
Friendika ec52010e16 helper functions for Diaspora cert mangling 2011-07-25 19:57:17 -07:00
Friendika c0749f18d6 event ownership issues 2011-07-25 18:41:48 -07:00
Friendika 21058cdb47 provide ability to use different port 2011-07-25 15:43:28 -07:00
Friendika 60ff58d7be Merge branch 'pull' 2011-07-25 00:18:11 -07:00
Friendika f1115a1031 revup 2011-07-25 00:17:46 -07:00
fabrixxm 9f34f587ea Merge pull request #148 from fabrixxm/newacl
Remove "share" greyed text in jot editor when user reshare an item
2011-07-24 23:53:37 -07:00
Fabio Comuni 363c4c5798 Remove "share" greyed text in jot editor when user reshare an item 2011-07-25 08:56:51 +02:00
Friendika 57653f4fdf Merge branch 'pull' 2011-07-24 03:59:18 -07:00
Friendika 2e1f74397c revup 2011-07-24 03:58:48 -07:00
Tobias Diekershoff 855ce3263b Merge pull request #147 from tobiasd/master
link the community page in dispy when enabled
2011-07-24 02:17:11 -07:00
Tobias Diekershoff a09bdf5ad6 added link to community page to dispy theme menu 2011-07-24 11:07:39 +02:00
Tobias Diekershoff 4ba29089d2 Merge pull request #146 from tobiasd/master
hide the editor and controls if not with focus in dispy theme, resend works
2011-07-24 00:36:06 -07:00
Tobias Diekershoff a4f7e8e8fe dispy theme hide editor if without focus 2011-07-24 09:32:20 +02:00
Friendika 0fbaac59f0 revup 2011-07-23 00:22:25 -07:00
Friendika a486d2cd6a Merge pull request #145 from tobiasd/master
dispy ACL and addon license
2011-07-23 00:21:25 -07:00
Tobias Diekershoff abc01cad20 Merge branch 'master' of git://github.com/friendika/friendika 2011-07-23 07:43:25 +02:00
Tobias Diekershoff a213a9babf dispy ACL into the fancybox 2011-07-23 07:41:20 +02:00