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

21501 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael 4d4dd1a99c Some beautification 2018-10-12 20:52:22 +00:00
Michael 5af0ee1b95 We can now store it without any problem 2018-10-12 18:53:13 +00:00
Michael 914b3a9e3e Merge remote-tracking branch 'upstream/develop' into fix-diaspora-signature 2018-10-12 18:52:22 +00:00
Michael 1b18be6715 The virtuel fields for the diaspora signatures have to be removed at any time 2018-10-12 18:47:32 +00:00
Hypolite Petovan 10d194075e
Merge pull request #5894 from friendica/revert-5889-ap-store-diaspora 
Revert "We now store the diaspora comment data as well"
 2018-10-12 10:36:06 -04:00
Hypolite Petovan 986528b77f
Revert "We now store the diaspora comment data as well" 2018-10-12 10:35:43 -04:00
Jonny Tischbein 93ab82b7f0 Rename Contacts:content function 2018-10-11 23:45:01 +02:00
Jonny Tischbein ba95487abf Upate Contacts module file 2018-10-11 23:41:27 +02:00
Jonny Tischbein 80ea86113d Move mod Contacts to /src/Module 2018-10-11 23:14:12 +02:00
Hypolite Petovan 735a5980bd
Merge pull request #5889 from annando/ap-store-diaspora 
We now store the diaspora comment data as well
 2018-10-11 16:42:53 -04:00
Hypolite Petovan 90254fd74b
Merge pull request #5888 from nupplaphil/curl_result_tests 
Curl result tests
 2018-10-11 16:42:09 -04:00
Michael 8268288953 We now store the diaspora comment data as well 2018-10-11 20:38:57 +00:00
Hypolite Petovan fc19373ec4
Merge pull request #5887 from annando/ap-store-conversation 
Store conversation data directly from the AP receiver
 2018-10-11 16:32:00 -04:00
Philipp Holzer 5f9065e00a
smaller about.body 2018-10-11 22:21:05 +02:00
Philipp Holzer b099cba4b4
CurlResult Tests & RegEx fix 2018-10-11 22:18:27 +02:00
Michael 1bf7521af8 Store conversation data directly from the AP receiver 2018-10-11 20:08:04 +00:00
Philipp Holzer 00bf0c24b6
CurlResult Tests 2018-10-11 21:19:38 +02:00
Tobias Diekershoff 71a60c5f66
Merge pull request #5882 from MrPetovan/bug/fix-urlpath-determination 
Fix URLPath determination
 2018-10-11 15:38:37 +02:00
Hypolite Petovan ac1ff6c8ce Try additional $_SERVER properties to get relative path of Friendica 2018-10-11 08:54:45 -04:00
Hypolite Petovan a419eff23a Replace missing App->getURLPath in mod/install 2018-10-11 08:49:52 -04:00
Michael Vogel 339e76b314
Merge pull request #5880 from nupplaphil/friendica-5879 
Bugfixing CurlResult
 2018-10-11 07:46:07 +02:00
Philipp Holzer a95e7f6504
Bugfixing CurlResult 2018-10-11 07:45:04 +02:00
Hypolite Petovan a066befba5
Merge pull request #5878 from nupplaphil/curl_response_refactoring 
Curl response refactoring
 2018-10-10 18:31:49 -04:00
Philipp Holzer 9711581d49
Code standard 2018-10-10 22:51:26 +02:00
Philipp Holzer b2e7ce47b3
Renaming Curl to CurlResult 2018-10-10 22:08:13 +02:00
Philipp Holzer ffbc688797
Curl Response Refactoring 
- refactored Network::getCurl()
- replaced every Network::getCur() execution with a Curl Response
 2018-10-10 21:50:13 +02:00
Hypolite Petovan 67afa069ab
Merge pull request #5877 from annando/issue-5859 
Issue 5859: Avoid returning empty arrays
 2018-10-10 15:23:39 -04:00
Philipp Holzer 7c73e8634c
Curl Response Refactoring 
- refactored Network::post()
- replaced every Network::post() execution with the new Curl container
 2018-10-10 21:15:26 +02:00
Michael c4da138eee Issue 5859: Avoid returning empty arrays 2018-10-10 19:15:16 +00:00
Philipp Holzer 2dec8895a9
Curl Response Refactoring 
- extended Curl to parse Curl Response
- refactored Network::curl()
- replaced every Network::curl() execution with the new Curl container
 2018-10-10 21:08:43 +02:00
Hypolite Petovan 904fee3bed
Merge pull request #5876 from nupplaphil/friendica-5875 
Uncaught Error for getCurlCode()
 2018-10-10 12:18:11 -04:00
Philipp Holzer e6b1f9ef09
friendica-5875 Uncaught Error: Call to undefined method Friendica\App::getCurlCode() fixed 2018-10-10 18:10:38 +02:00
Hypolite Petovan b833930702
Merge pull request #5862 from nupplaphil/rename_App_Methods 
Rename app methods
 2018-10-10 08:17:39 -04:00
Philipp Holzer 97dc4bba1a
some more renamings & doku 2018-10-10 09:16:06 +02:00
Philipp Holzer 3d04562c87
some more renamings & doku 2018-10-10 08:54:18 +02:00
Philipp Holzer 307286fc47
parameters and getURLpath to getURLPath 2018-10-10 01:18:47 +02:00
Philipp Holzer 3eb4332f33
Bugfixing Backend 2018-10-10 01:16:51 +02:00
Philipp Holzer 8cc15fd2a8
Bugfixing DatabaseTest 2018-10-10 00:20:08 +02:00
Philipp Holzer 5a02e39a65
Rename App Methods 
- renamed a lot of App methods to CamelCase
- replaced direct public variables with get-/set-Methods
 2018-10-10 00:16:06 +02:00
Hypolite Petovan 5f9dd11cfb
Merge pull request #5867 from annando/ap-fix-follow 
AP: Switchting existing contacts to AP when receiving activities
 2018-10-09 16:08:38 -04:00
Hypolite Petovan c9f1857c4a
Merge pull request #5866 from annando/ap-cleanup 
AP: Avoid a misleading log entry / unneeded field removed
 2018-10-09 16:06:58 -04:00
Michael 0994aaf875 AP: Avoid a misleading log entry / unneeded field removed 2018-10-09 20:00:57 +00:00
Michael c0f26ace2e AP: Switchting existing contacts to AP when receiving activities 2018-10-09 19:58:15 +00:00
Hypolite Petovan 83dca0018d
Merge pull request #5865 from JonnyTischbein/issue_wrong_login_return 
Fix Login return with pop-up menu form
 2018-10-09 15:50:43 -04:00
Jonny Tischbein 2db2b79bfa Give Login Form previous URL to return to. SESSION var is empty if invalid page. empty args is catched by function 2018-10-09 21:38:17 +02:00
Hypolite Petovan b73dea95a4
Merge pull request #5864 from friendica/revert-5860-issue_comment_wrap 
Revert "Word Wrap for long words in comments"
 2018-10-09 15:25:18 -04:00
Hypolite Petovan 903290a764
Revert "Word Wrap for long words in comments" 2018-10-09 15:09:51 -04:00
Hypolite Petovan 257beec485
Merge pull request #5861 from JonnyTischbein/issue_return_url 
Replace goaway location SESSION var return_url with page as string value
 2018-10-09 14:46:14 -04:00
Jonny Tischbein 29033bdf05 goaway to network if deleted item + remove goaway for filerm 2018-10-09 20:44:30 +02:00
Jonny Tischbein d18421f760 Return to item if not owned by user or canceld 2018-10-09 20:40:25 +02:00