1
1
Fork 0
Commit graph

5024 commits

Author SHA1 Message Date
8580cd87a6 Merge pull request #3271 from Hypolite/issue/#3189
Fix Diaspora code blocks being mangled
2017-03-27 09:26:39 +02:00
fa7721c735 Prevent Hypolite from doing comments about standards ;-) 2017-03-27 06:11:45 +00:00
364d88fa70 Only import new OStatus posts if they are from our followers 2017-03-27 05:33:43 +00: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
f1a75a57fe Merge pull request #3257 from annando/1703-gcontact
Improved gcontact handling
2017-03-25 15:35:41 -04:00
585c2119d7 Remove the "call by reference" 2017-03-25 18:00:56 +00:00
444de52859 Use of exceptions 2017-03-25 16:56:04 +00:00
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
adf9ed64bb Avoid API error when calling "/api/friendica/profile/show" 2017-03-25 14:16:21 +00:00
a9dfd1fcb7 One more API call added 2017-03-25 11:31:31 +00:00
4665cda00e Merge remote-tracking branch 'upstream/develop' into 1601-api-statuses-lookup 2017-03-25 11:25:47 +00:00
0d49143a63 "no_utf" wasn't in use anymore - it is now removed completely 2017-03-25 10:51:00 +00:00
a419bbe7c7 Hypolite is right (not always, but in this case) 2017-03-25 10:11:02 +00:00
5060300138 Reset the static variable $baseurl 2017-03-25 10:07:45 +00:00
Hypolite Petovan
29fb28de43 Remove Embedly integration
- Remove admin setting input
2017-03-25 01:57:19 -04:00
Hypolite Petovan
b9f4a6e4f0 Code cleanup + standards 2017-03-25 01:54:16 -04:00
b7242c3fa0 poco_last_updated is optimized 2017-03-23 22:56:22 +00:00
2ce5ab1467 removed commented out line 2017-03-23 07:36:22 +00:00
5b6215d7bd Better server_url handling 2017-03-23 07:34:45 +00:00
c25af197c9 baseurl should now be set correctly at all the time. 2017-03-23 07:10:22 +00:00
26ec56dfa5 server_url was forgotten 2017-03-23 06:45:00 +00:00
9e5bec1bc8 "poco_check" is now replaced and removed 2017-03-23 06:23:23 +00:00
8e240a1e8c New function to validate gcontact array data 2017-03-22 23:13:32 +00:00
1d6910277d Remove more deprecated "poco_check" calls 2017-03-22 07:11:58 +00:00
bc517ef3d2 Remove reduncancies 2017-03-22 05:26:44 +00:00
a376f55c1f Linefeed added 2017-03-21 22:06:57 +00:00
Michael Vogel
4ebebe96fe Merge branch 'develop' into 1703-worker-splitting 2017-03-21 17:08:07 +01:00
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
Michael Vogel
5a6da8b447 Merge branch 'develop' into 1703-worker-splitting 2017-03-21 16:38:59 +01:00
f7b0c2082b Some standards 2017-03-21 15:24:49 +00:00
9c16b47f55 Strange comment removed 2017-03-21 15:15:58 +00:00
Hypolite Petovan
9c2c483996 Merge pull request #3112 from Quix0r/rewrites/coding-convention
Coding convention applied - part 1
2017-03-21 10:19:53 -04:00
19825eddf7 Changed probing call. Removed dupolicated code. 2017-03-21 13:43:53 +00:00
be9db7f060 Merge remote-tracking branch 'upstream/develop' into 1703-worker-splitting 2017-03-21 07:59:14 +00:00
74cc5ade0c Worker processes are split into many more separate tasks 2017-03-21 07:57:09 +00:00
0fd874a683 Merge pull request #3246 from annando/1701-poco
Split poco discovery in smaller function calls
2017-03-21 07:27:10 +01:00
09851331a9
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-03-20 20:51:32 +01:00
rabuzarus
0879b46125 add NULL_DATE & coding standard work 2017-03-20 16:59:21 +01:00
rabuzarus
0060e2449e Merge develop into 20170316_-_fix_event_edit
Conflicts:
	mod/events.php
2017-03-20 16:46:36 +01:00
b42a977894 Bugfix for issue 3242 - forgotten "use" 2017-03-19 22:58:35 +00:00
41ee4ec60a Standards and just some more poco slitting 2017-03-19 21:32:11 +00:00
e684fff477 Added documention 2017-03-19 18:24:49 +00:00
2615d40d6b Split the POCO discovery process in several small processes 2017-03-19 17:43:59 +00:00
7f61b2ee15 Merge remote-tracking branch 'upstream/develop' into 1701-poco
Conflicts:
	include/socgraph.php
2017-03-19 15:36:41 +00:00
Hypolite Petovan
65f809f5cb Merge pull request #3245 from annando/issue-3242
Issue 3242: Define a maintenance reason
2017-03-19 11:06:25 -04:00
e93825b9f0 Some more standards 2017-03-19 14:43:24 +00:00
8dd732a896 Issue 3242: Define a maintenance reason 2017-03-19 13:24:07 +00:00
b06d787130 Merge remote-tracking branch 'upstream/develop' into 1702-null-date 2017-03-19 08:06:02 +00:00
132688d663 Standards, what else? 2017-03-19 08:04:04 +00:00
e9b083d13d
You shoudln't use a text variable like an array. 2017-03-19 01:23:34 +01:00