1
0
Fork 0
Commit graph

6000 commits

Author SHA1 Message Date
20b93306ad Handling situations where "vid" is empty 2020-05-31 14:38:00 +00:00
Michael Vogel
235f4eaa89
Merge pull request from MrPetovan/task/8691-like-links-one-way
Make like links one way
2020-05-29 15:33:24 +02:00
0acb5d4558 "parent = id" is replaced with gravity check 2020-05-28 16:02:36 +00:00
9ebb2c6527 Implement existing force query string parameter in mod/update_display
- Prevented single item display update when "like" interactions were removed because the item wasn't "unseen"
2020-05-27 08:28:09 -04:00
973abb6196 Replace "id = parent" checks with "gravity" checks 2020-05-27 12:19:06 +00:00
ba9cf32f36 The "item-activity" is removed 2020-05-26 05:18:50 +00:00
62f3c1f4b8
Merge pull request from annando/annando/issue8619
Issue 8619: Limit the tag query to a range of one day
2020-05-17 14:00:55 -04:00
3b1d89252a Issue 8582: "cid" in "network" is now "contactid"
Fixes 
2020-05-17 15:01:27 +00:00
c8954a25ba Limit the tag query to a range of one day
Fixes 
2020-05-17 05:24:51 +00:00
bf8bb47d7d
Merge pull request from annando/notice
Fix: Undefined index: uri-id in src/Model/Tag.php on line 403
2020-05-15 08:46:57 -04:00
a1fc9df4ee Fix: Undefined index: uri-id in src/Model/Tag.php on line 403 2020-05-14 20:44:03 +00:00
75977ee72b Remove remaining references to cirtual field item.tag 2020-05-13 22:35:13 -04:00
b2ce9601da
Merge pull request from annando/annando/issue8614
Order of filed items in saved folders seems to be random
2020-05-09 20:10:57 -04:00
cd214102af Order of filed items in saved folders seems to be random
Fixes 
2020-05-09 18:47:56 +00:00
258e9df064 Moved the check for a comment to a different place 2020-05-09 15:50:49 +00:00
221a659abe Unused variables removed 2020-05-09 09:38:49 +00:00
556cc3fb13 Always mention the parent author 2020-05-09 08:08:33 +00:00
d5f64e1156 Issue 8610: Implicit mentions work again 2020-05-09 06:33:59 +00:00
856cf7f664 Don't count and fetch "follow" activities 2020-05-07 18:39:39 +00:00
180b4e51df fix a fatal error when displaying photos 2020-05-06 04:58:25 +00:00
d33f6fc167 Renamed function 2020-05-05 21:58:25 +00:00
980de37047 Removed legacy usage of the "tag" field 2020-05-05 19:54:25 +00:00
3d4ace7a9d Merge branch 'no-term3' into no-term2 2020-05-05 16:09:50 +00:00
b7e25d16e7 Removed usage of "tag" field 2020-05-05 05:11:59 +00:00
875d6b36e9 File and category aren't using "term" anymore 2020-05-03 15:13:40 +00:00
b0cb6536dd The old tag handling is removed 2020-05-02 05:08:05 +00:00
729c6b67aa the "term" field now is called "name", workaround removed 2020-05-01 15:18:48 +00:00
74081a71ff Removed unused "use" 2020-05-01 13:26:13 +00:00
029a379060 Move "isType" to Tag.php 2020-05-01 12:39:41 +00:00
ac2957c4dd Some more "term" to "tag" conversion 2020-05-01 10:57:32 +00:00
1f64e672ba Subscribed tags are now based on the tags as well 2020-05-01 07:18:15 +00:00
8c44f535b7 Merge remote-tracking branch 'upstream/develop' into write-tags 2020-04-29 02:38:33 +00:00
10ffd3a374 Iissue 8560: Wrong value for parent in mail notification 2020-04-28 20:32:39 +00:00
70e5639e29 Merge 2020-04-28 13:33:03 +00:00
f75009c20c Some more forgotten DBA::close 2020-04-28 07:10:18 +00:00
7f5f68a904 More preparations for term to tag transition 2020-04-26 16:15:39 +00:00
a5aa43469b Some more places with owner-view 2020-04-24 13:41:11 +00:00
c4f7f3e26e And some more view calls added 2020-04-24 12:59:19 +00:00
0950e4bada Another view 2020-04-24 12:09:51 +00:00
4181eb37f5 More joins replaced by view calls 2020-04-24 11:55:46 +00:00
43b8bdea07
Merge pull request from annando/term2tag
We now store tags in "tag"
2020-04-22 22:56:07 -04:00
16f48731b1 Remove album name bin2hex conversion in file browser
- Avoids Javascript hex2bin() limitation to Latin-1 string encoding
2020-04-21 22:14:11 -04:00
Michael Vogel
ee098277b9
Merge pull request from MrPetovan/task/8498-move-poke-to-src
Move poke module to src/
2020-04-21 05:56:59 +02:00
7f04aea8b1 Move poke module to src/
- Add new route contact/<cid>/poke and update all references
- Rework template with form field includes
- [frio] Enable modal behavior
2020-04-20 11:47:08 -04:00
9e9a104320 Tags can now be added and removed from photos 2020-04-18 20:46:41 +00:00
060503eb44 Tagger is now storing the tag as well 2020-04-17 13:36:55 +00:00
3ff607deee Store tags for locally created posts 2020-04-15 19:46:47 +00:00
661dd43b0d Term constants updated 2020-04-13 19:24:22 +00:00
1e32f74b0b Rework Module/Objects
- Merge two item queries into one
- Add ETag check
- Use Router parameter
2020-04-05 18:00:46 -04:00
594db70a72
Merge pull request from lynn-stephenson/develop
Fix Password Reset Token Security
2020-04-05 08:15:31 -04:00
Lynn Stephenson
6cbcea1aac
Update lostpass.php
reduce info leakage on password reset tokens
2020-04-04 08:10:39 +00:00
Lynn Stephenson
f459a35cf4
Update lostpass.php
use CSPRNG for password reset token generation
2020-04-04 08:06:49 +00:00
40a7a43bd2 [frio] Add link to Compose page in jot 2020-04-03 16:33:00 -04:00
5ce404f517 Refactor user settings page
- Fix header hierarchy
- [frio] Fix panel display
- Move checkbox sub-template calls to template
2020-04-01 19:06:00 -04:00
3c50f985a9 Remove modal window for default post permission setting 2020-04-01 09:21:26 -04:00
d3722c945b Improved Mime Type detection 2020-04-01 05:42:44 +00:00
Steffen K9
6ea9c1764c
remove default from match.php 2020-03-29 11:37:23 +02:00
Steffen K9
0ddda6160b
Remove multi profile mention in settings
Remove multi/default profile mention in settings privacy.
2020-03-29 11:17:08 +02:00
7fabafdce6 Enable visibility request parameter to override default user permissions in mod/item 2020-03-24 16:34:19 -04:00
8bde222fca Issue 8371: Use correct user id for photo upload 2020-03-22 14:07:34 +00:00
505aa95c3d Fixed wrong contact permisssion 2020-03-22 10:05:52 +00:00
6de2b0f6d4 Reworked permission stuff 2020-03-21 18:30:40 +00:00
2234a095c6 Issue 8371 again: Fallback for item permissions 2020-03-20 04:52:04 +00:00
29bd37cda2 Issue 8371: Ensure to always have permissions 2020-03-19 21:55:31 +00:00
37376fa715 Issue 8371: Improvements for picture permissions 2020-03-08 13:16:59 +00:00
a55057d974 Function renamed to better reflect the purpose 2020-03-05 08:03:05 +00:00
825a7f9f93 Issue 8321: Follow items now work again 2020-03-05 07:16:47 +00:00
55f43be92a Changed setting description 2020-03-03 04:03:37 +00:00
a19151fa6a Improved description, support for "unlisted" via DFRN as well. 2020-03-02 22:35:25 +00:00
72c198990e Merge remote-tracking branch 'upstream/develop' into private 2020-03-02 15:05:00 +00:00
31f912b78e Warning removed 2020-03-02 14:51:53 +00:00
4bf04dd6ee Fixed fatal error 2020-03-02 12:29:08 +00:00
ca1b92bb34 Support unlisted public posts 2020-03-02 07:57:23 +00:00
Philipp
27b60b200e
Merge pull request from MrPetovan/bug/8002-album-drop-cancel
Use sensible URLs for return after album actions instead of $_SESSION['photo_return'] in mod/photos
2020-03-01 22:21:33 +01:00
Michael Vogel
057df09ffb
Merge pull request from MrPetovan/bug/8219-frio-fix-contact-csv-import
[frio] Enable file upload in settings form
2020-03-01 21:08:19 +01:00
ad2b9198a4 Remove last on/off data occurrences in additional features
- Address https://github.com/friendica/friendica/issues/7999#issuecomment-589808923
2020-03-01 14:15:08 -05:00
7ef3308a8d Improve feedback in mod/settings 2020-03-01 10:15:35 -05:00
f814ca30d3 Use sensible URLs for return after album actions instead of $_SESSION['photo_return'] in mod/photos 2020-03-01 09:56:02 -05:00
nupplaPhil
4f2bea5cb1
Move "regmod" functionality into Admin Users page 2020-02-29 17:10:29 +01:00
nupplaPhil
b4f6e8fda1
Move "User::deny()" to own method and update usages 2020-02-29 17:10:28 +01:00
nupplaPhil
6aee153bbd
Move "User::allow()" to own method and update usages 2020-02-29 17:10:27 +01:00
Philipp
b0690077aa
Merge pull request from MrPetovan/bug/notices
Remove unused conversation response code
2020-02-25 21:45:13 +01:00
e94911620a Expand system.no_auto_update to community, profile statuses and contact conversations pages
- Update setting name and description
2020-02-23 19:38:24 -05:00
452d7e6404 Remove unused conversation response code
- Remove get_responses()
- Remove get_response_button_text()
- Remove title key from $conv_responses array
- Address https://github.com/friendica/friendica/issues/8000#issuecomment-589263329
2020-02-22 20:41:12 -05:00
b2bfec3381 Remove unused template variable in mod/photos 2020-02-22 20:30:28 -05:00
9cbea34fa4 Clean the profile URL when follow 2020-02-22 12:29:33 +00:00
d03fb89494 Replace "hidewall" with "net-publish" / other "hidewall" stuff 2020-02-20 17:24:41 +00:00
637e38e535 User hide_dislike user setting to hide dislike button and conversation responses 2020-02-20 05:37:07 -05:00
1a8110234f Move /settings/display module to src/ 2020-02-20 05:37:06 -05:00
5ea27b1fd5 "fetch" instead of "add" 2020-02-19 20:34:25 +00:00
7ee9aad6ca Some more unneeded settings removed 2020-02-19 19:31:55 +00:00
c57246450f "Delegations" is renamed to "Accounts" 2020-02-19 07:09:29 +00:00
1d3586623c Replace "suggestme" with "net-publish" 2020-02-17 07:16:45 +00:00
101251668c Reworked expiration settings 2020-02-16 20:44:55 +00:00
Philipp
da124af6ed
Merge pull request from MrPetovan/task/5562-community-pagination
Improve community pagination
2020-02-16 19:38:49 +01:00
e0d03615bc Add node-wide default items per page config 2020-02-16 13:04:26 -05:00
561472b975 Add L10n parameter to Pager classes 2020-02-16 12:50:39 -05:00
ee6cceba30 Clarify the effect of "net-publish" 2020-02-16 15:39:44 +00:00
3bd1f3a836 No more gender 2020-02-16 10:55:18 +00:00
682fb7e4e2 Move community module to src/
- Use boundaries pagination instead of number pages
- Trim down community update module output
- Part of https://github.com/friendica/friendica/issues/4090
2020-02-16 04:41:22 -05:00
5d169a4098 Add System::htmlUpdateExit() method to refactor update modules 2020-02-16 04:32:56 -05:00
0b0309ce8f Remove pager parameter from conversation()
- Add getUrlParameter() Javascript function to determine current page
2020-02-13 23:40:00 -05:00
95b09aaec4 [frio] Add loading animation on comment form submit 2020-02-11 23:45:47 -05:00
Michael Vogel
13a10b8f20
Merge pull request from MrPetovan/task/8251-use-about-for-pdesc
Remove profile about field double HTML escaping
2020-02-12 05:23:04 +01:00
1ce5b1d65b Remove profile about field double HTML escaping
- Add BBcode conversion for profile.about in widget/vcard.tpl
2020-02-11 21:38:42 -05:00
Michael Vogel
e80d68ba53
Merge pull request from MrPetovan/task/8251-use-about-for-pdesc
Use profile.about for profile description
2020-02-10 23:36:59 +01:00
2ec3a97393
Merge pull request from annando/remote-follow
New page for remote follow requests
2020-02-09 17:53:13 -05:00
2eebeeaa32 New page for remote follow requests 2020-02-09 17:04:35 +00:00
nupplaPhil
7d714319c8
Add license info at Friendica PHP files 2020-02-09 16:34:23 +01:00
nupplaPhil
85dc9bb96b
Add license info at Friendica PHP files 2020-02-09 16:18:46 +01:00
a42104ce43 Use profile.about instead of profile.pdesc for profile description 2020-02-09 02:36:19 -05:00
6bcb96982a Switch to second person in dfrn_request "know you" field 2020-02-09 01:01:11 -05:00
2fb1819e57 Simplify dfrn_request and auto_request templates
- Limit template variables
2020-02-08 17:08:01 -05:00
7f402da40f Fix undefined variable in contact import n mod/settings 2020-02-07 21:27:35 -05:00
b53f2f2933
Merge pull request from annando/issue-8233
Issue 8233: Fix remote subscriptions
2020-02-06 20:00:13 -05:00
150c74be69 Issue 8233: Fix remote subscriptions 2020-02-06 22:45:22 +00:00
557ece7d5a Remove unused translated yes/no labels in converted checkbox field definitions 2020-02-06 10:25:36 -05:00
4f362f6693 Asynchronously add contacts to avoid timeout problems 2020-02-06 00:00:00 +00:00
nupplaPhil
a78e19ea76
Move Notify::TYPE_POKE 2020-02-05 21:41:05 +01:00
nupplaPhil
51260f234f
Move Notify::TYPE_TAGSELF 2020-02-05 21:41:04 +01:00
nupplaPhil
88dc3efdc9
Move Notify::TYPE_SUGGEST 2020-02-05 21:41:03 +01:00
nupplaPhil
9435cc4b88
Move Notify::TYPE_MAIL 2020-02-05 21:41:02 +01:00
nupplaPhil
e6fb044e60
Move Notify::TYPE_COMMENT 2020-02-05 21:41:02 +01:00
nupplaPhil
b86ad37001
Move Notify::TYPE_WALL 2020-02-05 21:41:01 +01:00
nupplaPhil
6e45514e2c
Move Notify::TYPE_CONFIRM 2020-02-05 21:41:00 +01:00
nupplaPhil
cfd50f9abb
Move Notify::TYPE_INTRO 2020-02-05 21:41:00 +01:00
3f57e16a1a
Merge pull request from annando/a11y-1
Accessibility: A checkbox is a checkbox
2020-02-05 12:10:16 -05:00
07148ecf6b Acessibility: A checkbox is a checkbox 2020-02-05 08:08:32 +00:00
nupplaPhil
0b94b84dc7
simplify mail creation 2020-02-04 21:05:33 +01:00
nupplaPhil
262c94f12f
Fix indents 2020-02-02 22:43:43 +01:00
nupplaPhil
6700467ed4
switched intend 2020-02-02 22:43:43 +01:00
nupplaPhil
97e708f2e2
Remove DI::app() dependency again 2020-02-02 22:43:41 +01:00
nupplaPhil
9428466d1d
Set Sitename / site email as sender for system emails 2020-02-02 22:43:39 +01:00
nupplaPhil
16d9b9ff7d
Fixed wrong email field 2020-02-02 22:43:36 +01:00
nupplaPhil
3291728059
Extract System emails from enotify
- Removed every SYSTEM_EMAIL occurrence in enotify
- Introduced a "SystemMailBuilder" for build system emails
- Replaced every SYSTEM_EMAIL usage in the classes with calling this builder
- Added tests for this new Builder
- Split the email templates between "base" template for email and concrete usages for different use cases
2020-02-02 22:43:35 +01:00
a3028e69aa
Merge pull request from nupplaphil/task/mod_crepair
Move mod/crepair to src/Module/Contact/Repair
2020-02-01 08:28:29 -05:00
96b9619608
Merge pull request from nupplaphil/task/mod_fsuggest
Move mod/fsuggest to src/Module/SuggestFriend
2020-01-31 18:43:32 -05:00
nupplaPhil
f565d590f6
Move mod/crepair to src/Module/Contact/Repair 2020-02-01 00:20:50 +01:00
nupplaPhil
d4e836855b
Remove deprecated code 2020-02-01 00:05:27 +01:00
nupplaPhil
17389de261
Move mod/worker to src\Module\Worker 2020-01-31 22:38:49 +01:00
Philipp
4c07c725b6
Merge pull request from MrPetovan/task/4599-frio-jot-async
[frio] Add new asynchronous submission of modal form
2020-01-30 06:42:12 +01:00
ada9e2a0f2 Suppress Countable type warning messages in mod/dfrn_request
- Address https://github.com/friendica/friendica/issues/8192
2020-01-29 23:19:03 -05:00
b2143cae53 [frio] Add new asynchronous submission of modal form
- Add loading state for jot submit buttons
2020-01-29 22:50:10 -05:00
3370300376 Add new info messages to mod/item 2020-01-29 22:45:13 -05:00
b86083de06 Remove superfluous code in mod/item 2020-01-29 22:44:09 -05:00
4faad5a47c Replace exit calls with exception throwing in mod/item 2020-01-29 22:43:37 -05:00
b03796957b Improve logging in mod/item
- Set legacy Logger constants as deprecated
2020-01-29 22:42:49 -05:00
c17b2efb7a Normalize redirect in item_post() 2020-01-29 22:34:32 -05:00
694d93ded9 Replace json_encode + exit by System::jsonExit in mod/item 2020-01-29 22:31:13 -05:00
c2b8c65104
Merge "notification" routes 2020-01-28 23:21:24 +01:00