16787 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hypolite Petovan	75c7dc0fa0	Merge pull request #4015 from annando/archive-again ... Don't archive "self" contacts	2017-12-05 16:38:48 -05:00
Hypolite Petovan	2bcc70fa77	Merge pull request #4016 from annando/dbclean-conversation ... DBClean now works with the conversation table as well	2017-12-05 16:37:43 -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
Hypolite Petovan	88891d9ae1	Merge pull request #4012 from zeroadam/OAuth-quickfix ... Move OAuth to src: remove index	2017-12-05 07:46:59 -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
Michael Vogel	12ab38f417	Merge pull request #4010 from tobiasd/20171205-chmod ... correction of lintian reported (non)script permissions	2017-12-05 07:49:13 +01:00
Tobias Diekershoff	db4d44748b	another -x	2017-12-05 07:26:02 +01:00
Tobias Diekershoff	e614022634	added some x permissions to scripts	2017-12-05 07:21:21 +01:00
Tobias Diekershoff	c258df0f0a	removed x-permission	2017-12-05 07:13:55 +01:00
Hypolite Petovan	82df294e31	Merge pull request #4009 from zeroadam/OAuth-hotfix ... OAuth hotfix	2017-12-04 21:32:52 -05: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	0c48b4188b	Non Static calls ... update calls to non static	2017-12-04 21:10:54 -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	d3473f9999	Update use ... Forgot to update a use statement.	2017-12-04 18:30:18 -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
Hypolite Petovan	06d6d6c758	Merge pull request #4007 from annando/archive-contact ... Bugfix for unarchival and unarchival of the author	2017-12-04 15:04:17 -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	dc32553a1d	Better usew the author	2017-12-04 19:50:32 +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
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
Michael Vogel	2aa5af4a4a	Merge pull request #4006 from zeroadam/Pidfile-#3878 ... Pidfile to src	2017-12-04 19:59:41 +01:00
Adam Magness	4a96f7b458	Pidfile to src ... Move pidfile to Friendica\Util namespace	2017-12-04 13:12:22 -05:00
Hypolite Petovan	755f6e8cc1	Merge pull request #4005 from zeroadam/Features-#3878 ... Features to src	2017-12-04 09:41:01 -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
Hypolite Petovan	370cf6bd91	Merge pull request #4004 from annando/vitality-check ... Improved vitality check for followers, feeds and OStatus contacts	2017-12-04 02:45:45 -05:00
Michael	ad8c290c2b	Improved vitality check for followers, feeds and OStatus contacts	2017-12-04 06:54:08 +00:00
Hypolite Petovan	85f6d6b7ed	Remove include/user	2017-12-03 22:29:13 -05: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
Hypolite Petovan	f41c891a6b	Merge pull request #4002 from annando/onepoll ... Check Diaspora contacts, don't poll unreachable contacts too often	2017-12-03 08:57:43 -05:00
Michael Vogel	ae1227c9ca	Merge pull request #4001 from MrPetovan/bug/3999-fix-password-change ... Fix password change	2017-12-03 14:49:10 +01:00
Michael	f988ed5d15	Merge remote-tracking branch 'upstream/develop' into onepoll	2017-12-03 13:45:48 +00:00
Hypolite Petovan	239a0d70ad	Merge pull request #3996 from annando/no-zot ... Zot was never really supported, so it is now removed completely	2017-12-03 08:40:29 -05:00