Commit graph

22100 commits

Author SHA1 Message Date
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
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
Michael 6ae6a8a983 Don't show deleted contacts, set new AP contacts as "pending" until they are accepted 2019-01-09 13:23:11 +00:00
Hypolite Petovan b7b7b1b664 Add support for Hubzilla forum mentions (starting with !) 2019-01-08 20:56:01 -05:00
Hypolite Petovan 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
Michael 8c6df8f156 Issue 6149: Making OWA (hopefully) compatible with Hubzilla 2019-01-08 11:17:05 +00:00
Michael Vogel 8db4af3d00
Merge pull request #6372 from MrPetovan/bug/6334-escape-get-app
Escape get_app() calls
2019-01-07 17:16:56 +01:00
Hypolite Petovan e447375cdd
Merge branch '2019.01-rc' into bug/6334-escape-get-app 2019-01-06 16:38:48 -05:00
Hypolite Petovan 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
Michael 7e19506435 Issue 6394: The contact location has to be BBEncoded 2019-01-06 21:04:10 +00:00
Michael Vogel 3f85ee3ef8
Merge pull request #6373 from MrPetovan/bug/6345-vier-fix-messages-notifs
[vier] Fix private messages notification display
2019-01-06 20:42:55 +01:00
Michael Vogel 320ce0eb43
Merge pull request #6393 from MrPetovan/bug/6268-frio-fix-justifyGallery-scales
[frio] Fix justifyGalley scales list
2019-01-06 20:39:54 +01: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
Hypolite Petovan 9b8f91f8fe [frio] Fix justifyGalley scales list 2019-01-06 05:33:40 -05:00
Michael Vogel b461a30d9e
Merge pull request #6381 from MrPetovan/bug/2800-fix-accordion-ios
Strip base url from links before determining anchor status for iOS linker
2019-01-06 08:52:27 +01:00
Tobias Diekershoff 06b20425e6
Merge pull request #6392 from annando/issueö6347
Issue 6347: Removing the old way to fetch Diaspora posts
2019-01-06 08:48:33 +01:00
Michael 9a4fc0f8bd Issue 6347: Removing the old way to fetch Diaspora posts to avoid Hubzilla problems 2019-01-06 07:43:11 +00:00
Hypolite Petovan 00cc3e779b
Merge pull request #6388 from annando/update-contacts
Periodically update contacts / update the contact type
2019-01-05 23:43:38 -05:00
Michael 3022abe74c Reset the "forum" and "prv" field 2019-01-05 23:02:58 +00:00
Hypolite Petovan 93ba6ced32
Merge pull request #6387 from tobiasd/20190105-defaq
adding lang parameter to DE FAQ
2019-01-05 17:09:10 -05:00
Michael e88734e218 Periodically update contacts / update the contact type 2019-01-05 22:04:32 +00:00
Tobias Diekershoff d16cb9b879 typo 2019-01-05 20:48:32 +01:00
Tobias Diekershoff 4efa513065 adding lang parameter to DE FAQ 2019-01-05 20:45:42 +01:00
Hypolite Petovan 491a404f1f
Merge pull request #6385 from tobiasd/20190105-translationdocs
clarification for the translation of addons.
2019-01-05 12:57:16 -05:00
Tobias Diekershoff ec87d1af08 clarification for the translation of addons. 2019-01-05 18:44:22 +01:00
Hypolite Petovan 35c38c77e2 Update version constant to 2019.01-rc 2019-01-04 21:04:49 -05:00
Hypolite Petovan f2b784e654 Strip base url from links before determining anchor status for iOS linker 2019-01-04 20:36:36 -05:00
Hypolite Petovan cb635fb3cb Change stylesheet path name for mobile browsers 2019-01-04 20:18:31 -05:00
Hypolite Petovan fc87c51bb4
Merge pull request #6377 from annando/ostatus-notice
Prevent a notice ... again
2019-01-04 11:28:31 -05:00
Michael d8d5031935 Prevent a notice ... again 2019-01-04 15:34:53 +00:00
Michael Vogel 1f7ffce07a
Merge pull request #6371 from MrPetovan/bug/6370-use-nickname-in-register-emails
Use nickname instead of email for Login Name
2019-01-04 05:40:29 +01:00
Hypolite Petovan cc23ec19cd [frio] Fix user menu messages notification badge display 2019-01-03 23:18:27 -05:00
Hypolite Petovan 73882ff58f [vier] Add message icon link in header nav 2019-01-03 23:07:03 -05:00
Hypolite Petovan b3f8a24819 Unescape infinite scroll URL 2019-01-03 21:30:10 -05:00
Hypolite Petovan 935b86749d Unescape invite_desc template variable 2019-01-03 21:29:30 -05:00
Hypolite Petovan ea1946ec03 Use preg_quote instead of str_replace in include/items 2019-01-03 21:27:47 -05:00
Hypolite Petovan 5e1ceb57de Escape global namespaced get_app() calls
- Add deprecated status
2019-01-03 21:27:36 -05:00
Hypolite Petovan e86b8ef782 Use nickname instead of email for Login Name 2019-01-03 20:42:29 -05:00
Michael Vogel b8030313e5
Merge pull request #6364 from rabuzarus/20190102_-_fix_magic_links_for_remote_users
Bugfix - the remote user also has magicLinks again
2019-01-03 18:04:36 +01:00
Hypolite Petovan d1fb0be556 Updated RC version name 2019-01-03 01:03:18 -05:00
Michael Vogel 0eef382e82
Merge pull request #6365 from MrPetovan/bug/6363-unescape-prev-next-link
Unescape $prevlink and $nextlink template variables
2019-01-03 04:54:12 +01:00
Hypolite Petovan ff50f2bb65 Unescape $prevlink and $nextlink template variables 2019-01-02 19:06:23 -05:00
rabuzarus 67a8f9dbd4 Bugfix - the remote user also has magicLinks again 2019-01-02 17:47:53 +01:00
Michael Vogel f51918e9e9
Merge pull request #6362 from MrPetovan/bug/6360-6361-unescape-profiles
Unescape profiles template variables
2019-01-01 21:39:53 +01:00
Hypolite Petovan 2f15f1c477 Unescape profiles template variables 2019-01-01 11:45:36 -05:00
Michael Vogel 931971ae64
Merge pull request #6359 from MrPetovan/bug/6358-unescape-invite-desc
Unescape $invite_desc in follow/register templates
2019-01-01 09:37:40 +01:00
Hypolite Petovan 0dc06d66a0 Unescape $invite_desc in follow/register templates 2019-01-01 02:50:37 -05:00