clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,602 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

10602 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Vogel bacd71e1c6 Replace random strings with guids where appropriate. 2015-08-14 07:48:28 +02:00
Michael Vogel 43fda0d626 Merge remote-tracking branch 'upstream/develop' into 1508-random-becomes-guid 2015-08-14 07:19:11 +02:00
Tobias Diekershoff cdfc7187e5 Merge pull request #1819 from annando/1508-subdomain 
Bugfix: There were problems with Friendica installed in subdirectories
 2015-08-14 05:29:49 +02:00
Tobias Diekershoff 59843c2683 Merge pull request #1818 from annando/1508-diaspora-messages 
Bugfix: Conversations with Diaspora now work reliable
 2015-08-14 05:29:40 +02:00
Michael Vogel a2d742ec91 For unique values we should use our guid function - not the random function 2015-08-14 00:40:36 +02:00
Michael Vogel 0e9b2c132a Bugfix: There are some problems with Friendica installed in subdirectories 2015-08-14 00:13:23 +02:00
Michael Vogel 887372a0d7 Bugfix: Conversations with Diaspora now work reliable 2015-08-13 22:49:57 +02:00
Tobias Diekershoff 55ad7f9199 Merge pull request #1816 from tobiasd/messages_20150813 
base messages.po updated
 2015-08-13 12:11:32 +02:00
Tobias Diekershoff bb197eee2d base messages.po updated 2015-08-13 11:58:41 +02:00
Michael Vogel 4663df5b2b Merge pull request #1812 from tobiasd/20150812-adminqueue 
queue inspector
 2015-08-13 08:05:00 +02:00
Tobias Diekershoff 645dc13455 Merge pull request #1813 from annando/1508-newguid 
Diaspora now uses a 32 digit guid.
 2015-08-13 06:22:19 +02:00
Michael Vogel bb7ec55f1f Diaspora now uses a 32 digit guid. 2015-08-12 23:37:50 +02:00
Tobias Diekershoff 5013e5daf1 use to link to queue inspector 2015-08-12 19:58:53 +02:00
Tobias Diekershoff f8afddef0f Merge pull request #1811 from annando/1508-real-contacts 
Only show real contacts (Friendica, Diaspora, OStatus) on profile page
 2015-08-12 18:02:28 +02:00
Michael Vogel d5ba3b3b54 Only show real contacts (Friendica, Diaspora, OStatus) on profile page (no Twitter, Facebook, ...) 2015-08-12 17:48:06 +02:00
Tobias Diekershoff f439ac47c4 admin panel: inspect queue 2015-08-12 15:44:59 +02:00
Tobias Diekershoff 6b93325f70 make Inspect Queue link visible in admin adide menu 2015-08-12 15:44:03 +02:00
Tobias Diekershoff 9d0786531d Merge pull request #1810 from annando/issue-1739 
Contact requests now contain more information.
 2015-08-12 08:17:27 +02:00
Tobias Diekershoff a784762d21 Merge pull request #1809 from annando/issue-1491 
We need to generate a new guid to make Diaspora work
 2015-08-12 08:16:22 +02:00
Michael Vogel a0f69dc92c Contact requests now contain more information. 2015-08-12 08:07:21 +02:00
Tobias Diekershoff 4bd061eb9d Merge pull request #1806 from annando/1408-nodeinfo 
Support for the upcoming "nodeinfo" feature
 2015-08-12 06:46:32 +02:00
Tobias Diekershoff b4845230bf Merge pull request #1808 from annando/issue-1421 
The temp path now contains the host name
 2015-08-12 06:34:19 +02:00
Tobias Diekershoff 9381a8cd1c Merge pull request #1807 from annando/issue-1733 
CSS improved for issue 1733
 2015-08-12 06:32:12 +02:00
Michael Vogel d5f2d9b39a Bugfix ... 2015-08-11 23:50:31 +02:00
Michael Vogel 9eca83e29c See issue 1491: We need to generate a new guid to make Diaspora work 2015-08-11 23:44:00 +02:00
Michael Vogel 59b2891737 The temp path now contains the host name. That should help with servers with multiple installations 2015-08-11 23:26:00 +02:00
Michael Vogel e1088210a6 CSS improved 2015-08-11 22:47:37 +02:00
Michael Vogel bf9ab389a2 Just some removed blanks 2015-08-11 20:16:53 +02:00
Michael Vogel c18c598baf Nodeinfo: Include the sitename 2015-08-11 10:23:33 +02:00
Michael Vogel 986eee48ac Some corrections in the addon names 2015-08-11 00:37:27 +02:00
Michael Vogel e60456fb66 Metadata should be an object. 2015-08-10 23:11:07 +02:00
Michael Vogel 6aeb4c0ad7 Corrected the output 2015-08-10 21:54:57 +02:00
Michael Vogel 820ded2c2d Support for the new nodeinfo protocol that will replace statistics.json 2015-08-10 21:33:57 +02:00
Tobias Diekershoff 8f5d2471dd Merge pull request #1804 from annando/1508-public-relay 
First steps for a relay for public posts
 2015-08-10 14:36:53 +02:00
Michael Vogel c8e0685788 Merge remote-tracking branch 'upstream/develop' into 1508-public-relay 2015-08-10 10:52:54 +02:00
Tobias Diekershoff c076c56016 Merge pull request #1802 from annando/1508-valid-username 
On OStatus and Diaspora the usernames mustn't contain "-"

I don't like it, but if GNU Social and Diaspora have this limitation...
 2015-08-10 08:49:56 +02:00
Tobias Diekershoff 6cfe7b698e Merge pull request #1803 from annando/1508-accessibility 
Improved accessibility
 2015-08-10 08:48:48 +02:00
Michael Vogel b24453f8da Messages are now sent to the relay server - and the options are configurable 2015-08-09 20:39:11 +02:00
Michael Vogel 65921bf2e7 Posts from Diaspora are always accepted for the global contact 2015-08-09 14:28:59 +02:00
Michael Vogel ea14f7e716 Duepontozero now has accesskeys as well. 2015-08-09 12:19:15 +02:00
Michael Vogel a694ea8b77 Quattro added 2015-08-09 09:56:55 +02:00
Michael Vogel d500ea4324 Some more accesskeys for Quattro 2015-08-09 09:55:51 +02:00
Michael Vogel d65d74d460 Added the changes in quattro as well 2015-08-09 09:28:10 +02:00
Michael Vogel 811e4b6ba1 Documentation for accesskeys added 2015-08-09 09:16:45 +02:00
Michael Vogel 8974c147e0 First steps for a public relay for posts. 2015-08-09 08:31:42 +02:00
Michael Vogel ccaeb00973 Better link descriptions. 2015-08-08 22:30:43 +02:00
Michael Vogel 2356d6a9ae On OStatus and Diaspora the usernames mustn't contain "-" - so we adopt this here. 2015-08-08 17:45:18 +02:00
Michael Vogel b4d09777b9 Added many accesskeys ... 2015-08-08 17:33:43 +02:00
Tobias Diekershoff eace95866b Merge pull request #1801 from fabrixxm/feature-pjs 
small fixes
 2015-08-06 16:41:39 +02:00
fabrixxm e94e6d7500 escape user data to sql 2015-08-06 16:08:14 +02:00