1
0
Fork 0
Commit graph

475 commits

Author SHA1 Message Date
Hypolite Petovan
ea88e15a8c Merge pull request #3473 from Quix0r/rewrites/coding-convention-split2-6-2
Coding convention applied split 2-6-2 (of 2-14-2)
2017-06-18 18:44:34 -04:00
e33ac224b0 Now the Salmons flys 2017-06-17 08:58:28 +00:00
2ee8d1694f Added documentation 2017-06-16 21:01:56 +00:00
9c4bf6b0d5 The new envelope could work now 2017-06-16 20:57:35 +00:00
c031482d7d "unsharing" is now done different 2017-06-16 16:39:17 +00:00
0dc1c932f8 We now should send all data in the new format 2017-06-16 05:21:25 +00:00
a453ae4f66 Removed unneeded stuff 2017-06-15 21:45:36 +00:00
f36ffe3c03 Just some more message types 2017-06-15 21:20:18 +00:00
6482495001 We now use the new Diaspora format while sending 2017-06-15 20:50:53 +00:00
4e49939421
Merge remote-tracking branch 'upstream/develop' into rewrites/coding-convention-split2-6-2
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-06-13 23:26:06 +02:00
Hypolite Petovan
9c0d2c31e8 Replace AND and OR in PHP conditions by && and || 2017-06-07 22:00:59 -04:00
f3d8da7d33 Merge branch 'master' into develop 2017-06-06 12:20:55 +02:00
696404739b Bugfix Diaspora: We exited with the wrong return values and the guid for messages was too short 2017-05-17 19:25:30 +00:00
0394004fee
reverted comments, but maintained multi-line comment.
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 18:11:22 +02:00
f55ea4bc83
tpzo fixed again ...
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 18:02:44 +02:00
afb430b908
tpzo fixed
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 15:41:01 +02:00
031d96d933
improved some comments
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-05-17 15:28:01 +02:00
f66c5c6823
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-05-17 15:07:31 +02:00
701e761c68
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-05-16 14:37:12 +02:00
Michael Vogel
6680ce1dd7 Merge pull request #3445 from Hypolite/improvement/move-probe-to-src
Move Probe to src
2017-05-07 23:14:22 +02:00
Hypolite Petovan
3a2988c3fd Rename include/Scrape to include/probe 2017-05-07 14:45:19 -04:00
Hypolite Petovan
1c38540f20 Merge pull request #3444 from annando/1705-mail-duplicates
Mails shouldn't be duplicated anymore when sending
2017-05-07 13:45:34 -04:00
824141d3e5 Mails shouldn't be duplicated anymore when sending 2017-05-07 17:11:09 +00:00
Hypolite Petovan
86cae070f2 Merge branch 'develop' into improvement/move-app-to-src-2 2017-05-07 12:58:11 -04:00
eb0a701590 Just some more fixes to the protocol and the avatar stuff 2017-05-07 15:58:32 +00:00
ee817e81a2 Bugfix: Status messages had used the wrong field / rearranges parameter order 2017-05-07 14:36:50 +00:00
aa88691bc1 Diaspora: Accept new Salmon format 2017-05-07 13:11:11 +00:00
65823fe28f Standards and documentation 2017-05-04 05:11:19 +00:00
a9c263a375 Retraction does now work as well 2017-05-03 19:55:33 +00:00
d7b56db996 Diaspora: Better handling for unrelayed comments and likes 2017-05-03 19:28:51 +00:00
e1ab0c9475 Now comments are really working 2017-05-03 05:22:39 +00:00
Hypolite Petovan
1d427aa214 Standards: Remove EOF closing PHP tags 2017-05-02 23:36:56 -04:00
Hypolite Petovan
20043914e6 Move App to src
- Add `use Friendica\App;` wherever needed
2017-05-02 22:59:36 -04:00
Hypolite Petovan
56ee734b00 Cleanup /format pre-move 2017-05-02 22:59:24 -04:00
83e50385a8 Hopefully this fixes the workflow 2017-05-02 21:06:56 +00:00
99a54df8d8 Follow up for PR 3421 - some improvements 2017-05-02 19:48:11 +00:00
f639a86d02 Comments from unknown people never reached us 2017-05-02 18:42:01 +00:00
7240b2198b Missed protocol ... 2017-04-28 06:03:04 +00:00
35dc56c9c2 Salmons with Mastodon seem to work now 2017-04-27 20:38:46 +00:00
ec57babf89
added spaces + some curly braces + some usage of dbm::is_result()
Signed-off-by: Roland Haeder <roland@mxchange.org>
2017-04-20 22:59:08 +02:00
Alexandre Alapetite
d2901dcb00 Fix for MySQL 5.7+
https://github.com/friendica/friendica/issues/2786

Only tested on Ubuntu 16.10 with MySQL 5.7.17.

https://dev.mysql.com/doc/refman/8.0/en/timestamp-initialization.html

https://dev.mysql.com/doc/refman/8.0/en/sql-mode.html#sqlmode_no_zero_date
As of MySQL 5.7.4, NO_ZERO_DATE is deprecated.

Patch based on the following search & replace (and then reverting some
changes in libraries):

```sh
grep -l '= "0000-00-00"' -r . | xargs sed -i -e "s/= \"0000-00-00\"/=
'0000-00-00'/g"

grep -l "0000-00-00" -r . | xargs sed -i -e "s/0000-00-00/0001-01-01/g"

grep -l "!= '0001-01-01'" -r . | xargs sed -i -e "s/!= '0001-01-01'/>
'0001-01-01'/g"

grep -l " === '0001-01-01'" -r . | xargs sed -i -e "s/ === '0001-01-01'/
<= '0001-01-01'/g"

grep -l " == '0001-01-01'" -r . | xargs sed -i -e "s/ == '0001-01-01'/
<= '0001-01-01'/g"

grep -l "strpos(\$dob, '0000-') === 0" -r . | xargs sed -i -e
"s/strpos(\$dob, '0000-') === 0/strpos(\$dob, '0000-') === 0 ||
strpos(\$dob, '0001-') === 0/g"

grep -l 'array("", "0001-01-01")' -r . | xargs sed -i -e 's/array("",
"0001-01-01")/array("", "0000-00-00", "0001-01-01")/g'

grep -l "\$dob = '0000-'" -r . | xargs sed -i -e "s/\$dob =
'0000-'/\$dob = '0001-'/g"
```
2017-04-11 23:00:45 +02:00
f6d7ee2781 Issue 3142: mcrypt is no more (as well as phpseclib) 2017-04-01 08:28:42 +00:00
3796a141c6 We don't need this include anymore 2017-03-31 06:25:48 +00:00
1560534621 Now it's openssl - and no copy&paste failure anymore 2017-03-31 06:22:43 +00:00
973fcd3624 Test with OpenSSL 2017-03-30 23:21:52 +00:00
54c8fb2bb8 Replaces mcrypt with phpsec. 2017-03-30 18:29:12 +00:00
bc517ef3d2 Remove reduncancies 2017-03-22 05:26:44 +00:00
Hypolite Petovan
7b352f3f74 Revert "Coding convention applied - part 1" 2017-03-21 12:02:59 -04:00
951006dd10
more spaces + some curly spaces added
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:51:54 +01:00
41a36606c6
added spaces + some curly braces
Signed-off-by: Roland Häder <roland@mxchange.org>
2017-03-19 00:50:19 +01:00