friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
16,831 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

28 Commits

Author SHA1 Message Date
Hypolite Petovan 18d93cddf6 Move Object\Contact to Model\Contact 2017-12-07 09:04:24 -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
Michael ca41e9154d Archive and unarchive contacts 2017-12-04 19:04:50 +00:00
Hypolite Petovan b0dcfc2724 Add class methods derived from include/user functions 
- Add User::create
- Add User::sendRegisterPendingEmail
- Add User::sendRegisterOpenEmail
- Add Contact::createSelfFromUserId
 2017-12-03 22:27:49 -05:00
Michael Vogel 2ca03acb45
Merge pull request #3986 from MrPetovan/task/admin-block-list 
Admin remote contact block list
 2017-12-02 22:09:04 +01:00
Adam Magness 2b121779a6 Salmon move to src 
Salmon class, update function name and function calls. Some standards as well.
 2017-12-02 09:32:45 -05:00
Hypolite Petovan ff459441cf
Merge branch 'develop' into task/admin-block-list 2017-12-01 00:48:13 -05:00
Hypolite Petovan 5fd4086fdc Add block/unblock methods to Contact class 2017-12-01 00:41:26 -05:00
Hypolite Petovan 0ae6f571da
Merge pull request #3982 from zeroadam/Photo-#3878 
Photo to src
 2017-11-30 20:33:48 -05:00
Adam Magness 0373056448 Review and Use statements 
use statements and review changes.
 2017-11-29 17:29:11 -05:00
Michael fe348acb49 Small fixes to "nogroup" 2017-11-29 20:59:06 +00:00
Adam Magness 0091d318e5 Function names 
Update function names and corresponding function calls
 2017-11-29 12:17:12 -05:00
Adam Magness 54827e7fed Photo to src 
Move Photo to Friendica\Object namespace and replace require_once statments with use statements.
 2017-11-29 07:52:27 -05:00
Michael abc0b90fa9 getpostsbyurl hadn't worked 2017-11-24 22:15:35 +00:00
Michael 4a4be4d664 Fix some SQL problems 2017-11-24 07:44:02 +00:00
Adam Magness 9df0457340 whitespace 
remove whitespace
 2017-11-23 20:59:00 -05:00
Adam Magness 130e02ddef Review 
null_date and spaces at end of line
 2017-11-23 19:22:30 -05:00
Adam Magness 6ea8b0441b More Review 
put back some q( calls and change some integer to boolean
 2017-11-23 08:15:38 -05:00
Adam Magness 9409010d2d Review dba updates 
updates based on review comments.
 2017-11-22 23:32:24 -05:00
Adam Magness f5d682fe0a Review updates 
Updates based on review.
 2017-11-22 23:13:12 -05:00
Adam Magness c25578a2e2 Cleanup 
Clean up messy commits.
 2017-11-22 16:29:47 -05:00
Adam Magness a8b6052c5a Contact Standards 
Some updates for Contact
 2017-11-22 09:02:55 -05:00
Hypolite Petovan ec02af593d Change called method names 
- Add GlobalContact::getRandomUrl
- Rename Contact::getIdForURL
- Rename Diaspora::sendUnshare
- Remove unused parameter $self in Contact::terminateFriendship
 2017-11-19 17:03:39 -05:00
Hypolite Petovan b92fc24ff0 Add Contact Object 
- Add Profile Object
- Add User Model
- Add use statements
 2017-11-19 16:55:28 -05:00