Commit graph

2526 commits

Author SHA1 Message Date
990bbea19d
Merge pull request #6446 from annando/approve
Now storing the "manually approve" data / fix update routine
2019-01-14 08:38:08 -05:00
5554448162 Now storing the "manually approve" data / fix update routine 2019-01-14 06:36:08 +00:00
795268eb7a Fix undefined offset notices in Protocol\Email 2019-01-14 00:05:51 -05:00
c1dec50248 Avoiding some notices 2019-01-13 18:03:13 +00:00
8b5b66838d Issue 6438: Avoid fatal error 2019-01-13 16:00:27 +00:00
72516191ef
Merge pull request #6435 from annando/nextcloud
Making Friendica compatible to Nextcloud Social
2019-01-13 07:57:37 -05:00
236c7718d3 Fixing some notice again 2019-01-13 09:44:04 +00:00
d113ccd93c Making Friendica compatible to Nextcloud Social 2019-01-13 09:38:01 +00:00
297a549590 Issue 6282: Update the forum status of contacts 2019-01-12 16:09:27 +00:00
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
28f14c7d60 Don't show deleted contacts, changed "pending" behaviour 2019-01-12 13:28:14 +00: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
a9b8eb4d56 Refactor Theme::getStylesheetPath to return faster if theme style.php doesn't exist 2019-01-12 02:26:16 -05:00
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
6d1bc974a0 Add time parameter for iOS Safari to stylesheet URL 2019-01-11 20:49:16 -05:00
f6092ebebb Add App->mobileDetect property 2019-01-11 20:48:29 -05:00
ffcd9fb78d
Revert "Change stylesheet path name for mobile browsers" 2019-01-11 20:01:42 -05:00
c5632a061f Fix output of Pager->getBaseQueryString 2019-01-11 19:30:33 -05:00
eaea24f98b Remove Pager->ensureQueryParameter 2019-01-11 19:29:55 -05:00
ec8b313c2d Replace Pager->ensureQueryParameter by Strings::ensureQueryParameter 2019-01-11 19:29:39 -05:00
a20fa6a3a9 Add ensureQueryParameter method to Util\Strings 2019-01-11 19:27:56 -05:00
e3576fa0bd Don't accept private answers to public parents 2019-01-10 22:51:03 +00:00
59f701d5a9
Merge pull request #6419 from annando/unfollow
Unfollow should now work with Pleroma again
2019-01-10 11:08:23 +01:00
6bc865ff4d
Merge pull request #6356 from MrPetovan/task/6355-add-password-rules
Add password rules
2019-01-10 10:37:32 +01:00
1a702359f1 Unfollow should now work with Pleroma again 2019-01-10 07:24:12 +00:00
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
defc89fa9a Fixing the Accepting of contact requests 2019-01-09 22:30:26 +00:00
Michael Vogel
4f5fb40202
Merge pull request #6414 from MrPetovan/bug/4609-add-support-hubzilla-forum-link
Add support for Hubzilla forum mentions (starting with !)
2019-01-09 20:25:28 +01:00
6ae6a8a983 Don't show deleted contacts, set new AP contacts as "pending" until they are accepted 2019-01-09 13:23:11 +00:00
b7b7b1b664 Add support for Hubzilla forum mentions (starting with !) 2019-01-08 20:56:01 -05:00
3b80f335fa
Merge pull request #6412 from annando/issue-6149
Issue 6149: Making OWA (hopefully) compatible with Hubzilla
2019-01-08 09:17:05 -05:00
8c6df8f156 Issue 6149: Making OWA (hopefully) compatible with Hubzilla 2019-01-08 11:17:05 +00:00
e447375cdd
Merge branch '2019.01-rc' into bug/6334-escape-get-app 2019-01-06 16:38:48 -05:00
4bf2701912
Merge pull request #6400 from annando/issue-6394
Issue 6394: The contact location has to be BBEncoded
2019-01-06 16:37:43 -05:00
7e19506435 Issue 6394: The contact location has to be BBEncoded 2019-01-06 21:04:10 +00:00
Michael Vogel
b7bf335e94
Merge pull request #6380 from MrPetovan/bug/5148-get-cookies-from-safari
Change stylesheet path name for mobile browsers
2019-01-06 20:37:33 +01:00
9a4fc0f8bd Issue 6347: Removing the old way to fetch Diaspora posts to avoid Hubzilla problems 2019-01-06 07:43:11 +00:00
3022abe74c Reset the "forum" and "prv" field 2019-01-05 23:02:58 +00:00
e88734e218 Periodically update contacts / update the contact type 2019-01-05 22:04:32 +00:00
cb635fb3cb Change stylesheet path name for mobile browsers 2019-01-04 20:18:31 -05:00
fc87c51bb4
Merge pull request #6377 from annando/ostatus-notice
Prevent a notice ... again
2019-01-04 11:28:31 -05:00
d8d5031935 Prevent a notice ... again 2019-01-04 15:34:53 +00:00
5e1ceb57de Escape global namespaced get_app() calls
- Add deprecated status
2019-01-03 21:27:36 -05:00
e86b8ef782 Use nickname instead of email for Login Name 2019-01-03 20:42:29 -05:00
rabuzarus
67a8f9dbd4 Bugfix - the remote user also has magicLinks again 2019-01-02 17:47:53 +01:00
61664ee659 Update usages of User::updatePassword
- Add password rules in mod/settings display
2019-01-01 01:15:52 -05:00
58adb5b431 Add password checks in User::updatePassword 2019-01-01 01:15:51 -05:00
909c9d0309 Increase auto-generated passwords to 12 chars + leading capital 2019-01-01 01:14:45 -05:00
961f737f36 Use User::updatePasswordHashed directly when re-hashing a password 2019-01-01 01:14:44 -05:00