marcusxs/friendica
1
0
Fork 0
forked from friendica/friendica
Code Pull requests Activity
21,100 commits 3 branches 67 tags 205 MiB
Commit graph

2,012 commits

Author SHA1 Message Date
Hypolite Petovan
07da170bcf
 		Merge pull request #5905 from nupplaphil/move_global_functions 
Move global functions
 2018-10-13 19:46:57 -04:00
Philipp Holzer
4f7cb049fb
 		isAjax bugfix 2018-10-13 19:10:46 +02:00
Michael Vogel
514ec1be6d
 		Merge pull request #5903 from nupplaphil/move_module_acctlink 
Move module AcctLink
 2018-10-13 19:09:59 +02:00
Philipp Holzer
3f729df258
 		Renamed AcctLink to Acctlink 2018-10-13 19:03:38 +02:00
Philipp Holzer
2c541afd47
 		Moved functions out of boot.php into class 
- z_root() => $a->getBaseURL()
- absurl() => removed because no usage
- is_ajax() => $a->isAjax()
- current_load() => System::currentLoad()
- argc() => $a->argc
- argv($x) => $a->getArgumentValue($x)
 2018-10-13 19:03:08 +02:00
Philipp Holzer
508032cf9a
 		Move Module AcctLink 2018-10-13 18:32:14 +02:00
Michael
d23386f9b2 Catching error when compacting doesn't work 2018-10-13 13:17:10 +00:00
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
986528b77f
 		Revert "We now store the diaspora comment data as well" 2018-10-12 10:35:43 -04: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
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
Hypolite Petovan
ac1ff6c8ce Try additional $_SERVER properties to get relative path of Friendica 2018-10-11 08:54:45 -04: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
Philipp Holzer
e6b1f9ef09
 		friendica-5875 Uncaught Error: Call to undefined method Friendica\App::getCurlCode() fixed 2018-10-10 18:10:38 +02: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
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
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
Michael
b5d73f840c AP fixes: LD-signature, wrong owner for completed thres, account removal 2018-10-09 05:04:24 +00:00
Michael
4047952703 AP: Avoid an empty avatar field 2018-10-08 03:28:49 +00:00
Hypolite Petovan
3bccaccede
 		Merge pull request #5848 from nupplaphil/friendica-5847 
friendica-5847 Console Cache List command doesn't work
 2018-10-07 17:47:51 -04:00
Hypolite Petovan
28b4fdb1c3
 		Merge pull request #5854 from annando/ap-parser 
We now parse a compacted JSON
 2018-10-07 17:42:03 -04:00
Michael
30ad6d60fd Duplicated line removed 2018-10-07 20:51:39 +00:00
Michael
46f77f3486 Detect the object type 2018-10-07 20:36:15 +00:00
Philipp Holzer
7da6da6666
 		Bugfixings for getAllKeys() 2018-10-07 22:14:05 +02:00
Michael
93866b477a Several fixes 2018-10-07 19:42:04 +00:00
Michael
bd6ba98e8d Some more cleanup 2018-10-07 18:41:45 +00:00
Michael
1efca1b75d owner is now actor 2018-10-07 17:35:43 +00:00