Tobias Diekershoff
ed3a6e3054
remouved double entry
2019-01-14 07:05:49 +01:00
Tobias Diekershoff
0c3f123d9a
remove empty lines
2019-01-14 07:02:05 +01:00
Tobias Diekershoff
8b586e9d6c
Updated the CREDITS.TXT file for 2019.01
...
Additionally Transifex started to add lines to the header that confused the detection of "Translatorname, year" detection so the make_credits script had to be updated.
2019-01-14 06:57:37 +01:00
Tobias Diekershoff
2b198264c1
Merge pull request #6444 from MrPetovan/bug/5932-fix-email-notices
...
Fix undefined offset notices in Protocol\Email
2019-01-14 06:31:13 +01:00
Hypolite Petovan
795268eb7a
Fix undefined offset notices in Protocol\Email
2019-01-14 00:05:51 -05:00
Tobias Diekershoff
2f427e9daa
Merge pull request #6441 from annando/fatal-redirect
...
Solves redirect error message
2019-01-13 19:32:34 +01:00
Tobias Diekershoff
9aadb52762
Merge pull request #6440 from annando/notices
...
Avoiding some notices
2019-01-13 19:30:56 +01:00
Michael
3c1635c45f
Solves redirect error message
2019-01-13 18:16:26 +00:00
Michael
c1dec50248
Avoiding some notices
2019-01-13 18:03:13 +00:00
Tobias Diekershoff
0760b41fac
Merge pull request #6439 from annando/issue-6438
...
Issue 6438: Avoid fatal error
2019-01-13 17:06:52 +01:00
Michael
8b5b66838d
Issue 6438: Avoid fatal error
2019-01-13 16:00:27 +00:00
Hypolite Petovan
72516191ef
Merge pull request #6435 from annando/nextcloud
...
Making Friendica compatible to Nextcloud Social
2019-01-13 07:57:37 -05:00
Hypolite Petovan
9308247291
Merge pull request #6436 from annando/notice
...
Fixing some notice again
2019-01-13 07:55:48 -05:00
Michael
236c7718d3
Fixing some notice again
2019-01-13 09:44:04 +00:00
Michael
d113ccd93c
Making Friendica compatible to Nextcloud Social
2019-01-13 09:38:01 +00:00
Hypolite Petovan
0cdf0ba422
Merge pull request #6434 from AndyHee/2019.01-rc
...
Update translation en-gb
2019-01-12 14:46:51 -05:00
Hypolite Petovan
32ebfbd3e2
Merge pull request #6433 from annando/issue-6282
...
Issue 6282: Update the forum status of contacts
2019-01-12 14:46:04 -05:00
Andy
98b362f581
Update translation en-gb
2019-01-13 00:38:54 +07:00
Michael
297a549590
Issue 6282: Update the forum status of contacts
2019-01-12 16:09:27 +00:00
Hypolite Petovan
c4038e7af1
Merge pull request #6432 from annando/deleted-pending
...
Don't show deleted contacts, changed "pending" behaviour
2019-01-12 09:08:31 -05:00
Michael
28f14c7d60
Don't show deleted contacts, changed "pending" behaviour
2019-01-12 13:28:14 +00:00
Hypolite Petovan
33e096434a
Merge pull request #6430 from tobiasd/20190112-lng
...
Translation Updates
2019-01-12 04:59:28 -05:00
Tobias Diekershoff
80fcc25897
NB-NO translation update THX friendOFica
2019-01-12 10:53:13 +01:00
Tobias Diekershoff
e95b2b6494
PL translation update THX waldis
2019-01-12 10:52:10 +01:00
Tobias Diekershoff
dfc2e4f505
NL translation update THX Jeroen
2019-01-12 10:52:02 +01:00
Tobias Diekershoff
e21ed2284c
CS translation update THX Aditoo
2019-01-12 10:51:46 +01:00
Tobias Diekershoff
3a0effa265
DE translation update
2019-01-12 10:51:41 +01:00
Tobias Diekershoff
2f48eefc24
update to the en gb and us translations THX Andy H3
2019-01-12 10:51:36 +01:00
Tobias Diekershoff
2fd65f18f3
update FR translations THX lapoubelle111
2019-01-12 10:51:29 +01:00
Michael Vogel
2fbf1d54e2
Merge pull request #6428 from MrPetovan/bug/5148-get-cookies-from-safari-2
...
Add variable query parameter to stylesheet URL for iOS Safari
2019-01-12 09:33:35 +01:00
Michael Vogel
cd3ab5ddc9
Merge pull request #6426 from MrPetovan/bug/6425-fix-infinite-scroll-url
...
Fix infinite scroll base URL
2019-01-12 09:25:06 +01:00
Hypolite Petovan
a9b8eb4d56
Refactor Theme::getStylesheetPath to return faster if theme style.php doesn't exist
2019-01-12 02:26:16 -05:00
Hypolite Petovan
abf20368b0
Rework Profile::getThemeUid to ignore query parameter and include $a->profile_uid
...
- Use new version in frio default.php file
- Use new version in Theme::getStylesheetPath
2019-01-12 02:23:01 -05:00
Hypolite Petovan
1bdb3c916a
Make style.php require query parameter puid for specific stylesheets
2019-01-12 02:21:12 -05:00
Hypolite Petovan
6d1bc974a0
Add time parameter for iOS Safari to stylesheet URL
2019-01-11 20:49:16 -05:00
Hypolite Petovan
f6092ebebb
Add App->mobileDetect property
2019-01-11 20:48:29 -05:00
Hypolite Petovan
fbf73ef3a7
Merge pull request #6427 from friendica/revert-6380-bug/5148-get-cookies-from-safari
...
Revert "Change stylesheet path name for mobile browsers"
2019-01-11 20:42:55 -05:00
Hypolite Petovan
ffcd9fb78d
Revert "Change stylesheet path name for mobile browsers"
2019-01-11 20:01:42 -05:00
Hypolite Petovan
c5632a061f
Fix output of Pager->getBaseQueryString
2019-01-11 19:30:33 -05:00
Hypolite Petovan
eaea24f98b
Remove Pager->ensureQueryParameter
2019-01-11 19:29:55 -05:00
Hypolite Petovan
ec8b313c2d
Replace Pager->ensureQueryParameter by Strings::ensureQueryParameter
2019-01-11 19:29:39 -05:00
Hypolite Petovan
a20fa6a3a9
Add ensureQueryParameter method to Util\Strings
2019-01-11 19:27:56 -05:00
Hypolite Petovan
3020b9cb06
Merge pull request #6422 from annando/private-answer
...
Don't accept private answers to public parents
2019-01-11 01:07:04 -05:00
Michael
e3576fa0bd
Don't accept private answers to public parents
2019-01-10 22:51:03 +00:00
Tobias Diekershoff
59f701d5a9
Merge pull request #6419 from annando/unfollow
...
Unfollow should now work with Pleroma again
2019-01-10 11:08:23 +01:00
Tobias Diekershoff
6bc865ff4d
Merge pull request #6356 from MrPetovan/task/6355-add-password-rules
...
Add password rules
2019-01-10 10:37:32 +01:00
Michael
cc6836b89c
Pending must only be set when we connect as well
2019-01-10 09:19:19 +00:00
Michael
1a702359f1
Unfollow should now work with Pleroma again
2019-01-10 07:24:12 +00:00
Hypolite Petovan
cd48b7a68e
Merge pull request #6415 from annando/pending
...
Don't show deleted contacts, set new AP contacts as "pending" until accepted
2019-01-09 18:40:30 -05:00
Michael
defc89fa9a
Fixing the Accepting of contact requests
2019-01-09 22:30:26 +00:00
