friendica.git/.git
5 years agoRefactor Theme::getStylesheetPath to return faster if theme style.php doesn't exist
Hypolite Petovan [Sat, 12 Jan 2019 07:26:16 +0000 (02:26 -0500)]
Refactor Theme::getStylesheetPath to return faster if theme style.php doesn't exist

5 years agoRework Profile::getThemeUid to ignore query parameter and include $a->profile_uid
Hypolite Petovan [Sat, 12 Jan 2019 07:23:01 +0000 (02:23 -0500)]
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

5 years agoMake style.php require query parameter puid for specific stylesheets
Hypolite Petovan [Sat, 12 Jan 2019 07:21:12 +0000 (02:21 -0500)]
Make style.php require query parameter puid for specific stylesheets

5 years agoAdd time parameter for iOS Safari to stylesheet URL
Hypolite Petovan [Sat, 12 Jan 2019 01:49:16 +0000 (20:49 -0500)]
Add time parameter for iOS Safari to stylesheet URL

5 years agoAdd App->mobileDetect property
Hypolite Petovan [Sat, 12 Jan 2019 01:48:29 +0000 (20:48 -0500)]
Add App->mobileDetect property

5 years agoMerge pull request #6427 from friendica/revert-6380-bug/5148-get-cookies-from-safari
Hypolite Petovan [Sat, 12 Jan 2019 01:42:55 +0000 (20:42 -0500)]
Merge pull request #6427 from friendica/revert-6380-bug/5148-get-cookies-from-safari

Revert "Change stylesheet path name for mobile browsers"

5 years agoRevert "Change stylesheet path name for mobile browsers"
Hypolite Petovan [Sat, 12 Jan 2019 01:01:42 +0000 (20:01 -0500)]
Revert "Change stylesheet path name for mobile browsers"

5 years agoMerge pull request #6422 from annando/private-answer
Hypolite Petovan [Fri, 11 Jan 2019 06:07:04 +0000 (01:07 -0500)]
Merge pull request #6422 from annando/private-answer

Don't accept private answers to public parents

5 years agoDon't accept private answers to public parents
Michael [Thu, 10 Jan 2019 22:51:03 +0000 (22:51 +0000)]
Don't accept private answers to public parents

5 years agoMerge pull request #6419 from annando/unfollow
Tobias Diekershoff [Thu, 10 Jan 2019 10:08:23 +0000 (11:08 +0100)]
Merge pull request #6419 from annando/unfollow

Unfollow should now work with Pleroma again

5 years agoMerge pull request #6356 from MrPetovan/task/6355-add-password-rules
Tobias Diekershoff [Thu, 10 Jan 2019 09:37:32 +0000 (10:37 +0100)]
Merge pull request #6356 from MrPetovan/task/6355-add-password-rules

Add password rules

5 years agoPending must only be set when we connect as well
Michael [Thu, 10 Jan 2019 09:19:19 +0000 (09:19 +0000)]
Pending must only be set when we connect as well

5 years agoUnfollow should now work with Pleroma again
Michael [Thu, 10 Jan 2019 07:24:12 +0000 (07:24 +0000)]
Unfollow should now work with Pleroma again

5 years agoMerge pull request #6415 from annando/pending
Hypolite Petovan [Wed, 9 Jan 2019 23:40:30 +0000 (18:40 -0500)]
Merge pull request #6415 from annando/pending

Don't show deleted contacts, set new AP contacts as "pending" until accepted

5 years agoFixing the Accepting of contact requests
Michael [Wed, 9 Jan 2019 22:30:26 +0000 (22:30 +0000)]
Fixing the Accepting of contact requests

5 years agoMerge pull request #6414 from MrPetovan/bug/4609-add-support-hubzilla-forum-link
Michael Vogel [Wed, 9 Jan 2019 19:25:28 +0000 (20:25 +0100)]
Merge pull request #6414 from MrPetovan/bug/4609-add-support-hubzilla-forum-link

Add support for Hubzilla forum mentions (starting with !)

5 years agoDon't show deleted contacts, set new AP contacts as "pending" until they are accepted
Michael [Wed, 9 Jan 2019 13:23:11 +0000 (13:23 +0000)]
Don't show deleted contacts, set new AP contacts as "pending" until they are accepted

5 years agoAdd support for Hubzilla forum mentions (starting with !)
Hypolite Petovan [Wed, 9 Jan 2019 01:55:36 +0000 (20:55 -0500)]
Add support for Hubzilla forum mentions (starting with !)

5 years agoMerge pull request #6412 from annando/issue-6149
Hypolite Petovan [Tue, 8 Jan 2019 14:17:05 +0000 (09:17 -0500)]
Merge pull request #6412 from annando/issue-6149

Issue 6149: Making OWA (hopefully) compatible with Hubzilla

5 years agoIssue 6149: Making OWA (hopefully) compatible with Hubzilla
Michael [Tue, 8 Jan 2019 11:17:05 +0000 (11:17 +0000)]
Issue 6149: Making OWA (hopefully) compatible with Hubzilla

5 years agoMerge pull request #6372 from MrPetovan/bug/6334-escape-get-app
Michael Vogel [Mon, 7 Jan 2019 16:16:56 +0000 (17:16 +0100)]
Merge pull request #6372 from MrPetovan/bug/6334-escape-get-app

Escape get_app() calls

5 years agoUpdate master messages.po translation file
Hypolite Petovan [Sun, 6 Jan 2019 22:23:24 +0000 (17:23 -0500)]
Update master messages.po translation file

5 years agoUpdate new password help text
Hypolite Petovan [Sun, 6 Jan 2019 22:23:03 +0000 (17:23 -0500)]
Update new password help text

5 years agoMerge branch '2019.01-rc' into bug/6334-escape-get-app
Hypolite Petovan [Sun, 6 Jan 2019 21:38:48 +0000 (16:38 -0500)]
Merge branch '2019.01-rc' into bug/6334-escape-get-app

5 years agoMerge pull request #6400 from annando/issue-6394
Hypolite Petovan [Sun, 6 Jan 2019 21:37:43 +0000 (16:37 -0500)]
Merge pull request #6400 from annando/issue-6394

Issue 6394: The contact location has to be BBEncoded

5 years agoIssue 6394: The contact location has to be BBEncoded
Michael [Sun, 6 Jan 2019 21:04:10 +0000 (21:04 +0000)]
Issue 6394: The contact location has to be BBEncoded

5 years agoMerge pull request #6373 from MrPetovan/bug/6345-vier-fix-messages-notifs
Michael Vogel [Sun, 6 Jan 2019 19:42:55 +0000 (20:42 +0100)]
Merge pull request #6373 from MrPetovan/bug/6345-vier-fix-messages-notifs

[vier] Fix private messages notification display

5 years agoMerge pull request #6393 from MrPetovan/bug/6268-frio-fix-justifyGallery-scales
Michael Vogel [Sun, 6 Jan 2019 19:39:54 +0000 (20:39 +0100)]
Merge pull request #6393 from MrPetovan/bug/6268-frio-fix-justifyGallery-scales

[frio] Fix justifyGalley scales list

5 years agoMerge pull request #6380 from MrPetovan/bug/5148-get-cookies-from-safari
Michael Vogel [Sun, 6 Jan 2019 19:37:33 +0000 (20:37 +0100)]
Merge pull request #6380 from MrPetovan/bug/5148-get-cookies-from-safari

Change stylesheet path name for mobile browsers

5 years ago[frio] Fix justifyGalley scales list
Hypolite Petovan [Sun, 6 Jan 2019 10:33:40 +0000 (05:33 -0500)]
[frio] Fix justifyGalley scales list

5 years agoMerge pull request #6381 from MrPetovan/bug/2800-fix-accordion-ios
Michael Vogel [Sun, 6 Jan 2019 07:52:27 +0000 (08:52 +0100)]
Merge pull request #6381 from MrPetovan/bug/2800-fix-accordion-ios

Strip base url from links before determining anchor status for iOS linker

5 years agoMerge pull request #6392 from annando/issueƶ6347
Tobias Diekershoff [Sun, 6 Jan 2019 07:48:33 +0000 (08:48 +0100)]
Merge pull request #6392 from annando/issueƶ6347

Issue 6347: Removing the old way to fetch Diaspora posts

5 years agoIssue 6347: Removing the old way to fetch Diaspora posts to avoid Hubzilla problems
Michael [Sun, 6 Jan 2019 07:43:11 +0000 (07:43 +0000)]
Issue 6347: Removing the old way to fetch Diaspora posts to avoid Hubzilla problems

5 years agoMerge pull request #6388 from annando/update-contacts
Hypolite Petovan [Sun, 6 Jan 2019 04:43:38 +0000 (23:43 -0500)]
Merge pull request #6388 from annando/update-contacts

Periodically update contacts / update the contact type

5 years agoReset the "forum" and "prv" field
Michael [Sat, 5 Jan 2019 23:02:58 +0000 (23:02 +0000)]
Reset the "forum" and "prv" field

5 years agoMerge pull request #6387 from tobiasd/20190105-defaq
Hypolite Petovan [Sat, 5 Jan 2019 22:09:10 +0000 (17:09 -0500)]
Merge pull request #6387 from tobiasd/20190105-defaq

adding lang parameter to DE FAQ

5 years agoPeriodically update contacts / update the contact type
Michael [Sat, 5 Jan 2019 22:04:32 +0000 (22:04 +0000)]
Periodically update contacts / update the contact type

5 years agotypo
Tobias Diekershoff [Sat, 5 Jan 2019 19:48:32 +0000 (20:48 +0100)]
typo

5 years agoadding lang parameter to DE FAQ
Tobias Diekershoff [Sat, 5 Jan 2019 19:45:42 +0000 (20:45 +0100)]
adding lang parameter to DE FAQ

5 years agoMerge pull request #6385 from tobiasd/20190105-translationdocs
Hypolite Petovan [Sat, 5 Jan 2019 17:57:16 +0000 (12:57 -0500)]
Merge pull request #6385 from tobiasd/20190105-translationdocs

clarification for the translation of addons.

5 years agoclarification for the translation of addons.
Tobias Diekershoff [Sat, 5 Jan 2019 17:44:22 +0000 (18:44 +0100)]
clarification for the translation of addons.

5 years agoUpdate version constant to 2019.01-rc
Hypolite Petovan [Sat, 5 Jan 2019 02:04:49 +0000 (21:04 -0500)]
Update version constant to 2019.01-rc

5 years agoStrip base url from links before determining anchor status for iOS linker
Hypolite Petovan [Sat, 5 Jan 2019 01:36:36 +0000 (20:36 -0500)]
Strip base url from links before determining anchor status for iOS linker

5 years agoChange stylesheet path name for mobile browsers
Hypolite Petovan [Sat, 5 Jan 2019 01:18:31 +0000 (20:18 -0500)]
Change stylesheet path name for mobile browsers

5 years agoMerge pull request #6377 from annando/ostatus-notice
Hypolite Petovan [Fri, 4 Jan 2019 16:28:31 +0000 (11:28 -0500)]
Merge pull request #6377 from annando/ostatus-notice

Prevent a notice ... again

5 years agoPrevent a notice ... again
Michael [Fri, 4 Jan 2019 15:34:53 +0000 (15:34 +0000)]
Prevent a notice ... again

5 years agoMerge pull request #6371 from MrPetovan/bug/6370-use-nickname-in-register-emails
Michael Vogel [Fri, 4 Jan 2019 04:40:29 +0000 (05:40 +0100)]
Merge pull request #6371 from MrPetovan/bug/6370-use-nickname-in-register-emails

Use nickname instead of email for Login Name

5 years ago[frio] Fix user menu messages notification badge display
Hypolite Petovan [Fri, 4 Jan 2019 04:18:27 +0000 (23:18 -0500)]
[frio] Fix user menu messages notification badge display

5 years ago[vier] Add message icon link in header nav
Hypolite Petovan [Fri, 4 Jan 2019 04:07:03 +0000 (23:07 -0500)]
[vier] Add message icon link in header nav

5 years agoUnescape infinite scroll URL
Hypolite Petovan [Fri, 28 Dec 2018 14:05:49 +0000 (09:05 -0500)]
Unescape infinite scroll URL

5 years agoUnescape invite_desc template variable
Hypolite Petovan [Fri, 28 Dec 2018 01:13:36 +0000 (20:13 -0500)]
Unescape invite_desc template variable

5 years agoUse preg_quote instead of str_replace in include/items
Hypolite Petovan [Fri, 28 Dec 2018 00:23:01 +0000 (19:23 -0500)]
Use preg_quote instead of str_replace in include/items

5 years agoEscape global namespaced get_app() calls
Hypolite Petovan [Fri, 28 Dec 2018 00:22:35 +0000 (19:22 -0500)]
Escape global namespaced get_app() calls

- Add deprecated status

5 years agoUse nickname instead of email for Login Name
Hypolite Petovan [Fri, 4 Jan 2019 01:42:29 +0000 (20:42 -0500)]
Use nickname instead of email for Login Name

5 years agoMerge pull request #6364 from rabuzarus/20190102_-_fix_magic_links_for_remote_users
Michael Vogel [Thu, 3 Jan 2019 17:04:36 +0000 (18:04 +0100)]
Merge pull request #6364 from rabuzarus/20190102_-_fix_magic_links_for_remote_users

Bugfix - the remote user also has magicLinks again

5 years agoUpdated RC version name
Hypolite Petovan [Thu, 3 Jan 2019 06:03:18 +0000 (01:03 -0500)]
Updated RC version name

5 years agoMerge pull request #6365 from MrPetovan/bug/6363-unescape-prev-next-link
Michael Vogel [Thu, 3 Jan 2019 03:54:12 +0000 (04:54 +0100)]
Merge pull request #6365 from MrPetovan/bug/6363-unescape-prev-next-link

Unescape $prevlink and $nextlink template variables

5 years agoUnescape $prevlink and $nextlink template variables
Hypolite Petovan [Thu, 3 Jan 2019 00:06:23 +0000 (19:06 -0500)]
Unescape $prevlink and $nextlink template variables

5 years agoBugfix - the remote user also has magicLinks again
rabuzarus [Wed, 2 Jan 2019 16:47:53 +0000 (17:47 +0100)]
Bugfix - the remote user also has magicLinks again

5 years agoMerge pull request #6362 from MrPetovan/bug/6360-6361-unescape-profiles
Michael Vogel [Tue, 1 Jan 2019 20:39:53 +0000 (21:39 +0100)]
Merge pull request #6362 from MrPetovan/bug/6360-6361-unescape-profiles

Unescape profiles template variables

5 years agoUnescape profiles template variables
Hypolite Petovan [Tue, 1 Jan 2019 16:45:36 +0000 (11:45 -0500)]
Unescape profiles template variables

5 years agoMerge pull request #6359 from MrPetovan/bug/6358-unescape-invite-desc
Michael Vogel [Tue, 1 Jan 2019 08:37:40 +0000 (09:37 +0100)]
Merge pull request #6359 from MrPetovan/bug/6358-unescape-invite-desc

Unescape $invite_desc in follow/register templates

5 years agoUnescape $invite_desc in follow/register templates
Hypolite Petovan [Tue, 1 Jan 2019 07:50:37 +0000 (02:50 -0500)]
Unescape $invite_desc in follow/register templates

5 years agoUpdate usages of User::updatePassword
Hypolite Petovan [Tue, 1 Jan 2019 06:09:44 +0000 (01:09 -0500)]
Update usages of User::updatePassword

- Add password rules in mod/settings display

5 years agoAdd password checks in User::updatePassword
Hypolite Petovan [Tue, 1 Jan 2019 06:08:55 +0000 (01:08 -0500)]
Add password checks in User::updatePassword

5 years agoIncrease auto-generated passwords to 12 chars + leading capital
Hypolite Petovan [Tue, 1 Jan 2019 06:06:55 +0000 (01:06 -0500)]
Increase auto-generated passwords to 12 chars + leading capital

5 years agoUse User::updatePasswordHashed directly when re-hashing a password
Hypolite Petovan [Tue, 1 Jan 2019 06:06:28 +0000 (01:06 -0500)]
Use User::updatePasswordHashed directly when re-hashing a password

5 years ago[Composer] Added missing dependency ext-openssl
Hypolite Petovan [Tue, 1 Jan 2019 06:05:22 +0000 (01:05 -0500)]
[Composer] Added missing dependency ext-openssl

5 years agoMerge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications
Tobias Diekershoff [Mon, 31 Dec 2018 07:21:55 +0000 (08:21 +0100)]
Merge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications

Clear private message notifications

5 years agoMerge pull request #6351 from MrPetovan/bug/6350-unescape-admin-warning-text
Michael Vogel [Sun, 30 Dec 2018 15:41:05 +0000 (16:41 +0100)]
Merge pull request #6351 from MrPetovan/bug/6350-unescape-admin-warning-text

Unescape admin warning text

5 years agoMerge pull request #6352 from MrPetovan/bug/6349-normalize-config-line-endings
Michael Vogel [Sun, 30 Dec 2018 15:40:47 +0000 (16:40 +0100)]
Merge pull request #6352 from MrPetovan/bug/6349-normalize-config-line-endings

Normalize config file line endings to LF

5 years agoMerge pull request #6353 from MrPetovan/bug/6343-unescape-plaintext-email
Michael Vogel [Sun, 30 Dec 2018 15:40:15 +0000 (16:40 +0100)]
Merge pull request #6353 from MrPetovan/bug/6343-unescape-plaintext-email

Unescape plaintext email body

5 years agoUnescape plaintext email body
Hypolite Petovan [Sun, 30 Dec 2018 15:20:38 +0000 (10:20 -0500)]
Unescape plaintext email body

5 years agoNormalize config file line endings to LF
Hypolite Petovan [Sun, 30 Dec 2018 15:15:12 +0000 (10:15 -0500)]
Normalize config file line endings to LF

5 years agoUnescape admin warning text
Hypolite Petovan [Sun, 30 Dec 2018 15:12:13 +0000 (10:12 -0500)]
Unescape admin warning text

5 years agoMerge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings
Tobias Diekershoff [Sun, 30 Dec 2018 09:35:44 +0000 (10:35 +0100)]
Merge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings

Fix site theme settings modal form

5 years agoRemove fake private message notifications from ping output
Hypolite Petovan [Sun, 30 Dec 2018 06:11:30 +0000 (01:11 -0500)]
Remove fake private message notifications from ping output

5 years agoAdd notification clear on private message display
Hypolite Petovan [Sun, 30 Dec 2018 06:11:02 +0000 (01:11 -0500)]
Add notification clear on private message display

5 years agoAdd parent to private message notifications
Hypolite Petovan [Sun, 30 Dec 2018 06:10:10 +0000 (01:10 -0500)]
Add parent to private message notifications

- Fix item id for Diaspora private message notification

5 years agoReplace q() with DBA methods, fix code style
Hypolite Petovan [Sun, 30 Dec 2018 06:08:51 +0000 (01:08 -0500)]
Replace q() with DBA methods, fix code style

- Remove unused variables
- Fix doc block
- Fix indentation

5 years agoFix unread message conversation title display
Hypolite Petovan [Sun, 30 Dec 2018 06:04:52 +0000 (01:04 -0500)]
Fix unread message conversation title display

5 years agoMake NOTIFY_* constant values human-readable
Hypolite Petovan [Sun, 30 Dec 2018 06:04:20 +0000 (01:04 -0500)]
Make NOTIFY_* constant values human-readable

5 years agoUse minimal mode to change site theme settings
Hypolite Petovan [Sat, 29 Dec 2018 05:21:57 +0000 (00:21 -0500)]
Use minimal mode to change site theme settings

- Use textarea in colorbox instead of inline HTML
- Add mode propagation to site theme setting form
- Set theme for site theme settings form to load JS dependencies

5 years agoRemove useless trailing slash in admin/addon_details.tpl
Hypolite Petovan [Sat, 29 Dec 2018 05:19:40 +0000 (00:19 -0500)]
Remove useless trailing slash in admin/addon_details.tpl

5 years ago[frio] Fix minimal layout
Hypolite Petovan [Sat, 29 Dec 2018 05:19:07 +0000 (00:19 -0500)]
[frio] Fix minimal layout

5 years agoAllow theme setting in module
Hypolite Petovan [Sat, 29 Dec 2018 05:18:52 +0000 (00:18 -0500)]
Allow theme setting in module

- Restore theme name caching

5 years agoFix screenshots URLs in frio readme
Hypolite Petovan [Sat, 29 Dec 2018 05:08:30 +0000 (00:08 -0500)]
Fix screenshots URLs in frio readme

5 years agoMerge pull request #6342 from annando/notices
Hypolite Petovan [Sat, 29 Dec 2018 17:16:37 +0000 (12:16 -0500)]
Merge pull request #6342 from annando/notices

Warning and notice fixed

5 years agoMerge pull request #6209 from MrPetovan/task/move-config-to-php-array
Tobias Diekershoff [Sat, 29 Dec 2018 10:43:55 +0000 (11:43 +0100)]
Merge pull request #6209 from MrPetovan/task/move-config-to-php-array

Remove util/ folder

5 years agoMerge pull request #6341 from MrPetovan/bug/parseurl-charset
Michael Vogel [Sat, 29 Dec 2018 10:00:06 +0000 (11:00 +0100)]
Merge pull request #6341 from MrPetovan/bug/parseurl-charset

Replace latin-1 by latin1 in charset detection

5 years agoWarning and notice fixed
Michael [Sat, 29 Dec 2018 09:53:31 +0000 (09:53 +0000)]
Warning and notice fixed

5 years agoReplace latin-1 by latin1 in charset detection
Hypolite Petovan [Tue, 4 Sep 2018 14:52:17 +0000 (10:52 -0400)]
Replace latin-1 by latin1 in charset detection

- Simplify conditional for charset conversion

5 years agoMerge pull request #6333 from annando/avoid-wsod
Hypolite Petovan [Thu, 27 Dec 2018 18:14:22 +0000 (13:14 -0500)]
Merge pull request #6333 from annando/avoid-wsod

Avoid a WSOD after PR 6315

5 years agoAvoid a WSOD after PR 6315
Michael [Thu, 27 Dec 2018 17:17:02 +0000 (17:17 +0000)]
Avoid a WSOD after PR 6315

5 years agoMerge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile
Michael Vogel [Thu, 27 Dec 2018 17:04:06 +0000 (18:04 +0100)]
Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile

Rework mod/match and mod/msearch

5 years agoMerge pull request #6332 from annando/assign-uid
Hypolite Petovan [Thu, 27 Dec 2018 14:28:22 +0000 (09:28 -0500)]
Merge pull request #6332 from annando/assign-uid

Only assign a uid to the profile if not defined by now

5 years agoOnly assign a uid to the profile if not defined by now
Michael [Thu, 27 Dec 2018 09:58:21 +0000 (09:58 +0000)]
Only assign a uid to the profile if not defined by now

5 years agoFix mods/README.md format
Hypolite Petovan [Thu, 27 Dec 2018 06:52:40 +0000 (01:52 -0500)]
Fix mods/README.md format

5 years agoDelete friendica-to-smarty-tpl.py
Hypolite Petovan [Thu, 27 Dec 2018 06:51:59 +0000 (01:51 -0500)]
Delete friendica-to-smarty-tpl.py

5 years agoDelete updatetpl.py
Hypolite Petovan [Thu, 27 Dec 2018 06:51:50 +0000 (01:51 -0500)]
Delete updatetpl.py