1
0
Fork 0
Commit graph

2597 commits

Author SHA1 Message Date
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
e7ee3d7200
Merge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications
Clear private message notifications
2018-12-31 08:21:55 +01:00
034d0f650b
Merge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings
Fix site theme settings modal form
2018-12-30 10:35:44 +01:00
3095d4aa70 Add parent to private message notifications
- Fix item id for Diaspora private message notification
2018-12-30 01:10:10 -05:00
5abc22f6c5 Replace q() with DBA methods, fix code style
- Remove unused variables
- Fix doc block
- Fix indentation
2018-12-30 01:08:51 -05:00
979230da27 Allow theme setting in module
- Restore theme name caching
2018-12-29 15:40:04 -05:00
166b8ad440
Merge pull request #6342 from annando/notices
Warning and notice fixed
2018-12-29 12:16:37 -05:00
7efde8e334
Merge pull request #6209 from MrPetovan/task/move-config-to-php-array
Remove util/ folder
2018-12-29 11:43:55 +01:00
fd6c64f9c1 Warning and notice fixed 2018-12-29 09:53:31 +00:00
37c7a18d00 Replace latin-1 by latin1 in charset detection
- Simplify conditional for charset conversion
2018-12-29 00:43:00 -05:00
Michael Vogel
94eca77041
Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile
Rework mod/match and mod/msearch
2018-12-27 18:04:06 +01:00
fabc90e9dd
Merge branch '2018.12-rc' into task/move-config-to-php-array 2018-12-27 01:47:53 -05:00
620395378e Normalize uses of Strings::formatNetworkName to $network_link
- Unescape HTML template variable $network_link
2018-12-26 11:11:38 -05:00
5b74f066f2 Fix formatting in Util\Strings 2018-12-26 11:02:50 -05:00
f274357ad6 Issue-6329: Prevent double encoding 2018-12-26 11:21:42 +00:00
761e94d134 Remove redundant htmlentities/htmlspecialchars 2018-12-25 11:37:57 -05:00
56d612b2f0
Merge pull request #6323 from annando/issue-6316
Issue 6316: Do not double encode / Avoid notice
2018-12-25 11:26:54 -05:00
ccb9be8f28 Issue 6316: Do not double encode / Avoid notice 2018-12-25 12:12:59 +00:00
a8b0aa8c8d Normalize expected format for event fields summary, desc and location
- Remove unnecessary HTML escaping on event submit
- Add HTML escaping on event display
- Add HTML to BBCode conversion for received ActivityPub events
2018-12-24 23:00:35 -05:00
c9c9fc3a96 Code cleanup in events
- Replace killme() with exit()
- Use correctly escaped query string
- Simplify perms2str input filtering
- Add expected json header to /events/json
2018-12-24 23:00:35 -05:00
acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
c43bd890a5 The "Follow" activity shouldn't be send to Diaspora 2018-12-24 14:50:21 +00:00
1938ec3ebe Rework mod/match
- Replace classic pager with a start index
- Remove q() calls
- Ensure template is still loaded even with no results.
- Improve Minimal Pager display of next link
2018-12-24 00:56:14 -05:00
a16e8d97f6
Merge pull request #6312 from annando/check-json
Checks if JSON is enabled
2018-12-23 18:53:32 -05:00
d53ff9c34d Add support for FULLTEXT indices in Database\DBStructure 2018-12-23 15:40:49 -05:00
48a356dba2 Fix formatting in Database\DBStructure 2018-12-23 15:32:23 -05:00
2af0542eaa
Merge pull request #6310 from annando/issue-6122
Handles issue 6122 - the self contact will be updated when invalid
2018-12-22 18:15:02 -05:00
732308ce6d Hopefully this fixes the tests again 2018-12-22 22:04:47 +00:00
439afc89b6 Checks if JSON is enabled 2018-12-22 20:40:00 +00:00
faa30adf68 Handles issue 6122 - the self contact will be updated when it seems to be invalid 2018-12-22 20:12:32 +00:00
c06f7ad11e The curl result is an object, not an array 2018-12-22 17:00:28 +00:00
Jeroen De Meerleer
2d9f4b560f Too fast 2018-12-22 17:23:18 +01:00
Jeroen De Meerleer
27eddfee27 Fixed bug
$curlResult is not an array
2018-12-22 17:19:34 +01:00
21a055f670
Merge branch '2018.12-rc' into task/6208-escape-html-true 2018-12-18 08:36:36 -05:00
f413abb82b
Merge pull request #6277 from annando/nextcloud-ap
Fix ActivityPub with Nextcloud
2018-12-17 15:28:22 -05:00
c485ca6f06 Fix ActivityPub with Nextcloud 2018-12-17 20:13:56 +00:00
faff105f86
Fix feed display in browser when using emojis 2018-12-16 22:58:43 -05:00
6d90d35d25 Enable Smarty default HTML escaping 2018-12-16 22:38:30 -05:00
38109665c7 Various improvements/fixes
- Fix potential missing variable
- Improve replaceMacros doc
- Fix CSS value in smoothly
2018-12-16 22:38:30 -05:00
b6e1571b1e Fix various notices 2018-12-15 04:32:47 -05:00
607f7daf51 Add PHP 5 compatible recursive dirname() 2018-12-15 02:46:08 -05:00
b08e5ab41b Issue 6259: Suppress contact group widget only on network page 2018-12-14 06:33:57 +00:00
5a802bc474
Merge pull request #6261 from annando/fix-magic
Fix for magic auth
2018-12-13 17:03:44 -05:00
9ea0864394 Some added to-do 2018-12-13 21:41:19 +00:00
705211100b Fix for magic auth 2018-12-13 21:19:57 +00:00
Michael Vogel
e2f1fd1efb
Merge pull request #6256 from MrPetovan/bug/6255-hide-connect-remote
Add check for relationship with remote user for connect display
2018-12-13 22:18:24 +01:00
7c11194a2c Use Contact::isFollower instead 2018-12-13 11:53:15 -05:00
096093766a Add check for relationship with remote user for connect display 2018-12-12 22:22:43 -05:00
cced018825 Possibly fix a memory issue with large posts 2018-12-11 18:48:33 +00:00
f2e2066d33 Non public content is now displayed again to visitors. 2018-12-09 13:09:49 +00:00
8fbe0d46e9 Fix for remote authentication when visiting contact's pages 2018-12-08 20:28:01 +00:00
a041c7c0fa Issue 6236: Handle account removal messages with very low priority 2018-12-06 10:04:16 +00:00
d52d4ca355 Avoids the notice "array_merge(): Argument #1 is not an array" 2018-12-05 06:01:58 +00:00
95c150ef28 Added to-do 2018-12-04 14:20:25 +00:00
5c20f21dd8 Improved fallback when the probing fails 2018-12-04 14:17:55 +00:00
491fc5f78a Issue 6168: "redir" now mostly use OWA 2018-12-04 07:12:55 +00:00
89f5a9c550
Merge pull request #6231 from annando/notice
Fix for notice
2018-12-03 15:08:36 -05:00
6733b77b73 Make it simpler 2018-12-03 19:29:06 +00:00
d76003797a Fix for notice 2018-12-03 16:32:03 +00:00
fb68b50139 Fix for exceptions on external redirects 2018-12-03 15:59:53 +00:00
bfe809f60d
Merge pull request #6229 from annando/issue-5911
Issue 5911: Fix for fetching the correct user
2018-12-03 07:40:14 -05:00
51bce11b69 Issue 5911: Fix for fetching the correct user 2018-12-03 06:16:25 +00:00
f7c9ed5108 Add DB connection status check in Update::check 2018-12-02 20:57:41 -05:00
3a9db3f637
Merge pull request #6222 from annando/long-uri
Avoid problems with too long URI (should only happen with some RSS feeds)
2018-12-02 19:18:45 -05:00
57695d48b4
Merge pull request #6223 from annando/ap-dba-error
Fix for "Unknown column 'guid' in 'field list'"
2018-12-02 19:18:36 -05:00
69a73678eb
Merge pull request #6226 from annando/oembed-array
Ignoring OEmbed array values
2018-12-02 19:16:13 -05:00
58b614bea1 Ignoring OEmbed array values 2018-12-02 21:36:46 +00:00
c5558cc459
Merge pull request #6224 from annando/dba-delete-contact
Avoid duplicated contacts, improve contact deletion, avoid memory issues
2018-12-02 16:16:59 -05:00
5e60fa8210
Merge pull request #6225 from annando/http-error
Using the standard function to return http errors
2018-12-02 16:15:04 -05:00
649228cd3d More detailled HTTP error explanations 2018-12-02 20:10:53 +00:00
066a040cc7 Avoid duplicated contacts, improve contact deletion, avoid memory issues 2018-12-02 16:25:25 +00:00
924869ab5b
Merge branch 'develop' into bug/6211-fix-contact-nets-all 2018-12-02 10:24:50 -05:00
2fd65503da Avoid database error that the field "guid" is not present in the contact table 2018-12-02 15:01:08 +00:00
3d14977b73 Avoid problems with too long URI (should only happen some RSS feeds) 2018-12-02 14:49:28 +00:00
Michael Vogel
5a3991d4f7
Merge pull request #6219 from MrPetovan/task/remove-x
Remove x()
2018-12-01 23:40:51 +01:00
f9f4afa35c
Merge pull request #6220 from AndyHee/patch20181129
Fixing permanent deletion counter
2018-12-01 08:19:38 -05:00
14b4fac818 Fixing permanent deletion counter 2018-12-01 13:21:54 +07:00
458981f75c Replace x() by isset(), !empty() or defaults()
- Remove extraneous parentheses around empty() calls
- Remove duplicate calls to intval(), count() or strlen() after empty()
- Replace ternary operators outputting binary value with empty() return value
- Rewrite defaults() without x()
2018-11-30 09:06:22 -05:00
4a1f9a9bdd Improved url detection for redirects 2018-11-30 11:27:17 +00:00
663ba65f17 Remove "all" value for nets parameter 2018-11-30 05:43:07 -05:00
11a0dd4d4c Remove util directory 2018-11-28 23:10:21 -05:00
e02295e8e8 Move testargs to bin 2018-11-28 23:10:05 -05:00
9102a37b37 Move master translation file away from util
- Rewrite translation documentation
- Delete unused util/strings.php
- Updated references to util/messages.po and util/strings.php
2018-11-28 22:57:55 -05:00
Jonny Tischbein
f0d290eb18 Fix Term exists check on link which isn't stored for hashtags anymore to check on term. 2018-11-27 22:54:16 +01:00
Michael Vogel
ea4e772b1e
Merge pull request #6199 from MrPetovan/task/move-config-to-php-array
Move config to PHP array
2018-11-26 23:57:56 +01:00
4f9f86e310 We are now escaping many template fields 2018-11-25 18:56:26 +00:00
c964e193b9 Replace *.ini.php by *.config.php in comments 2018-11-25 01:44:51 -05:00
98d90e131d Update install to generate config/local.config.php 2018-11-25 01:44:09 -05:00
d6eb1135e5 Add support for PHP array config files
- Add new base config files
- Remove useless DIRECTORY_SEPARATOR instances
2018-11-25 01:42:05 -05:00
6eb6cc94c7 Move config/dbstructure.php to config/dbstructure.config.php 2018-11-25 01:14:44 -05:00
92556e5161 Fix user account removal expiration delay 2018-11-24 20:59:18 -05:00
54f4ac6ae0 Remove redirection from User::remove 2018-11-24 20:58:41 -05:00
0dd120bb06 Normalize quotes in User::remove 2018-11-24 20:58:11 -05:00
0bae80a2d3 Update deprecated calls in Model\user and mod/removeme 2018-11-24 20:56:38 -05:00
9d2f474c07 Fix open registration email 2018-11-24 20:55:18 -05:00
Michael Vogel
3f4636d490
Merge pull request #6183 from MrPetovan/bug/6135-hide-follower-only-birthdays
Hide follower-only birthday reminders
2018-11-24 15:55:43 +01:00
6b845b35d3
Merge pull request #6197 from annando/hide-short-groups
Don't show the group filter where there is only one
2018-11-24 08:22:43 -05:00
19053141a2
Merge pull request #6193 from annando/redirection
Fixing redirection problems with parameters
2018-11-24 08:13:35 -05:00
Michael Vogel
42a3610a79
Merge pull request #6184 from MrPetovan/task/normalize-bbcode-hashtags
Normalize BBCode hashtags links
2018-11-24 13:14:50 +01:00
a3a2147def Don't show the group filter where there is only one 2018-11-24 12:10:30 +00:00
167ff0eb71 Making the tests happy 2018-11-24 09:01:10 +00:00
586c7fb29a Fixing redirection problems with parameters 2018-11-24 00:27:00 +00:00
Michael Vogel
96a43d0db9
Merge pull request #6191 from MrPetovan/task/urlencode-file-param
URL encode /network file query parameter
2018-11-23 21:37:31 +01:00
4b8af10561 Fix display of Connect/Disconnect links on contact page 2018-11-23 11:09:43 -05:00
9774fd8be9 Remove unused parameter $save in HTML::search
- Remove unused variables in saved_search()
2018-11-23 09:53:14 -05:00
902ade9891
Merge pull request #6189 from MrPetovan/bug/5737-hide-ignore-anonymous
Fix ignore link showing for anonymous users
2018-11-23 10:01:56 +01:00
03de5c018f Fix ignore link showing for anonymous users 2018-11-23 01:25:38 -05:00
ea5ba309dc Some more AP blocking 2018-11-22 22:31:48 +00:00
2f7b138b09 Block AP delivery 2018-11-22 22:23:31 +00:00
ba1e385f86 Don't deliver to blocked domains 2018-11-22 22:09:22 +00:00
fb0140a62b Checking for blocked user does now check for blocked domain as well 2018-11-22 21:43:16 +00:00
ee88de1ef9 Normalize BBCode Hashtag replacement 2018-11-22 09:34:17 -05:00
81f89ccae8 Remove stored URL from hashtag terms 2018-11-22 09:33:42 -05:00
4874f7f8ab Remove useless rawurlencode calls for building hashtag bbcode
- Fix some formatting
2018-11-22 09:32:41 -05:00
14df030f44 Add contact conditions to getBirthdays/updateBirthdays 2018-11-22 00:15:44 -05:00
de5ee56d2f Move DFRN::birthdayEvent() to Event::createBirthday 2018-11-22 00:15:09 -05:00
d71e856535 Replace remaining occurrences of "0001-01-01" with DBA::NULL_DATE 2018-11-21 23:53:45 -05:00
cf1c63fcc2
Merge pull request #6176 from annando/ap-security
AP: Security check against forged "create" activities
2018-11-21 18:10:45 +01:00
aa1882fd99 Sanitize the OEmbed data before processing it 2018-11-21 07:07:24 +00:00
27d1da0468 One space too much 2018-11-20 20:49:06 +00:00
5c39779b45 AP: Security check against forged "create" activities 2018-11-20 20:40:47 +00:00
Jonny Tischbein
9aea59d4e3 Change Worker to use only MemFree in isMinMemoryReached 2018-11-19 23:21:40 +01:00
43079bfaf8 Several default features are now in the core 2018-11-18 20:13:46 +00:00
75398b96d5
Merge pull request #6164 from annando/network-protocols
Networks are now protocols
2018-11-18 07:47:10 -05:00
0ad71ebbbc Networks are now protocols 2018-11-18 12:44:01 +00:00
Michael Vogel
9dfc970bd6
Merge pull request #6144 from Alkarex/ATOM-self
Correct self attribute in ATOM feeds
2018-11-18 12:31:15 +01:00
e2ea4a3dc3 Allow to delete every post, even public ones 2018-11-17 22:56:28 +00:00
807afa3059
Merge pull request #6158 from tobiasd/20181117-contactedittab
Add link to user groups from /contact
2018-11-17 14:12:30 -05:00
6be831fd32 Add link to user groups from /contact
There was no way to get to the contact group editor from the contact overview.

Additionally the documentation about the used accesskeys was updated.
2018-11-17 18:33:12 +01:00
22fedc9a1a
Merge pull request #6152 from JonnyTischbein/issue_delete_from_saved_folder
Fix deleting last element and displaying empty saved folder
2018-11-17 11:59:24 -05:00