Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-10-30 08:44:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
35377 commits 3 branches 64 tags 241 MiB
Commit graph

35377 commits

This branch
This branch
All branches
Author SHA1 Message Date
Philipp Holzer
e2f69a04b9
trim whitespaces 2019-04-13 20:57:21 +02:00
Philipp Holzer
fbd056327a
DBA-Logger fix 2019-04-13 20:46:58 +02:00
Philipp
c3f49b7151
Merge pull request #7003 from MrPetovan/bug/7001-prevent-ajax-page_end 
Only call page_end hooks for standalone pages (no Ajax)
 2019-04-13 18:07:42 +02:00
Hypolite Petovan
a55efbab7a Only call page_end hooks for standalone pages (no Ajax) 2019-04-13 10:32:15 -04:00
Hypolite Petovan
49d12b5fae Remove probing in magic link construction 
- Use Contact::getProbeDataFromDatabase and Contact::magicLinkByContact instead of Contact::getIdForURL and Contact::magicLinkbyId in Contact::magicLink
- Add default value for $cid parameter in Contact::getProbeDataFromDatabase
 2019-04-12 08:50:44 -04:00
Hypolite Petovan
2133decf4c
Merge pull request #6996 from BinkaDroid/patch-1 
fixing error "json not defined" in frio
 2019-04-12 08:32:29 -04:00
BinkaDroid
2dbeae701f
fixing error "json not defined" in frio 
when trying to attach video-link to post
 2019-04-11 21:37:58 +02:00
Hypolite Petovan
75387ea171
Merge pull request #6991 from fabrixxm/fix/invalid-storage-on-legacy 
Allow set empty string storage class for legacy
 2019-04-11 09:04:48 -04:00
Philipp
33ec318ca6
Merge pull request #6995 from MrPetovan/bug/6937-fix-checkBackend 
Fix check backend
 2019-04-11 12:53:06 +02:00
Hypolite Petovan
900074d117 Move App->checkBackend after module determination 
- Update App->checkBackend to remove dependency to App properties
 2019-04-11 05:27:26 -04:00
Hypolite Petovan
9162f714e0 Add uri to missing session data logging context in Session handlers 2019-04-11 05:26:37 -04:00
fabrixxm
d2e43619b3 Code standards 2019-04-11 10:44:28 +02:00
Hypolite Petovan
6a2c0b3cc7
Merge pull request #6989 from nupplaphil/task/basePath_baseUrl_fix 
Automatic BaseURL determination fix
 2019-04-11 04:07:20 -04:00
Philipp Holzer
dc48690ed5
Remove hostname blacklisting 2019-04-11 00:09:59 +02:00
fabrixxm
5a07afbc14 Use direct logic 2019-04-10 20:57:22 +02:00
Philipp Holzer
1dd1684885
Hardening save method in BaseURL 2019-04-10 20:38:39 +02:00
Philipp
a65a30b303
Merge pull request #6993 from annando/cron-interval 
Added missing "cron_interval" default value
 2019-04-10 11:14:42 +02:00
Michael
2711284827 Added missing "cron_interval" default value 2019-04-10 06:41:57 +00:00
fabrixxm
47aa9daf5a Tweak storage selection in admin page 
Don't call `StorageManager::setBackend()` on save when legacy is selected,
dont't show legacy option in selectbox after backend is changed from legacy
 2019-04-10 08:40:50 +02:00
fabrixxm
72bee45079 Revert b2794bb2c 'Allow set empty string storge class for legacy' 2019-04-10 08:35:44 +02:00
Hypolite Petovan
20bc12157e
Merge pull request #6992 from annando/fix-warning 
Fix warnings
 2019-04-09 15:03:05 -04:00
Michael
4e9316fc15 Fix warnings 2019-04-09 17:58:28 +00:00
fabrixxm
b2794bb2c9 Allow set empty string storge class for legacy 
Legacy storage is defined by an empty string.
`StorageManager::setBackend()` now accept an empty string as a valid
backend storage.
 2019-04-09 16:32:15 +02:00
Hypolite Petovan
3aa8a255c9
Merge pull request #6988 from annando/fetchprofile 
Fetch profile data from different contact tables
 2019-04-09 09:06:11 -04:00
Hypolite Petovan
4b80b7caea
Merge pull request #6784 from nupplaphil/task/image_to_model 
Delete deprecated method Image::storePhoto()
 2019-04-09 09:01:39 -04:00
Michael
8748aff110 Avoid some more warning 2019-04-09 11:44:35 +00:00
Michael
d58147413f Avoid update of non native contacts, fix most warnings 2019-04-09 11:28:45 +00:00
Michael
00071abf51 Merge remote-tracking branch 'upstream/develop' into fetchprofile 2019-04-09 10:29:53 +00:00
Michael
84a6e390ab Fetch data from the given contact number, if already present 2019-04-09 08:47:57 +00:00
Michael
bca7419987 Avoid overwriting existing contacts with bad data 2019-04-09 08:35:29 +00:00
Philipp Holzer
ac57f55868
Delete deprecated method for photo 2019-04-09 08:52:21 +02:00
Philipp Holzer
40c075cf47
BaseURL hardening 2019-04-09 08:48:04 +02:00
Philipp Holzer
e69138039a
fix api dataset for test 2019-04-09 08:41:26 +02:00
Philipp Holzer
63660b6fc0
Removed unnecessary class 2019-04-09 08:31:19 +02:00
Philipp Holzer
edd4f06ad0
Adding tests 2019-04-09 08:31:18 +02:00
Philipp Holzer
318a3ca785
Create own base URL class which holds the whole base url business logic 2019-04-09 08:31:16 +02:00
Michael
e268b50890 Updated database structure file 2019-04-09 05:50:51 +00:00
Hypolite Petovan
6ea531d2f8
Merge pull request #6990 from annando/fix-warning 
Fix warning
 2019-04-09 01:29:00 -04:00
Michael
1b339547f3 Fix warning 2019-04-09 05:17:02 +00:00
Michael
90eea919a4 New contact field "updated", fix warnings 2019-04-09 05:15:23 +00:00
Michael
a2ca14def4 Removed a worker call - this needs more work 2019-04-08 21:35:00 +00:00
Michael
a25fd7713b Added Worker 2019-04-08 21:06:15 +00:00
Michael
c088249e1b Update the contact in the background 2019-04-08 21:05:33 +00:00
Michael
f387d85cdb Fetch profile data from different contact tables when we won't or can't probe via network 2019-04-08 20:41:18 +00:00
Philipp
2005df97c1
Merge pull request #6987 from tobiasd/20190408-dbupdateemail 
Add subject to DB Update email
 2019-04-08 12:30:20 +02:00
Tobias Diekershoff
c4fef79f32 Add subject to DB Update email 2019-04-08 10:55:18 +02:00
Philipp
df0e2c959a
Merge pull request #6985 from tobiasd/20190408-vierprvmailmobile 
vier mobile: private mail width
 2019-04-08 10:23:45 +02:00
Philipp
594dd5a503
Merge pull request #6986 from annando/composer-lock 
Updated composer.lock
 2019-04-08 10:22:57 +02:00
Tobias Diekershoff
686f67fb90 vier mobile: private mail width 2019-04-08 07:27:19 +02:00
Philipp Holzer
7e061e0cae
replacing direct query with User model call 2019-04-07 21:18:04 +02:00