clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
38,585 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

686 Commits

Author SHA1 Message Date
Michael 70259965df API: Support for private mails 2021-05-19 21:56:50 +00:00
Michael f001f52e39 API: Fix relationships 2021-05-15 15:02:15 +00:00
Michael 45c2cc3887 API: Account actions 2021-05-14 21:51:32 +00:00
Michael 55919dbd06 API: The instance record had got a malformatted value 2021-05-14 05:09:11 +00:00
Michael 132e08edb8 Whitespaces ... 2021-05-13 11:33:07 +00:00
Michael 7975bc244d Refine OAuth flow 2021-05-13 11:26:56 +00:00
Michael e9fe92a5d7 Merge remote-tracking branch 'upstream/develop' into api-again 2021-05-11 21:21:32 +00:00
Hypolite Petovan cac038639d Capitalize post action translation strings 2021-05-11 16:01:07 -04:00
Michael bade0a2345 Improved cards handling, simplified Bearer handling 2021-05-11 19:15:05 +00:00
Michael 82003bbe47 Login prototype 2021-05-11 06:30:20 +00:00
Tobias Diekershoff 7789ea2507
Merge pull request #10228 from MrPetovan/bug/warnings 
[PHP 8] Fix undefined template variables
 2021-05-11 06:10:29 +02:00
Hypolite Petovan 10e5630988 Don't assume $a->contact is populated in Object\Post::getCommentBox 
- Address https://github.com/friendica/friendica/issues/10167#issuecomment-837238584
- This might reveal some side-effect
 2021-05-10 22:03:51 -04:00
Hypolite Petovan 9ef9fc7c14 Skip URL-less mention terms in Object\Post::getDefaultText 
- Address https://github.com/friendica/friendica/issues/10167#issuecomment-830859710
- Added logging to troubleshoot deeper issue
 2021-05-10 21:50:42 -04:00
Hypolite Petovan 2c6bf754d5 Fix undefined variables in wall_thread.tpl 
- Remove unused "num_comments_text" template variable
- Remove unused "item.postops" template variable mention
 2021-05-10 18:59:09 -04:00
Michael 585d283ff9 Preparation for Oauth client registration 2021-05-09 22:23:21 +00:00
Michael 7a576111c7 Code styling 2021-05-09 11:56:34 +00:00
Michael cc5d4db6a3 Notifications are now supported as well 2021-05-09 11:50:05 +00:00
Michael 5bb5c44bd9 API: added account related endpoints 2021-05-09 09:35:51 +00:00
Hypolite Petovan 98c2ca34f5 Remove block/ignore links from contact/item action menus for self 2021-05-04 08:45:27 -04:00
Michael 238adabefb Catch Imagick errors 
See https://github.com/friendica/friendica/issues/9747#issuecomment-809675750
 2021-04-12 12:37:11 +00:00
Balázs Úr 054c301ef0 Update copyright 2021-03-29 08:40:20 +02:00
Michael e98d11a9ae Limit the size of contact avatars 2021-03-26 06:56:08 +00:00
Michael 5bbcb8bdf4 ActivityPub: Delete Comments 2021-03-24 22:22:14 +00:00
Michael e6f4ed47e2 Avoid error "Uncaught ImagickException: Unable to scale image" 2021-03-23 20:01:32 +00:00
Michael 2bbfbd57b0 Only offer "ignore thread" when there is a need for this 2021-02-28 11:20:02 +00:00
Michael 312c01a517 Several speed improvements (magiclink, caching, indexes) 2021-02-17 18:59:19 +00:00
Michael 890d1057d2 No implicit mention for top level Diaspora comments 2021-02-16 07:20:41 +00:00
Michael c1d99d6c4c Most user-item traces removed 2021-01-31 23:37:34 +00:00
Michael Vogel 199f72ee3c
Merge pull request #9823 from MrPetovan/task/9677-2fa-remember-device 
Add "Remember this device" feature to two factor authentication
 2021-01-27 22:32:08 +01:00
Michael ef0400fc19 "uri-id" instead of "uri" or "id" 2021-01-27 10:01:42 +00:00
Hypolite Petovan 82e094179c Rename notify classes according the feature name, not the table name 2021-01-24 09:33:23 -05:00
Hypolite Petovan 0fc5f26ff7 Replace BaseEntity with BaseDataTransferObject class for API representation classes 2021-01-23 05:42:58 -05:00
Hypolite Petovan 6b0df74ed7 Add blocking author from an item context feature 2021-01-23 05:30:03 -05:00
Michael b892db0cf3 All item selects are now done by the post class 2021-01-19 07:23:01 +00:00
Michael 4157db5473 "item" is replaced by "post-view" / postupdate check added 2021-01-17 20:32:13 +00:00
Hypolite Petovan e68f7444ed
Improve class alias naming in Object\Post 2021-01-16 08:12:41 -05:00
Michael 2fa692bcce New post class in the rest of the classes 2021-01-16 04:16:09 +00:00
Hypolite Petovan c8604895c4 [frio] Add share dropdown to mobile post view 
- This should prevent accidental taps from resharing content unwittingly
 2021-01-07 10:13:40 -05:00
Hypolite Petovan 8b3ab4e6bb Refactor builtin_activity_puller() and format_like() 
- Simplify output array
- Rename format_like() to format_activity()
- Remove duplicate parameters in format_activity()
 2020-11-21 11:08:44 -05:00
Michael ba4685dfb1 API: Support for reshared items 2020-11-01 11:01:57 +00:00
Michael c030275815 API: accounts and trends 2020-10-31 22:32:26 +00:00
Michael 752f5b09d7 Use the raw body if not null 2020-10-31 16:32:41 +00:00
Michael e6030e5f82 API: Media attachments are now supported 2020-10-31 16:10:27 +00:00
Michael a012234d82 Publish the provider fields in the API 2020-10-26 19:40:09 +00:00
Michael 44a4b66539 Improved self contact detection 2020-10-25 20:40:25 +00:00
Michael d8d96e6e61 Display the user fields for the admin account 2020-10-25 20:32:45 +00:00
Michael 463f8ee3f3 Use lowercase for tags 2020-10-25 17:59:28 +00:00
Michael 825189e8e9 Don't publish some fields 2020-10-25 17:42:42 +00:00
Michael 72efcc8169 "locked" is boolean 2020-10-25 16:59:38 +00:00
Michael 13b14bff91 Return 'null' on empty card 2020-10-25 16:55:05 +00:00
Michael efcd76d3a7 Spaces to tabs 2020-10-25 16:26:47 +00:00
Michael a643888aeb More data for the Mastodon status class 2020-10-25 16:13:31 +00:00
Michael Vogel 4f6bf9e518
Update src/Object/Post.php 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-10-12 03:58:56 +02:00
Michael a173bf8eab Diaspora: Native reshares only work with toplevel posts 2020-10-11 21:45:49 +00:00
Michael dbdc8c91f6 Diaspora announce / Renaming share buttons 2020-10-11 19:58:28 +00:00
Michael 7c5aa0bbf1 "announce" is activated for Twitter as well 2020-10-11 12:27:19 +00:00
Michael d3e19bc880 Support for real reshares 2020-10-11 08:49:47 +00:00
Michael b6b28b1541 Display the languages in the post 2020-10-04 18:52:28 +00:00
Michael 2c1e9b92eb Fix fatal error: Uncaught ImagickException: cache resources exhausted 2020-10-02 20:58:14 +00:00
Philipp 8318a0b640
Move ExAuth, FKOAuth1 & FKOAuthDataStore to own namespace Friendica\Security 2020-09-30 11:14:01 +02:00
Philipp 30bc65e81e
Remove whitespace before ":" of mail headers 2020-09-28 19:22:29 +02:00
Philipp b1a402a787
Fix newline email error 2020-09-22 21:08:36 +02:00
Michael 6c7bce86fe Avoid fatal error on the community page 2020-09-20 17:37:09 +00:00
Hypolite Petovan 722aada460
Merge pull request #9242 from nupplaphil/bug/9142-message-id 
Transform email header string to header array
 2020-09-19 22:10:20 -04:00
Philipp ac1d2cf38f
Transform email header string to header array & replace it at various situations. 2020-09-19 20:16:55 +02:00
Hypolite Petovan 76d6962129 Remove superfluous variable in item template variables 2020-09-13 20:01:54 -04:00
Hypolite Petovan 3fa3e78844 Normalize item like/dislike template variable name 2020-09-13 20:01:54 -04:00
Hypolite Petovan 8d5eb61ea3 Normalize item comment template variable name 2020-09-13 20:01:54 -04:00
Hypolite Petovan 65b796ed1f Normalize item_photo_menu template variable name 2020-09-13 20:01:53 -04:00
Hypolite Petovan 2bfd53bf09 Normalize item body template variable name 2020-09-13 20:01:53 -04:00
Hypolite Petovan 9ff228812f Normalize item location template variable name 2020-09-13 20:01:51 -04:00
Philipp 61014feec3
Fix ContactEndpoint & tests 2020-09-12 10:01:13 +02:00
Hypolite Petovan 4065f71382 Fix qcomment addon 
- Initialize $qcomment template variable everywhere it is expected
- Remove addon Javascript from core head template
 2020-09-09 16:49:03 -04:00
Michael 206caaf51a Reshared data now is a link 2020-09-09 04:49:42 +00:00
Michael 42dcd6646e Issue 9135: Display only reshared posts at the top 2020-09-08 22:06:10 +00:00
Michael e45ccea0f2 Tabs instead of spaces 2020-09-08 01:45:59 +00:00
Michael 24f1bb4ea1 Class file renamed 2020-09-08 01:44:49 +00:00
Michael Vogel 2bb725fa30
Apply suggestions from code review 
Co-authored-by: Hypolite Petovan <hypolite@mrpetovan.com>
 2020-09-08 03:39:51 +02:00
Michael 59374eb6c6 Use "StatusCounts" class 2020-09-07 18:24:11 +00:00
Michael 1bca280eae StdClass instead of arrays 2020-09-07 14:34:05 +00:00
Michael db6282b5e2 API: Counts added, local query improved 2020-09-06 07:12:04 +00:00
Michael 90dc60cee7 Replace spaces with tabs 2020-09-03 19:24:30 +00:00
Michael 0de372aceb Space replaced 2020-09-03 19:16:42 +00:00
Michael 305fe62659 Content is now filled 2020-09-03 19:13:03 +00:00
Michael cd3d4ae4e6 API: New entity "status" 2020-09-03 18:57:18 +00:00
Michael 8402450101 Always use the oldest creation data 2020-09-02 04:17:13 +00:00
Michael cbf1e5c699 New field "manually-approve" for contact table 2020-09-02 03:02:50 +00:00
Michael ca9f916ecd Removed comment 2020-09-02 01:45:45 +00:00
Michael 7b903e1ca8 The account fields are rearrange to match Mastodon 2020-09-01 20:59:50 +00:00
Michael 0e4d3fe9e5 Display a symbol when a post had been reshared 2020-08-23 13:26:23 +00:00
Michael dd82f150ca Rework of the network page 2020-08-13 20:07:13 +00:00
Michael 71b6226909 Some more avatar function replacements 2020-07-28 19:30:55 +00:00
Hypolite Petovan afb882048e Generate callstack value from inside Profiler::saveTimestamp 
- Save a massive amount of time computing callstacks when profiling is disabled
 2020-07-27 02:33:05 -04:00
Michael 5bf813d0ec Use "failed" field 2020-07-19 11:42:23 +00:00
Michael fc0312451d Changed parameter order for getByURL 2020-07-15 17:06:48 +00:00
Michael d9c6a46ffe Replaced "getDetailsByURL" with "getByURL/getByURLForUser" 2020-07-15 04:42:04 +00:00
Michael c947b7f211 "print_r" in logging replaced / obsolete stuff removed 2020-06-29 20:22:00 +00:00
Hypolite Petovan 173264eaab Add Twitter User Object and Factory 2020-06-08 21:51:42 -04:00
Michael Vogel 235f4eaa89
Merge pull request #8697 from MrPetovan/task/8691-like-links-one-way 
Make like links one way
 2020-05-29 15:33:24 +02:00
Hypolite Petovan e20d5ff0b5 Fix the event feature disabling logic in Object\Post 
- Conditions on item network and dislike feature presence were mixed which could have led to unexpected behaviors
 2020-05-27 08:41:12 -04:00
Michael 973abb6196 Replace "id = parent" checks with "gravity" checks 2020-05-27 12:19:06 +00:00
Michael 3b2ae5c4a9 function names changed 2020-05-01 06:01:22 +00:00
Michael 5df5e9521b The tag table is now really used 2020-04-26 15:24:58 +00:00
Michael d3722c945b Improved Mime Type detection 2020-04-01 05:42:44 +00:00
Michael d63e903d9f Changed template for direction 2020-03-03 21:29:51 +00:00
Michael 72c198990e Merge remote-tracking branch 'upstream/develop' into private 2020-03-02 15:05:00 +00:00
Michael ca1b92bb34 Support unlisted public posts 2020-03-02 07:57:23 +00:00
Hypolite Petovan 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
Hypolite Petovan 637e38e535 User hide_dislike user setting to hide dislike button and conversation responses 2020-02-20 05:37:07 -05:00
Michael efddd248f7 "remote_follow" is now "remote_comment" 2020-02-18 17:31:02 +00:00
Michael d64bb0dd8f Remotely load posts to comment on them on the own page 2020-02-18 06:57:38 +00:00
Michael 3bd1f3a836 No more gender 2020-02-16 10:55:18 +00:00
Hypolite Petovan 2a7de4213f Correctly initialize post actions button template variable 
- Address https://github.com/friendica/friendica/issues/7999#issuecomment-586020764
 2020-02-13 20:42:15 -05:00
Hypolite Petovan 95b09aaec4 [frio] Add loading animation on comment form submit 2020-02-11 23:45:47 -05:00
nupplaPhil 85dc9bb96b
Add license info at Friendica PHP files 2020-02-09 16:18:46 +01:00
nupplaPhil 23c64b9a11
Add license info at Friendica classes 2020-02-09 15:45:36 +01:00
Michael 6e02105d88 Useless links removed / Item menu is moved to the item actions bar 2020-02-06 22:06:24 +00:00
nupplaPhil 3a012d6fb7
Fix ItemCCMail 2020-02-01 20:11:09 +01:00
Philipp 0406fe7ade
Merge pull request #8163 from MrPetovan/task/7817-custom-fields-part-3 
New custom profile fields feature part 3: Updating the API
 2020-01-31 22:39:11 +01:00
nupplaPhil fc370f74ea
Fix secure Mail addon 2020-01-31 19:32:17 +01:00
Hypolite Petovan 608e634858 Update Mastodon API with new profile field entity 2020-01-29 23:30:38 -05:00
Hypolite Petovan 07a4bb73fa Add DDD classes for Mastodon\Field entity 2020-01-29 23:26:07 -05:00
nupplaPhil f6aea0d65a
Fix invalid "emailer_prepare" Hook 
- Use IEmail instead of array data
- Introduce "composer" based library for phpmailer
 2020-01-29 20:20:40 +01:00
nupplaPhil 2b433e0ea6
fix https://github.com/friendica/friendica/issues/8187 2020-01-28 22:06:59 +01:00
nupplaPhil 582f6bd4a3
Refactor API notification usage 
- Remove "mapFields()" from BaseModel
- Add new Notification API entity (including collection)
- Add new NotificationFactory method "getApiList()"
 2020-01-28 21:28:57 +01:00
Hypolite Petovan bd910342df Add custom emojis Mastodon API endpoint 2020-01-28 08:14:48 -05:00
Hypolite Petovan 0de8e4db08 Move Mastodon API entities to src/Object 2020-01-27 20:01:32 -05:00
nupplaPhil 6350b210a6
Renaming - part 2 :-) 2020-01-27 00:01:17 +01:00
nupplaPhil 765a0d8892
Some Renames: 
- EMail => EMail
- toEmail => toAddress
- fromEmail => fromAddress
 2020-01-26 23:47:16 +01:00
nupplaPhil f6878b5bcf
fix return type 2020-01-26 21:35:05 +01:00
nupplaPhil 4efba4d0cf
fix boolean field 2020-01-26 21:35:04 +01:00
nupplaPhil 2b8f067715
Introduce interface for emailing and create email classes 2020-01-26 21:35:04 +01:00
nupplaPhil 74f3a2f90c
Fix API result, add PHPDoc and cleanup object construction 
Fix missing getters
fix data array
fix missing "$" for template-variables
Remove lazy-loaded parent notification instance (for now..)
 2020-01-25 21:15:01 +01:00
nupplaPhil 4c5856da2b
update PHPDoc 2020-01-25 19:58:27 +01:00
nupplaPhil 0850fb88dd
ReWork Notification Model/Module/Object/Repository/Factory 
- Introduce Repository for interaction with "notify" table
- Introduce Factory for read-only notification objects (they're just loosely based on notification the table!)
- Introduce Objects for type-safe usage at the presentation layer
- Reworked Model, which is now fully based on the notify table, including generated fields (cache, ..)
 2020-01-25 19:58:22 +01:00
Hypolite Petovan 6d7f0a6fd8 Remove duplicate profile_uid key in App->profile array 2020-01-20 07:32:46 -05:00
nupplaPhil ed9392469e
Remove unneeded Config namespace usages 2020-01-19 22:50:44 +01:00
nupplaPhil 6c36fd9e01
Move Config::get() to DI::config()->get() 2020-01-19 21:21:13 +01:00
nupplaPhil d6efc90194
cleanup namespace usages for L10n 2020-01-19 16:31:33 +01:00
nupplaPhil a9a36fb302
Move L10n::tt() calls to DI::l10n()->tt() calls 2020-01-19 16:31:17 +01:00
nupplaPhil 5dfee31108
Move L10n::t() calls to DI::l10n()->t() calls 2020-01-19 16:31:16 +01:00
Michael cdbc94a9e1 Some more added lines 2020-01-19 09:51:37 +00:00
Michael 0a4119adaf @brief is removed completely 2020-01-19 06:05:23 +00:00
nupplaPhil 800694e9b3
Remove unused use statements & remove PConfig class 2020-01-18 17:02:59 +01:00
nupplaPhil 9e9429b56d
Move PConfig::get() to DI::pConfig()->get() 2020-01-18 16:50:57 +01:00
nupplaPhil 33674808dc
Remove deprecated App::cmd - replace with DI::args()->getCommand() 2019-12-29 20:17:51 +01:00
nupplaPhil e6f61c2cc7
Remove deprecated App::query_string - replace with DI::args()->getQueryString() 2019-12-29 20:17:50 +01:00
nupplaPhil e93fba5136
Remove deprecated App::removeBaseURL - process methods to DI::baseUrl()->remove() 2019-12-29 20:17:45 +01:00
nupplaPhil 181529f3df
Refactor dynamic App::getProfiler() to static DI::profiler() 2019-12-29 20:17:42 +01:00
nupplaPhil 388b963714
Replace BaseObject class with DI::* calls 2019-12-29 20:17:38 +01:00
nupplaPhil 1de3f186d7
Introduce new DI container 
- Adding Friendica\DI class for getting dynamic classes
- Replacing BaseObject::getApp() with this class
 2019-12-29 20:16:55 +01:00
Michael c037e9143c Additionally display the protocol together with the network 2019-12-27 17:24:29 +00:00
Michael 48ec65eb4b Fix the "ago" date (with "received at") for other themes than frio 2019-12-26 19:51:36 +00:00
Michael 3d701dd459 Only show the difference between posting and receive date when there is a difference 2019-12-03 07:23:01 +00:00
Michael 02875df596 Show the received date along with the creation date of posts 2019-11-29 06:24:02 +00:00
Michael fc94cad5f2 Pinned posts now work for visitors in the intended way 2019-11-08 06:52:44 +00:00
Michael ed58af25a5 show pinned items 2019-11-07 06:53:18 +00:00
Michael cf56992444 We can now pin our own posts 2019-11-07 05:39:15 +00:00
Hypolite Petovan 03bf1dcbd3 Move Object\Image static methods to Util\Images 
- Optimize imports in modified files
 2019-11-02 07:48:45 -04:00
Philipp Holzer 3897c74deb
Add docs 2019-10-25 00:10:20 +02:00
Philipp Holzer 07cea24430
Move Activity/Namespaces defines to constants 2019-10-24 21:40:12 +02:00
Philipp Holzer edf006905b
Move (last) get_cats_and_terms to Content\Item::determineCategoriesTerms() 
- Added incomplete test
 2019-10-23 02:48:46 +02:00
Philipp Holzer 52c42491c4
Move activity_match() to Protocol\Activity::match() 
- With tests
 2019-10-23 02:05:11 +02:00
Hypolite Petovan 146646c4d4 Replace deprecated calls to defaults() by ?? and ?: in src/ 2019-10-16 08:38:52 -04:00
Michael 83b00ef308 New function "isAuthenticated" 2019-09-28 18:09:11 +00:00
Michael ec66553032 Reworked "remote" cookie handling 2019-09-25 22:24:17 +00:00
Michael 9cbf320c86 Issue 7563: Use icons instead of names on posts 2019-08-28 06:38:35 +00:00
Michael 5a1a5a54dc Delivery count now counts the failed delivery attempts as well 2019-08-20 07:39:13 +00:00
Hypolite Petovan b9ab613777 Merge branch 'master' into develop 2019-06-23 17:40:52 -04:00
Philipp Holzer cc7444d84d
Move internal recursion-counter to the end of all cur/fetchUrl parameters 2019-06-10 14:34:54 +02:00
Hypolite Petovan 01e71254d9 Replace defaults() calls on $_SESSION by Core\Session calls 
- Replace direct calls to $_SESSION by Core\Session calls in Module\Login
 2019-05-26 21:26:59 -04:00
Philipp Holzer 059b813090
Add PhpDoc / Code Standards 2019-05-20 19:14:39 +02:00
Philipp Holzer 1e36c68e48
Moving Search to Core, Refactor Objects 2019-05-20 18:42:27 +02:00
Philipp Holzer 419cc81ef1
renaming 2019-05-19 05:13:06 +02:00
Philipp Holzer e00f110ef1
Move mod/dirfind to src/Module/DirFind 2019-05-19 04:28:16 +02:00
Philipp Holzer 09c44f96fd
Moving Model call outside Object Namespace 2019-04-05 07:53:54 +02:00
Michael a0fddca407 Display if an item is reshared 2019-04-02 05:38:42 +00:00
Philipp Holzer c2fd579916 typo 2019-03-22 22:56:57 -04:00
Philipp Holzer 8237e73e26 Adding REAMDEs to directories 2019-03-22 22:56:57 -04:00
Michael ea40308048 Fixing automention 2019-03-19 22:07:53 +00:00
Michael 694cf50509 Fix mentions - again 2019-03-11 06:41:48 +00:00
Michael 337a3bb1aa Fix for the automatic mentioning 2019-03-10 05:41:40 +00:00
Hypolite Petovan 5f2a66e66c Add check for EXIF data existence in Object/Image 
- Addresses https://github.com/friendica/friendica/issues/6338#issuecomment-467121955
 2019-03-08 22:09:41 -05:00
Hypolite Petovan e51f2cea0d Add implicit mentions to explicit mentions default text 2019-02-23 17:32:12 -05:00
Hypolite Petovan 34bc0b0c97 Add potential debug display of implicit mentions in frio 
- Refactored conversation() by removing extraneous intermediary variables
 2019-02-23 17:32:11 -05:00
Hypolite Petovan 7320c5e8e8 Normalize Contact::magicLinkByContact method name 2019-02-23 17:32:10 -05:00
Michael 7703875b55 Fixes "Undefined property: Friendica\App::$queue" 2019-02-23 16:08:02 +00:00
Michael 08d92d7ad8 Automatically adding mentions in the network stream hadn't really worked 2019-02-21 20:42:00 +00:00
Hypolite Petovan 256e845c5d
Merge pull request #6641 from nupplaphil/config_followup 
Config FollowUp
 2019-02-17 17:56:31 -05:00
Philipp Holzer 0a7861da65
Dependency of callstack moved one layer up 2019-02-16 23:17:10 +01:00
Philipp Holzer 5e6e1a8025
Introducing Profiler 2019-02-16 23:11:30 +01:00
Hypolite Petovan d7dbc632f8 Improved comment hiding interaction 
- Remove global window.showMore and window.showFewer
- Improve global showHideComments function
- Remove frio-specific showHideComments function
 2019-02-14 22:24:34 -05:00
Michael Vogel c7308d98fa
Merge pull request #6614 from MrPetovan/task/6552-add-explicit-mentions 
Add explicit mentions to ActivityPub/Diaspora comments
 2019-02-10 00:52:40 +01:00
Hypolite Petovan 7c58944449 Add "delivery done" label 2019-02-08 23:19:26 -05:00
Hypolite Petovan 9887f2c3d0 Toggle explicit mentions in comment boxes with explicit_mentions config 2019-02-08 23:07:36 -05:00
Michael 71fe689aae Some small notice prevented 2019-02-06 07:30:31 +00:00
Michael a7963fe18a AP: Automatically send follow requests for reshared items 2019-01-30 21:33:23 +00:00
Michael f226464acc Don't auto mention yourself or forums, don't do it in the firstlevel post 2019-01-30 03:36:24 +00:00
Michael e38eebe529 Standards 2019-01-28 22:06:28 +00:00
Michael d259007f11 Removing the parameter 2019-01-28 21:53:13 +00:00
Michael d40b2792b6 Display mentioned users and in the comment box by default 2019-01-28 21:22:03 +00:00
Hypolite Petovan 64847e7cc8 Fix types in doc blocks/prototypes 2019-01-23 09:06:58 -05:00
Hypolite Petovan b161bd1dfa Improve get_responses() prototype 2019-01-21 11:37:05 -05:00
Hypolite Petovan ce177f22c8 Fix doc blocks and return value type 2019-01-21 11:36:01 -05:00
Hypolite Petovan ad9c67663d Move Contact::Page_* constants to User::PAGE_FLAGS_* 2019-01-21 10:55:37 -05:00
Hypolite Petovan 4a95ca280d Remove unused code 
- Remove commented code
- Remove unused/immediately overwritten variables
- Remove extraneous parameters
- Remove unreachable code
- Remove duplicate array keys
 2019-01-21 10:48:40 -05:00
Hypolite Petovan cb3f09ae4f Refactor namespaces 
- Remove unused use statements
- Add required use statements
- Escape global classes
 2019-01-21 10:43:42 -05:00
Hypolite Petovan af9067a381 Update PHPDoc in mod/ 2019-01-21 10:39:27 -05:00
Hypolite Petovan 3282ce5389 Fix PHPDoc comments project-wide 2019-01-21 10:35:51 -05:00
Hypolite Petovan 55e54bb950 Replace deprecated Addon::callHooks with Hook::callAll 
- Update documentation
 2019-01-21 09:50:56 -05:00
Hypolite Petovan 6538a8eaca Add delivery queue display in frio and vier 
- Add new $item.owner_self and $item.delivery keys for display
- Add new sub/delivery_count.tpl template
 2019-01-21 09:39:13 -05:00
Hypolite Petovan dea1a98a5d Fix various documentation issues/unused variables 2019-01-21 09:33:24 -05:00
Hypolite Petovan 5e1ceb57de Escape global namespaced get_app() calls 
- Add deprecated status
 2019-01-03 21:27:36 -05:00
Hypolite Petovan acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
Hypolite Petovan 69a73678eb
Merge pull request #6226 from annando/oembed-array 
Ignoring OEmbed array values
 2018-12-02 19:16:13 -05:00
Michael 58b614bea1 Ignoring OEmbed array values 2018-12-02 21:36:46 +00:00
Hypolite Petovan 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
Michael 4f9f86e310 We are now escaping many template fields 2018-11-25 18:56:26 +00:00
Hypolite Petovan 03de5c018f Fix ignore link showing for anonymous users 2018-11-23 01:25:38 -05:00
Michael aa1882fd99 Sanitize the OEmbed data before processing it 2018-11-21 07:07:24 +00:00
Michael 43079bfaf8 Several default features are now in the core 2018-11-18 20:13:46 +00:00
Michael e2ea4a3dc3 Allow to delete every post, even public ones 2018-11-17 22:56:28 +00:00
Michael 6ad082a710 Improved delete text to clarify AP comment delete behaviour 2018-11-15 06:36:06 +00:00
Adam Magness 5276c28a78 link_compare calls 
implement compareLink function.
 2018-11-08 10:46:50 -05:00
Adam Magness 7cb9138201 Move another function 
move get_plink to Item class, and also fix up getApp since we extend BaseObject
 2018-11-07 07:19:39 -05:00
Adam Magness e537f7d017 Function calls 
update function calls to new class
 2018-11-06 21:16:27 -05:00
Philipp Holzer 6e10bdf361
Move random Digits to Crypto class 2018-11-05 21:02:54 +01:00
Jonny Tischbein b66bcb20da Redirect to previous page after NON-AJAX Post delete via second parameter in /item/drop 2018-10-31 20:09:44 +01:00
Adam Magness 35abc4bb64 get markup template 
implement getMarkupTemplate function
 2018-10-31 10:44:06 -04:00
Adam Magness 91facd2d0a replace macros 
implement new replaceMacros function
 2018-10-31 10:35:50 -04:00
Adam Magness 50da89d861 Logger Levels 
update logger levels in calls
 2018-10-30 09:58:45 -04:00
Adam Magness 14fde5dc9b Log function 
implement log() function.
 2018-10-30 09:57:14 -04:00
Hypolite Petovan 9c9ebfc7c9
Merge pull request #6013 from JonnyTischbein/issue_comment_media_link_prompt 
[frio] Add media / link prompt in comments
 2018-10-24 12:17:58 -04:00
Jonny Tischbein d2b5f77be9 Add multimedia link for jot + enables hover text in jot + autosize in when paste link + renaming / Code Standards 2018-10-24 16:20:10 +02:00
Jonny Tischbein d0c43c5597 Add prompt for link and media in comment + remove video symbol 2018-10-23 19:50:19 +02:00
Hypolite Petovan ca9cad3491 Move hook-related methods from Core\Addon to Core\Hook 2018-10-22 16:50:54 -04:00
Michael 8e11f055b1 Improve PR 5984: better check for remote users as well 2018-10-21 21:56:46 +00:00
Michael 9b387a226c Fix webmentions and microformats ("redir" only for logged in users) 2018-10-21 20:23:08 +00:00
Hypolite Petovan ec0d3a6eac
Merge pull request #5946 from JonnyTischbein/move_include_security 
Move and Split include/security
 2018-10-19 08:55:08 -04:00
Jonny Tischbein f3fc1f36ca Renaming functions + moving functions from security to Model/Item and BaseModule + fix multiline comments 2018-10-17 21:30:41 +02:00
Jonny Tischbein 05be2db725 Move include/security tp /src/Core/Authentication and /src/Util/Security 2018-10-17 14:19:58 +02:00
Jonny Tischbein be2e6c3929 Fix Issue #5896 by setting static return for edit_post to display item page (kind of revert parts of #5774) 2018-10-16 19:14:55 +02:00
Philipp Holzer ffbc688797
Curl Response Refactoring 
- refactored Network::getCurl()
- replaced every Network::getCur() execution with a Curl Response
 2018-10-10 21:50:13 +02:00
Philipp Holzer 5a02e39a65
Rename App Methods 
- renamed a lot of App methods to CamelCase
- replaced direct public variables with get-/set-Methods
 2018-10-10 00:16:06 +02:00
Michael 9fbaaa1481 We now can show "Friendica (AP)" as network name 2018-10-05 19:26:20 +00:00
Michael 834422d52f Merge remote-tracking branch 'upstream/develop' into ap1 2018-09-24 21:48:40 +00:00
Hypolite Petovan a6996601d5
Merge pull request #5789 from friendica/master 
Update develop from master-2019.09
 2018-09-23 18:55:20 -04:00
Michael 6df6d82427 We can now like and dislike 2018-09-23 08:52:07 +00:00
Jonny Tischbein 807ad14521 calculate form return_url for post and message instead of using SESSION var 2018-09-19 23:55:29 +02:00
Hypolite Petovan 9d0a6f90b6 Update "mrpetovan" email address 
- Fix Tobias' email address
- Fix copypasted doc block in Console/PostUpdate
 2018-09-15 19:28:38 -04:00
Michael 380eeaab88 Still there had been notices - must have a good camouflage 2018-08-31 05:08:22 +00:00
Michael Vogel edcd0a3744 Issue 4960: Ignoring and blocking of contacts should work again (#5657) 
* Issue 4960: Ignoring and blocking of contacts should work again

* Renamed functions

* This function should be renamed as well.

* We now have a frontend to block and ignore public contacts

* Hide some parts for public contacts

* Removed notices, public contact is now accessible from dirfind as well

* We now show contact conversations and contact posts

* We now use a new conversation mode

* The update functionality is disabled until it will work completely

* Fixing tabs chaos

* Update after posts on the contacts page will now work

* Show connect link
 2018-08-25 09:48:00 -04:00
Roland Häder e06fc2aa69 Stopped using deprecated constants NETWORK_* (#5537) 
* Rewrite:
- stopped using deprecated NETWORK_* constants, now Protocol::* should be used
- still left them intact for slow/lazy developers ...

* Removed deprecated NETWORK_* constants as per code reviewer's request.
 2018-08-11 22:40:44 +02:00
Michael Vogel 276abfaba6 Issue 5158: Ignore all threads, even public ones (#5588) 
* Issue 5158: Ignore all threads, even public ones

* Remove some notice

* Now it really should work

* Using "defaults"
 2018-08-08 22:32:11 +02:00
Roland Häder 4d39164c1e [WIP] Rewrite to Proxy class: (#5507) 
* Rewrite to Proxy class:
- introduced new Friendica\Network\Proxy class for in exchange of proxy_*()
  functions
- moved also all PROXY_* constants there as Proxy::*
- removed now no longer needed mod/proxy.php loading as composer's auto-load
  will do this for us
- renamed those proxy_*() functions to better names:
  + proxy_init()           -> Proxy::init()         (public)
  + proxy_url()            -> Proxy::proxifyUrl()   (public)
  + proxy_parse_html()     -> Proxy::proxifyHtml()  (public)
  + proxy_is_local_image() -> Proxy::isLocalImage() (private)
  + proxy_parse_query()    -> Proxy::parseQuery()   (private)
  + proxy_img_cb()         -> Proxy::replaceUrl()   (private)

* Ops, need to set $a here ...

* CR request:
- moved Proxy class to Friendica\Module
- extended BaseModule

* Ops, no need for own instance of $a when self::getApp() is around.

* Proxy-rewrite:
- proxy_url() and proxy_parse_html() are both non-module functions (now
  methods)
- so they must be splitted into a seperate class
- also the SIZE_* and DEFAULT_TIME constants are both not relevant to module

* No instances from utility classes

* Fixed error:
- proxify*() is now located in `Friendica\Util\ProxyUtils`

* Moved back to original place, ops? How did they move here? Well, it was not
intended by me.

* Removed duplicate (left-over from split) constants and static array. Thank to
MrPetovan finding it.

* Renamed ProxyUtils -> Proxy and aliased it back to ProxyUtils.
 2018-07-30 22:06:22 -04:00
Roland Häder 4a22710b3b Moved global PAGE_* to Profile class (#5500) 
* Rewrites:
- moved PAGE_* to Friendica\Model\Profile class

* Fixed more rewrites from plain (global namespace) PAGE_* to Friendica\Models\Profile class

* CR request:
- moved all PAGE_* constants to Friendica\Model\Contact class
- fixed all references of both classes

* CR request:
- moved ACCOUNT_TYPE_* constants from boot.php to Contact::ACCOUNT_TYPE_*

* Just copy-pasted this code from boot.php, needs to be changed to `const ACCOUNT_TYPE_FOO = x;`

* Ops, melting brain cells here ... :-/
 2018-07-27 19:25:57 -04:00
Hypolite Petovan df917251ff Fix undefined oembed properties 
- Add Object\OEmbed class
 2018-07-24 07:56:27 -04:00
Hypolite Petovan d09ab35816 Fix getimagesizefromstring() read errors 2018-07-24 07:54:12 -04:00
Michael Vogel ca2c316de0 Some removed notices when viewing events (#5483) 2018-07-24 07:51:50 -04:00
Hypolite Petovan ecea7425f8 Rename DBA::is_result to DBA::isResult 2018-07-23 11:04:14 -04:00
Hypolite Petovan 0ec44f3e8a Rename DBM method calls to DBA method calls 2018-07-23 11:02:24 -04:00
Hypolite Petovan af6dbc654f Rename Friendica\Database\dba to Friendica\Database\DBA 2018-07-20 08:19:26 -04:00
Hypolite Petovan daa1177e3a Update use statement lists with new Friendica\Database\dba class 
- Remove unused use statement
- Remove superfluous use statements (classes in the same namespace)
- Add missing use statements
 2018-07-19 22:15:21 -04:00
Michael Vogel 5af9596dde New item field "Post-type" and new table "permissionset" (#5408) 
* "post-type" replaces "bookmark" and "type"

* Removed some more type

* Added index to permission set

* The permission set is now stored

* The permission set is now removed upon expiry

* Post update now stores the permission set

* New file

* Permissions are now sorted

* Changed documentation
 2018-07-19 09:52:05 -04:00
Michael Vogel 0360f7197a Several more warnings ... (#5340) 
* Some more warnings removed

* Even more warnings ...

* Will it ever end? ;-)

* Avoid warning in dbstructure

* Origin and OStatus ...

* There are more warnings solved ... yeah!

* And again ...

* We are not done yet

* And more ...

* And some new places ...

* And more in the feeds

* Avoid some more

* And some backend stuff

* Notifications cleared

* Some more stuff

* and again ...

* It's getting fewer ...

* Some warnings had been hidden in the notifications

* Fix the fix

* And another missing one ...

* We need the owner here, not the user

* Forgotten user

* And more ...

* And some more warnings disappeared ...

* Some more frontend warnings

* Some backend warnings removed

* Fixed sidebar for "vier"

* And more ...

* Some more ...

* And something for "remote self"

* Am I stuck in an endless loop?

* Fix: Clear tag and file field on update

* Preset page content
 2018-07-10 08:27:56 -04:00
Michael 3e797547a3 Warnings fixed 2018-07-08 09:37:05 +00:00
Michael 69db696ab1 Improve test behaviour 2018-07-08 05:29:06 +00:00
Michael 271b6cb8f9 Hopefully this fixes the tests 2018-07-08 05:10:45 +00:00
Michael 4d35e228c4 More item abstraction / making remote deletion work again 2018-07-07 18:14:16 +00:00
Michael 80f9a45cba Fix: Twitter reshares hadn't been shown as this 2018-07-02 21:15:54 +00:00
Michael 717ca0b7eb Use already fetched data for magiclink 2018-07-02 05:41:55 +00:00
Michael b03db4643f The fetch function now centrally controls the content 2018-06-24 10:48:29 +00:00
Michael 4714cb746b Use the item functions at many more places 2018-06-18 20:36:34 +00:00
Michael 77c423ec04 Don't allow deletion of public posts 2018-06-13 19:19:17 +00:00
Michael 3f07d01dd1 Get rid of unneeded or redundant fields 2018-06-03 07:42:56 +00:00
Michael 723b5ae803 Use MagicLinkbyId when possible 2018-06-02 08:28:01 +00:00
Michael 8a34895a23 Use magicLink whenever possible 2018-06-02 08:05:06 +00:00
Michael 885f2b52d1 Merge remote-tracking branch 'upstream/develop' into public-redir 2018-06-02 06:18:45 +00:00
AndyHee 2b25bd48d4 Improved distinction between delete and remove 2018-06-02 12:40:41 +07:00
AndyHee a75d28e521 Rewording label 2018-06-02 11:23:27 +07:00
Michael ae8d7267a0 "redir" is now centralized and works with the public contact 2018-06-01 06:46:34 +00:00
Michael c9f55f6b3d Show "Remove from your screen" or "delete" depending of the impact of the deletion 2018-05-15 21:06:34 +00:00
Tobias Diekershoff 17dda0fc43 dont delete but remove from your stream 2018-05-13 11:10:34 +02:00
Michael ed664b1091 For feed items show the avatar of the local user 2018-05-09 21:09:16 +00:00
Hypolite Petovan 9b052b5ea8 Fix count() warning in Object\Post 2018-04-23 00:02:18 -04:00
Hypolite Petovan 34fd442821 Rename social.disable_cw pconfig to system.disable_cw 2018-04-04 23:08:48 -04:00
Hypolite Petovan 41db5f0912 Display content warning as title if collapsing is deactivated 2018-04-04 23:08:48 -04:00
Michael Vogel bfc2bda9b6
Merge pull request #4682 from MrPetovan/task/4681-nsfw-add-hashtag-only-hiding 
Move suppress_tags config usage to template
 2018-03-25 22:26:17 +02:00
Hypolite Petovan daffc27061 Move suppress_tags config to template 
- Add new item.suppress_tags template variable
- Fix template formatting
 2018-03-25 00:38:23 -04:00
Hypolite Petovan 13f58abe05 Add parameter check in Image::getInfoFromURL 2018-03-24 20:03:28 -04:00
Michael a3af6807ac Improved resource id creation 2018-02-20 10:02:07 +00:00
Hypolite Petovan cea80c78e4 Replace remaining functions in include/datetime by Temporal methods 
- Fix uses statements
 2018-02-03 20:47:37 -05:00
Hypolite Petovan 5e7285b9ba Move Temporal::convert() to DateTimeFormat::convert() 2018-02-03 08:56:55 -05:00
Hypolite Petovan 0bee706e51 Add Temporal::local() shorthand for Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan 35d06bd9eb Add Temporal::utc() shorthand to Temporal::convert() 2018-02-03 08:56:53 -05:00
Hypolite Petovan dc366bf1f7 Refactor datetime_convert into Temporal::convert 
- Changed parameter order to save space
- Refactor select_timezone into Temporal::getTimezoneSelect
- Refactor field_timezone into Temporal::getTimezoneField
 2018-02-03 08:56:51 -05:00
Adam Magness f04d40a37e Review update 
Rename function, move others
 2018-01-27 11:13:41 -05:00
Adam Magness c67452f72e Move fetch_url 
move fetch_url function
 2018-01-26 23:09:48 -05:00
Hypolite Petovan 30c1cc0e8c
Merge pull request #4312 from zeroadam/feature/L10n 
Move pgettext to src
 2018-01-24 11:48:55 -05:00
Michael 19c039242c It is now possible again to like yourself 2018-01-24 06:39:21 +00:00
Adam Magness 07d306aa37 Finish t() for src 
Update t() calls in src folder
 2018-01-22 18:03:26 -05:00
Adam Magness 3b0f69599e Updat tt() calls 
update function calls for tt()
 2018-01-22 18:03:26 -05:00
Adam Magness b86b04a81a Change plugin to addon 
change the use of plugin to addon where appropriate.
 2018-01-20 07:48:22 -05:00
Adam Magness 11cf36105c Update Addon functions and calls 
Update function names and calls for Addon class.
 2018-01-20 07:48:22 -05:00
Michael 7b3e334f06 "save to folder" and "mark" can't work on global items 2018-01-18 20:54:40 +00:00
Michael 2df44eb084 Liking of your own stuff wasn't possible/enable dislike for Diaspora 2018-01-18 20:16:14 +00:00
Hypolite Petovan e36f2bb1fb Use short form array syntax everywhere 
- Add short form array syntax to po2php.php generation
 2018-01-15 14:07:17 -05:00
Adam Magness 4fb2547df8 Update function calls 
update function calls to use profile class
 2018-01-14 21:22:39 -05:00
Hypolite Petovan 5fc4927764 Improve dba::selectFirst calls 
- Fix remaining $r[0] references
- Rename $r to meaningful names
 2018-01-11 03:43:57 -05:00
Michael Vogel d23c1c0da7
Merge pull request #4194 from MrPetovan/task/fix-scrutinizer-issues 
Replace dba::select(limit => 1) by dba::selectFirst()
 2018-01-10 22:16:02 +01:00
Hypolite Petovan b007f586dd
Merge pull request #4201 from annando/commenting-on-tags 
Commenting on postings from tags on the network page does work now
 2018-01-10 16:13:53 -05:00
Michael 0ef83b2383 Commenting on postings from tags on the network page does work now 2018-01-10 21:08:23 +00:00
Hypolite Petovan ae66bcaff3 Rename selectOne to selectFirst 2018-01-10 12:57:21 -05:00
Hypolite Petovan da60893590 Replace dba::select(limit => 1) by dba::selectOne 
- Convert array declarations to new style
 2018-01-10 12:57:21 -05:00
Adam Magness a3ef9e35ec Update functions and calls 
Update function names and calls.
 2018-01-09 22:42:04 -05:00
Michael e12b6e01a2 Best "uid" for sending comments, refresh after commenting might work now 2018-01-07 17:14:43 +00:00
Michael 592ef50e41 Dropping is now possible as well 2018-01-07 11:59:54 +00:00
Michael a157966bb9 Disable editing of public items / Reshare of community items is now possible 2018-01-05 13:48:06 +00:00
Hypolite Petovan 722782d553 Remove unused parameter in can_write_wall() 2018-01-04 12:21:13 -05:00
Hypolite Petovan 6e71a84075
Merge pull request #4160 from annando/community 
We now are having a global items page
 2018-01-04 11:50:45 -05:00
Michael 174a1bb54b Commenting on community timelines is now possible 2018-01-04 10:02:56 +00:00
Adam Magness e37640c44c Move Photos to xrc 
Move photos from include to Model\Photo class
 2018-01-03 21:01:41 -05:00
Michael 3ffea2cd2c We now have a global page for all global entries from the network. 2018-01-03 13:27:43 +00:00
Michael 6925299e5a Merge remote-tracking branch 'upstream/develop' into community 2018-01-03 01:15:27 +00:00
Hypolite Petovan 7d40f22a2e Review: Simplify boolean assignment in Object\Post 2018-01-02 08:36:35 -05:00
Hypolite Petovan e8e2e41d73 Fix formatting and PHP notices in Object\Post 
- Use x() and defaults() to fix undefined indexes
- Simplify boolean variable assignments
- Simplify sprintf(t()) structures
 2018-01-02 08:18:19 -05:00
Michael 5afedb28d4 You can now comment on the community page 2017-12-23 07:33:51 +00:00
Michael cdce9b48ab Added documentation 2017-12-20 10:34:42 +00:00
Michael b457ed6876 Preparation for being able to comment every public item 2017-12-19 17:15:56 +00:00
Hypolite Petovan a6a2c578f9 Add new common Image::scale() method 
- Fix undefined variable $type
 2017-12-17 15:35:07 -05:00
Hypolite Petovan 916236ce2f Fix docblocks types 2017-12-17 15:27:50 -05:00
Hypolite Petovan 10b72b0e9e PHPStan: Fix missing requires/namespaces 2017-12-17 15:26:43 -05:00
Michael 14d4ffbe7a And now for the third bugfix to PR 4036 2017-12-08 06:32:14 +00:00
Michael 79c841a260 Bugfix to PR 4036 2017-12-08 05:44:43 +00:00
Hypolite Petovan 3772cf7544 Move Object\Conversation to Object\Thread 
- Move Object\Item to Object\Post
 2017-12-07 23:57:37 -05:00
Hypolite Petovan a42595a30c Move Object\Contact to Model\Contact 2017-12-07 23:56:12 -05:00
Hypolite Petovan 6b60b89385 Move Object\Profile to Model\Profile 2017-12-07 23:55:05 -05:00
Hypolite Petovan 3fc3e67b70 Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 23:54:51 -05:00
Hypolite Petovan 79ed1568b6 Fix class Object\Item not found in Object\Post 2017-12-07 23:50:38 -05:00
Hypolite Petovan 4b0f83a12b Finish renaming Object\Item to Object\Post 2017-12-07 23:50:38 -05:00
Michael Vogel 5747cfc79c
Revert "Move Objects to Model" 2017-12-08 05:21:51 +01:00
Hypolite Petovan 70d047ba8e Move Object\Conversation to Object\Thread 
- Move Object\Item to Object\Post
 2017-12-07 09:05:23 -05:00
Hypolite Petovan 18d93cddf6 Move Object\Contact to Model\Contact 2017-12-07 09:04:24 -05:00
Hypolite Petovan d4ca30a6db Move Object\Profile to Model\Profile 2017-12-07 08:57:35 -05:00
Hypolite Petovan 52bddd580c Separate Object\Photo into Model\Photo and Object\Image 
- Renamed a bunch of functions to shorter or clearer names
 2017-12-07 08:56:11 -05:00
Michael 6510df4b51 Update the public key for public contacts if the key was empty before 2017-12-07 06:51:38 +00:00
Michael e5c2b7a243 Don't archive "self" contacts 2017-12-05 21:29:33 +00:00
Michael a206f6d832 Only a newline 2017-12-04 19:37:36 +00:00
Michael 360e39ca5b unmark for archival 2017-12-04 19:36:08 +00:00
Michael 3bb53967f4 Merge remote-tracking branch 'upstream/develop' into archive-contact 2017-12-04 19:05:53 +00:00