Commit graph

24101 commits

Author SHA1 Message Date
Philipp
df04bd9dbe
Merge pull request #6792 from MrPetovan/bug/warnings
Fix allow_cid variable type in mod/network
2019-03-02 15:51:19 +01:00
Hypolite Petovan
062c41f626
Merge pull request #6790 from annando/issue-6788
Sent update mails to administrators only once
2019-03-02 09:35:59 -05:00
Hypolite Petovan
748a0ca21b Fix allow_cid variable type in mod/network
- Improve SQL query for network contacts
- Add missing query statement closure
- Addresses https://github.com/friendica/friendica/issues/6337#issuecomment-467111446
2019-03-02 09:28:37 -05:00
Hypolite Petovan
b01efc3ada
Merge pull request #6789 from nupplaphil/issue/6337-warnings
Check if user_info is an array before counting
2019-03-02 08:33:20 -05:00
Philipp Holzer
04b7280f38
Take void return into account 2019-03-02 14:23:46 +01:00
Michael
9427d7f628 We have to fetch the data this way 2019-03-02 13:07:29 +00:00
Michael
16c2ae89e8 Sent update mails to administrators only once 2019-03-02 12:57:47 +00:00
Philipp Holzer
6986e6902b
check if user_info is an array before counting 2019-03-02 11:55:51 +01:00
Tobias Diekershoff
b06fc57880
Merge pull request #6704 from tobiasd/20190220-credits
updated the credits
2019-03-02 08:35:53 +01:00
Tobias Diekershoff
2d1b166bbe adding changes till 2019-03-01 2019-03-02 08:25:28 +01:00
Hypolite Petovan
50a6058f66
Merge pull request #6786 from nupplaphil/issue/6758-console_storage
Fix handling table name during storage move
2019-03-01 16:53:55 -05:00
Philipp Holzer
16ff5af221
Fix handling table name during storage move 2019-03-01 18:07:08 +01:00
Hypolite Petovan
c079a35397
Merge pull request #6779 from nupplaphil/issue/6498-image_rotation
Adding updated field to photo table
2019-03-01 08:46:38 -05:00
Philipp Holzer
c9a7b8334a
Adding to database.sql too 2019-03-01 09:27:56 +01:00
Philipp Holzer
b4eef25d37
Adding updated field to photo table 2019-03-01 09:23:55 +01:00
Tobias Diekershoff
53952bb426
Merge pull request #6775 from annando/issue-6395
Issue 6395: Don't log details to avoid memory issues
2019-02-28 10:17:01 +01:00
Michael
0b2cdf5d26 Issue 6395: Don't log details to avoid memory issues 2019-02-28 09:07:24 +00:00
Tobias Diekershoff
3aad29358c
Merge pull request #6774 from MrPetovan/bug/6501-fix-reshare-to-diaspora
Improve reshare format to Diaspora destinations
2019-02-28 07:02:27 +01:00
Hypolite Petovan
9cdae18101 Improve reshare format for Diaspora destinations
- Add link to original post in post time
- Update optional bottom link label
2019-02-27 21:01:47 -05:00
Hypolite Petovan
fe8d5abe0a Replace strong by title format for item title in mod/share 2019-02-27 20:59:39 -05:00
Hypolite Petovan
fb965f4d81
Merge pull request #6773 from nupplaphil/issue/6772-update_query_missmatch
Update - query missmatch
2019-02-27 15:22:42 -05:00
Philipp Holzer
739449926c
'%' is deprecated 2019-02-27 20:30:08 +01:00
Philipp Holzer
4a47425bfd
admin mail list seems wrong escaped 2019-02-27 20:17:35 +01:00
Hypolite Petovan
c9ddbf247d
Merge pull request #6770 from nupplaphil/issue/reuse_strings_random
Reuse existing Strings::getRandomHex function
2019-02-27 12:56:40 -05:00
Hypolite Petovan
eacbc60ca7
Merge pull request #6768 from tobiasd/20190227-faq
added DiCa and Fedilab clients to the FAQ listed clients
2019-02-27 12:38:07 -05:00
Philipp Holzer
2b53784094
Reuse existing Strings::getRandomHex function 2019-02-27 18:32:25 +01:00
Tobias Diekershoff
be1c3fe3ed German ... m) 2019-02-27 18:10:37 +01:00
Tobias Diekershoff
5546215654 added DiCa and Fedilab clients to the FAQ listed clients 2019-02-27 16:33:18 +01:00
Philipp
f4dfd4f649
Merge pull request #6767 from MrPetovan/bug/fatal-errors
Replace isset by array_key_exists on array class constant in Model\Term
2019-02-27 14:20:25 +01:00
Hypolite Petovan
7684eae0c0
Merge pull request #6765 from nupplaphil/issue/6672-global_comm_silence
Hide silenced authors from public timeline
2019-02-27 08:04:57 -05:00
Hypolite Petovan
7217d24a97 Replace isset by array_key_exists on array class constant in Model\Term
- Addresses https://github.com/friendica/friendica/issues/6386#issuecomment-467835406
2019-02-27 08:00:04 -05:00
Tobias Diekershoff
2354184360
Merge pull request #6766 from nupplaphil/task/test_fix_namespace
Fix namespaces for Tests
2019-02-27 13:09:20 +01:00
Philipp Holzer
def502ae2d
Fix namespaces 2019-02-27 12:32:56 +01:00
Philipp Holzer
4c11255624
Hide silenced authors from public timeline 2019-02-27 11:41:57 +01:00
Tobias Diekershoff
1f27290494
Merge pull request #6764 from annando/worker2
Better worker lifetime check
2019-02-27 11:06:38 +01:00
Michael
c3b12b63c8 Added some description, changed logger call 2019-02-27 09:49:26 +00:00
Michael
505a34d40e Log the time as decimal 2019-02-27 09:12:40 +00:00
Michael
78960d4bde Removed unneeded spaces 2019-02-27 09:11:37 +00:00
Michael
5e440aa035 The cron interval is minutes - so we have to convert it into seconds 2019-02-27 08:55:25 +00:00
Michael
0ee1ea5f29 The log text is now shorter 2019-02-27 08:41:45 +00:00
Michael
11e39da6cc And moving the block back to the old place 2019-02-27 07:08:44 +00:00
Michael
e1cc7262de Respawing when quitting 2019-02-27 07:04:21 +00:00
Michael
528636c9f4 Using constants is nicer 2019-02-27 06:55:04 +00:00
Michael
fb371e1048 Merge remote-tracking branch 'upstream/2019.03-RC' into worker2 2019-02-27 06:41:14 +00:00
Michael
40573120b9 Enhanced logging, stopping worker after cron lifetime 2019-02-27 06:36:19 +00:00
Hypolite Petovan
ef0e734c82
Merge pull request #6761 from tobiasd/20190226-6532
fixing links in photoMenu
2019-02-26 07:02:15 -05:00
Tobias Diekershoff
bd7aaacfb0 fixing links in photoMenu 2019-02-26 10:19:08 +01:00
Tobias Diekershoff
8a6c75eab3 adding changes till 2019-02-25 2019-02-26 06:50:36 +01:00
Tobias Diekershoff
c62a3700ea
Merge pull request #6759 from MrPetovan/task/composer
[Composer] Update npm-asset/fullcalendar to version 3.10.0
2019-02-26 06:28:23 +01:00
Hypolite Petovan
39ff7de065 [Composer] Update npm-asset/fullcalendar to version 3.10.0
- Add now required explicit npm-asset/moment dependency for npm-asset/fullcalendar to work
2019-02-25 21:06:18 -05:00