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

370 Commits

Author SHA1 Message Date
Michael 74ba0c896a The feed is now a class 2017-12-13 07:03:42 +00:00
Michael fc55a4b9c0 The feed moved into the new location 2017-12-13 07:02:52 +00:00
Hypolite Petovan fbf57ac98b Replace q() by dba function in User 
- Add relevant Exceptions
- Fix admin email checking
 2017-12-12 21:07:03 -05:00
Hypolite Petovan 72641e86a8 Add new group added id return to Group::create 2017-12-12 20:52:50 -05:00
Hypolite Petovan 0afdf92ca1 Fix self-contact creation 
- Discard useless intval()
- Add proper condition for `self`
 2017-12-12 20:44:05 -05:00
Hypolite Petovan ac3642e76f Add Exceptions to User::create 2017-12-12 20:43:21 -05:00
Michael 48b49dbc4b Bugfix to PR 4046: Repaired query 2017-12-10 20:12:23 +00:00
Michael Vogel 57f8496c53
Merge pull request #4046 from MrPetovan/bug/4041-fix-register 
Move Group to src
 2017-12-10 13:32:59 +01:00
Hypolite Petovan b0fb398844 Fix order parameter for dba::select 2017-12-10 05:37:23 -05:00
Hypolite Petovan c714ee519f Improve additional condition 2017-12-10 01:07:48 -05:00
Hypolite Petovan 3ea9060259 Fix wrong uses of dba::select 
- Improve negative conditions
 2017-12-10 01:06:12 -05:00
Hypolite Petovan 4fe8dab08d Remove include/group.php 2017-12-09 13:45:54 -05:00
Hypolite Petovan abdecd2b2f Use new Model methods for groups 2017-12-09 13:45:17 -05:00
Hypolite Petovan fe89e7760e Fix formatting all around 2017-12-09 13:42:02 -05:00
Hypolite Petovan 669c7dea59 Add new method from include/group in relevant Model classes 2017-12-09 13:31:00 -05:00
Michael 38d5932156 Reworked the pidfile class 2017-12-09 17:49:11 +00:00
Michael 0f149a691e Faster credentials check 2017-12-09 12:23:15 +00:00
Michael 8db5b121ff Prevent the running of multiple xmpp auth daemons at a time 2017-12-09 09:46:21 +00:00
Michael 14d4ffbe7a And now for the third bugfix to PR 4036 2017-12-08 06:32:14 +00:00
Michael 0a946587b5 Second bugfix to PR 4036 2017-12-08 06:15:06 +00:00
Michael 79c841a260 Bugfix to PR 4036 2017-12-08 05:44:43 +00:00
Hypolite Petovan d3182d93ac Move Object\Profile to Model\Profile 2017-12-07 23:58:20 -05:00
Hypolite Petovan bc58e8d3be Rename Model\GlobalContact to Model\GContact 2017-12-07 23:57:56 -05: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
Michael Vogel e437c74d0e
Merge pull request #4031 from MrPetovan/task/3878-move-objects-to-model 
Move Objects to Model
 2017-12-08 05:02:21 +01:00
Michael a7b004a727 Commented out the functionality 2017-12-07 20:10:09 +00:00
Michael 3824ad5590 Possible fix for issue 4013 2017-12-07 19:39:55 +00:00
Hypolite Petovan cd84bf8963 Rename Model\GlobalContact to Model\GContact 2017-12-07 09:09:28 -05:00
Hypolite Petovan 294689bf94 Move Object\Profile to Model\Profile 2017-12-07 09:05:35 -05: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
Hypolite Petovan 311af3e544
Merge pull request #4022 from annando/instances_social 
Retrieve data about Mastodon servers
 2017-12-06 15:36:22 -05:00
Adam Magness 71911a6989 Use default value 
use the default value parameter correctly!
 2017-12-06 15:25:36 -05:00
Adam Magness 3e5a518591 Undo changes to Feature 
the evaluations were correct before.
 2017-12-06 15:18:45 -05:00
Michael 925c03fda8 Retrieve data about Mastodon servers 2017-12-06 20:09:59 +00:00
Adam Magness cadfef63c4 Update false evaluations 
=== false and !== false to is_null where appropriate.
 2017-12-06 14:57:06 -05:00
Michael 7099a54b3d Cut and paste is always fun 2017-12-06 16:50:52 +00:00
Michael 4bf425de5d Merge remote-tracking branch 'upstream/develop' into dbclean 2017-12-06 16:49:55 +00:00
Michael f1f222c633 Removed unused code 2017-12-06 14:30:07 +00:00
Michael ad5c263dbf Reduced "dbclean" calls 2017-12-06 14:23:38 +00:00
Michael 418365b30e DBClean now runs as long as there are entries to be deleted 2017-12-06 14:22:03 +00:00
Hypolite Petovan 75c7dc0fa0
Merge pull request #4015 from annando/archive-again 
Don't archive "self" contacts
 2017-12-05 16:38:48 -05:00
Michael 9ffde01fc1 DBClean now works with the conversation table as well 2017-12-05 21:30:38 +00:00
Michael e5c2b7a243 Don't archive "self" contacts 2017-12-05 21:29:33 +00:00
Hypolite Petovan a4451c7c3d
Merge pull request #4011 from annando/archive-cleanup 
Some cleanup for archiving/unarchiving contacts
 2017-12-05 07:47:44 -05:00
Adam Magness 22a3c7ad7d remove index 
remove unneeded index
 2017-12-05 06:58:57 -05:00
Michael 115d71e841 One tab too much 2017-12-05 09:34:43 +00:00
Michael 5f9e87ea5a Some cleanup for archiving/unarchiving contacts 2017-12-05 07:08:20 +00:00
Adam Magness e32b4ed670 More use 
more missing use
 2017-12-04 21:18:48 -05:00
Adam Magness f1a5560804 Use statement 
missing use
 2017-12-04 21:13:58 -05:00
Adam Magness e997128c9f Static 2017-12-04 21:03:39 -05:00
Adam Magness 448598495c Static 
remove static
 2017-12-04 21:00:47 -05:00
Adam Magness 9f4be62d3d Use statement 2017-12-04 20:30:10 -05:00
Hypolite Petovan 072edc1949
Merge pull request #4008 from zeroadam/Oauth-#3878 
OAuth to src
 2017-12-04 18:33:01 -05:00
Adam Magness 547e24b443 Review 
updates based on review.
 2017-12-04 16:33:10 -05:00
Adam Magness 2bbfc0640f Move to Network 
Move to network namespace. Get rid of q() and try to get used to [ ] instead of array()
 2017-12-04 15:59:21 -05:00
Adam Magness 9c7b6d9d5f Functions and Standards 
Standards and convert to dba functions where possible.
 2017-12-04 14:52:04 -05: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
Adam Magness b991d8ff77 Separate and move classes 
OAuth to src
 2017-12-04 14:09:23 -05: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
Adam Magness 4a96f7b458 Pidfile to src 
Move pidfile to Friendica\Util namespace
 2017-12-04 13:12:22 -05:00
Adam Magness 4af9616b17 Standards 
Standards clean up.
 2017-12-04 09:16:15 -05:00
Adam Magness b1d16fbdf7 Update use statements 
update use statements for rename to singular.
 2017-12-04 09:04:36 -05:00
Adam Magness 6e5471def3 Rename to singular 
Rename and update references. Standards and a require_once.
 2017-12-04 09:01:27 -05:00
Adam Magness 2f0da29c75 Features to src 
Move Features to class in Friendica\Content namespace. Update function calls and references.
 2017-12-04 08:33:49 -05:00
Michael Vogel 2685c9bb1c
Merge pull request #4003 from MrPetovan/task/3942-move-user-to-src 
Migrate password hashing Part 2: Move include/user to src
 2017-12-04 10:32:45 +01:00
Michael ad8c290c2b Improved vitality check for followers, feeds and OStatus contacts 2017-12-04 06:54:08 +00:00
Hypolite Petovan 27212c7f39 Update function calls to use Model\User and Object\Contact 2017-12-03 22:29:06 -05: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
Hypolite Petovan 4395c20679 Fix formatting and add documentation 
- mod/register
- mod/regmod
- Model/User
- Worker/CronJobs
 2017-12-03 22:15:31 -05:00
Michael f988ed5d15 Merge remote-tracking branch 'upstream/develop' into onepoll 2017-12-03 13:45:48 +00:00
Michael 6f7510550d NETWORK_MAIL2 was never finished, so remove it as well 2017-12-03 09:19:58 +00:00
Michael cd55c742e8 Check Diaspora contacts, don't poll unreachable contacts too often 2017-12-03 08:59:24 +00:00
Michael adf802474b Zot was never really supported, so it is now removed completely 2017-12-02 21:57:39 +00: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
Michael Vogel b5d24b5ac3
Merge pull request #3993 from zeroadam/Email-#3878 
Email to src
 2017-12-02 13:03:43 +01:00
Hypolite Petovan 843ec842c3 Merge branch 'develop' into task/admin-block-list 2017-12-01 21:39:20 -05:00
Adam Magness 9a4e741d1a Review Changes 
renamed some functions and adjusted corresponding calls.
 2017-12-01 21:05:06 -05:00
Adam Magness 508ce4a5be Use Exception 
use exception
 2017-12-01 18:47:52 -05:00
Adam Magness e90b0748aa Code Cleanup 
Standards clean up
 2017-12-01 18:13:39 -05:00
Adam Magness f21feb975d Require Cleanup 
Remove instances of require_once for email.php
 2017-12-01 14:57:13 -05:00
Adam Magness 6008e3df11 Email to src 
Create Email class and update/rename functions and function calls.
 2017-12-01 14:41:27 -05:00
Hypolite Petovan 58ac3532b7 Fix undefined variables messages 2017-12-01 08:32:21 -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 d04d2cb838 Static 
update functions and check calls.
 2017-11-30 13:51:04 -05:00
Adam Magness cddadb4b17 Object error 
Uncaught Error: Using $this when not in object context
 2017-11-30 07:48:47 -05:00