friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
14,633 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

14633 Commits

Author SHA1 Message Date
Hypolite Petovan 6a5b9dcd76 Merge pull request #3283 from annando/issue-2957-2 
Issue 2957: The avatar problem with mastodon should now be solved
 2017-04-02 08:56:35 -04:00
Michael 94f3f0887b Issue 2957: The avatar problem with mastodon should now finally be solved 2017-04-02 12:37:22 +00:00
Tobias Diekershoff ed3aa9fa73 Merge pull request #3282 from annando/1704-platform-name 
Show real platform names
 2017-04-02 10:03:57 +02:00
Michael 54f49169d4 Show real platform names 2017-04-02 07:53:55 +00:00
Hypolite Petovan 2952e2b3e4 Merge pull request #3281 from annando/issue-3206-2957 
Mastodon: plink for reshares, missing hostnames for avatars
 2017-04-01 21:24:28 -04:00
Michael 07fd61b912 Mastodon: plink for reshares, missing hostnames for avatars 2017-04-01 23:39:19 +00:00
Hypolite Petovan 7cd795d795 Merge pull request #3280 from annando/issue-3142-2 
Issue 3142: mcrypt is no more (as well as phpseclib)
 2017-04-01 14:32:27 -04:00
Michael 240a0961c6 Standards ... 2017-04-01 17:08:11 +00:00
Michael 648d5bd047 More mcrypt is removed 2017-04-01 10:07:12 +00:00
Michael 16d4392573 Documentation added 2017-04-01 09:05:56 +00:00
Michael f6d7ee2781 Issue 3142: mcrypt is no more (as well as phpseclib) 2017-04-01 08:28:42 +00:00
Hypolite Petovan d301a363b0 Merge pull request #3277 from annando/issue-3142 
Replaces mcrypt with phpsec.
 2017-03-31 11:02:30 -04:00
Michael 3796a141c6 We don't need this include anymore 2017-03-31 06:25:48 +00:00
Michael 1560534621 Now it's openssl - and no copy&paste failure anymore 2017-03-31 06:22:43 +00:00
Michael 973fcd3624 Test with OpenSSL 2017-03-30 23:21:52 +00:00
Michael 54c8fb2bb8 Replaces mcrypt with phpsec. 2017-03-30 18:29:12 +00:00
Michael Vogel a4255de1e2 Merge pull request #3275 from tobiasd/20170327-es 
ES translation THX Albert
 2017-03-28 06:18:58 +02:00
Hypolite Petovan bb559aaf30 Merge pull request #3276 from annando/issue-2959 
Reestablish the communication with Mastodon
 2017-03-27 23:44:09 -04:00
Michael 4fc1ebd4ea Doing some Hypolyzation 2017-03-27 21:02:56 +00:00
Michael c85331d8ac Reestablish the communication with Mastodon 2017-03-27 20:58:15 +00:00
Tobias Diekershoff 4720778edc ES translation THX Albert 2017-03-27 22:06:56 +02:00
Tobias Diekershoff 8580cd87a6 Merge pull request #3271 from Hypolite/issue/#3189 
Fix Diaspora code blocks being mangled
 2017-03-27 09:26:39 +02:00
Tobias Diekershoff 0cf000469e Merge pull request #3272 from annando/issue-2364 
Only import new OStatus posts if they are from our followers
 2017-03-27 09:24:41 +02:00
Michael fa7721c735 Prevent Hypolite from doing comments about standards ;-) 2017-03-27 06:11:45 +00:00
Michael 364d88fa70 Only import new OStatus posts if they are from our followers 2017-03-27 05:33:43 +00:00
Hypolite Petovan 55e4bab00e Improve babel page display for diaspora2bb mode 
- Fix formatting
 2017-03-26 19:06:22 -04:00
Hypolite Petovan 3e285a690a Fix Diaspora code blocks being mangled 
- Remove whitespace removal code from `diaspora2bb()`
- Add code block skipping the HTML transforms removing whitespace in
`htm2bbcode()`
 2017-03-26 19:00:04 -04:00
Hypolite Petovan b952b22735 Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-03-26 18:59:32 -04:00
Hypolite Petovan 9dd6998126 Merge pull request #3270 from annando/1703-no-spam 
The "spam" libary is not in use, so we remove it completely
 2017-03-26 10:35:42 -04:00
Michael 68cfe9c7fe library/oauth.php is not in use as well. 2017-03-26 14:19:34 +00:00
Michael a06bbd809a The "spam" libary is not in use, so we remove it completely 2017-03-26 14:06:26 +00:00
Hypolite Petovan 8cb9d51fa8 Merge pull request #3269 from annando/1703-nodeinfo 
We now return basic system data via nodeinfo at every time.
 2017-03-26 09:24:42 -04:00
Michael 8fe1fc2f52 Remove parendingsdas 2017-03-26 13:12:02 +00:00
Michael 92f5315320 We now return basic system data via nodeinfo at every time. 2017-03-26 12:51:25 +00:00
Tobias Diekershoff 632be78b55 Merge pull request #3267 from annando/issue-3248 
Issue 3248: Make communityhome work again.
 2017-03-26 08:03:46 +02:00
Michael 4168d47ecd Issue 3248: Make communityhome work again. 2017-03-26 05:29:24 +00:00
Hypolite Petovan 7850abcee3 Merge branch 'develop' of https://github.com/friendica/friendica into develop 2017-03-25 20:16:27 -04:00
Hypolite Petovan 632d77cfb1 Merge pull request #3251 from rabuzarus/20170320_-_fix_fbrowser 
Bugfix: fbrowser did insert 2 Pictures instead of only 1
 2017-03-25 16:13:31 -04:00
rabuzarus 8bbf43b9dd Remove the AjaxUpload element when jot modal is closed 2017-03-25 21:10:57 +01:00
Hypolite Petovan f6ef6f0c7a Merge remote-tracking branch 'refs/remotes/friendica/develop' into develop 2017-03-25 16:09:10 -04:00
Hypolite Petovan 91eeb30bf9 Merge pull request #3265 from annando/1703-remove-linefeeds 
Remove unneeded linefeeds in HTML output
 2017-03-25 16:06:53 -04:00
Hypolite Petovan f1a75a57fe Merge pull request #3257 from annando/1703-gcontact 
Improved gcontact handling
 2017-03-25 15:35:41 -04:00
Michael 18a2b48d1d Remove unneeded linefeeds 2017-03-25 19:31:32 +00:00
Michael 585c2119d7 Remove the "call by reference" 2017-03-25 18:00:56 +00:00
Michael 444de52859 Use of exceptions 2017-03-25 16:56:04 +00:00
Tobias Diekershoff 6e35c49cb9 Merge pull request #3263 from annando/1601-api-statuses-lookup 
More GNU Social compatibility for the API
 2017-03-25 16:26:21 +01:00
Tobias Diekershoff 81eec6b2b5 Merge pull request #3264 from annando/1703-avoid-api-error 
Avoid API error when calling "/api/friendica/profile/show"
 2017-03-25 16:25:20 +01:00
Michael adf9ed64bb Avoid API error when calling "/api/friendica/profile/show" 2017-03-25 14:16:21 +00:00
Michael a9dfd1fcb7 One more API call added 2017-03-25 11:31:31 +00:00
Michael 4665cda00e Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup 2017-03-25 11:25:47 +00:00