Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 09:42:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
17159 commits 3 branches 64 tags 246 MiB
Commit graph

401 commits

Author SHA1 Message Date
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
Adam Magness
00ad255540 Replace function 
Replace function used by addon
 2017-11-30 07:40:20 -05:00
Adam Magness
7938decff3 Private to public 
change function to public as it's called from elsewhere
 2017-11-29 18:37:32 -05:00
Adam Magness
0373056448 Review and Use statements 
use statements and review changes.
 2017-11-29 17:29:11 -05:00
Michael
0982b0413b Bugfix for "Call to undefined function best_link_url()" 2017-11-29 21:27:39 +00:00
Michael
fe348acb49 Small fixes to "nogroup" 2017-11-29 20:59:06 +00:00
Adam Magness
eb148cad55 Missed use dba 
added use dba
 2017-11-29 13:04:58 -05: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
8bffee43b3 Threads are now always enabled. 2017-11-28 18:54:39 +00:00
Hypolite Petovan
16fb014547
Hotfix missing use dba 2017-11-27 14:03:47 -05:00
Michael Vogel
3f448d9a42
Merge pull request #3970 from MrPetovan/task/3942-add-user-authenticate 
Migrate password hashing Part 1: Add User::authenticate
 2017-11-27 15:14:36 +01:00
Hypolite Petovan
ced1063a10 Improved dba calls 
- Removed intval calls
- Used boolean values for params when relevant
 2017-11-27 08:17:56 -05:00
Michael
9612496e9e The function "template_escape" doesn't exist anymore. 2017-11-27 06:44:49 +00:00
Hypolite Petovan
9ddb81ce5f Fix function name typo 2017-11-26 15:51:07 -05:00
Hypolite Petovan
456dfbe486 Forgotten change in src/Worker/Queue.php 2017-11-26 14:56:50 -05:00
Hypolite Petovan
2196a0577b Remove unused upubkey and uprvkey from queries 
- Switched queries to new dba::* functions
 2017-11-26 14:55:47 -05:00
Hypolite Petovan
ec6f5193e2 Switch to User::authenticate 
- Removed hash('whirlpool') to check password
 2017-11-26 14:46:08 -05:00
Hypolite Petovan
483603e77c Add User::authenticate() 2017-11-26 14:25:25 -05:00
Hypolite Petovan
90a8ae2cb8 Fix formatting 
- include/auth.php
- include/oauth.php
- include/user.php
- mod/removeme.php
- src/Worker/Queue.php
 2017-11-26 14:18:45 -05:00
Michael
774a7193d2 Added clarification 2017-11-26 11:43:02 +00:00
Michael
abc0b90fa9 getpostsbyurl hadn't worked 2017-11-24 22:15:35 +00:00
Tobias Diekershoff
5a0f33dca0
Merge pull request #3939 from annando/fix-sql 
Fix some SQL problems
 2017-11-24 09:53:36 +01:00
Michael Vogel
adc720a7fc
Merge pull request #3938 from MrPetovan/task/3878-mov-HTTPExceptions-to-src 
Move HTTPExceptions to src
 2017-11-24 09:44:44 +01:00
Michael
4a4be4d664 Fix some SQL problems 2017-11-24 07:44:02 +00:00
Hypolite Petovan
365850f26a Fix httpdesc to work with new namespace 2017-11-23 23:47:52 -05:00
Hypolite Petovan
b41bf77ec8 Add HTTPException class files 2017-11-23 23:40:54 -05:00
Michael Vogel
4032ad3418
Merge pull request #3935 from MrPetovan/task/3878-move-ExAuth-to-src 
Move ExAuth class to src
 2017-11-24 05:40:06 +01:00
Hypolite Petovan
fd8b9deaaf
Merge pull request #3934 from zeroadam/Contact 
Second Contact
 2017-11-23 21:01:02 -05:00
Adam Magness
9df0457340 whitespace 
remove whitespace
 2017-11-23 20:59:00 -05:00
Hypolite Petovan
40c37d76fe Don't cache the xmpp/password PConfig value 2017-11-23 20:34:35 -05:00
Adam Magness
130e02ddef Review 
null_date and spaces at end of line
 2017-11-23 19:22:30 -05:00
Adam Magness
609a4de5d0 src Standards 
This basically completes coding standards changes for the entire src directory, with the exception of App.php
 2017-11-23 14:01:58 -05:00
Hypolite Petovan
d5887f9f9a Add use dba 2017-11-23 10:23:16 -05:00
Hypolite Petovan
93924ceac4 Move ExAuth class to src 
- Move executed code to separate readStdin function
 2017-11-23 09:46:04 -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
Michael
87660ac9e6 /src is now free from old style delete queries 2017-11-22 09:14:42 +00:00
Michael
7c3fd2adb5 Some more replaced old database functions 2017-11-22 07:21:19 +00:00
Michael
d982c68d75 Cache.php is now using dba methods 2017-11-21 23:03:33 +00:00
Adam Magness
7cee150868 ForumManager to src 
ForumManager moved to Friendica\Content namespace
 2017-11-21 07:20:22 -05:00
Hypolite Petovan
2d6ee38446
Merge pull request #3925 from zeroadam/Emailer-#3878 
Emailer to src
 2017-11-20 23:53:21 -05:00
Hypolite Petovan
317d51fd53
Merge pull request #3926 from annando/worker-correction 
Queue and GProbe should now be executed
 2017-11-20 16:35:39 -05:00
Michael
0877cf862c Queue and GProbe should now be executed 2017-11-20 21:30:57 +00:00
Adam Magness
1726ededac Emailer to src 
Move emailer to src Friendica\Util namespace
 2017-11-20 15:37:30 -05:00
Adam Magness
2830be25ea Formatting change 
change multi line format.
 2017-11-20 15:17:20 -05:00
Adam Magness
ddacbf2c13 XML class standards 
updated the xml class for PSR-2
 2017-11-20 12:56:31 -05:00
Adam Magness
28cceda461 Indentation 
modified to multi line function call.
 2017-11-20 11:29:55 -05:00
Adam Magness
1eb2e541f6 New from rebase 
more adjustments after rebase
 2017-11-20 11:14:35 -05:00
Adam Magness
9622dedaeb New function 
new function from recent develop branch merge
 2017-11-20 11:01:32 -05:00
Adam Magness
1115d19f79 More Standards 
More coding standards updates.
 2017-11-20 11:01:32 -05:00
Hypolite Petovan
b85c94a60d
Merge branch 'develop' into issue/3878-move-Contact-to-src 2017-11-19 18:09:14 -05:00
Hypolite Petovan
81647cefed
Merge pull request #3920 from annando/scripts 
The poller is now the worker and we have a "scripts" folder
 2017-11-19 17:25:14 -05:00
Hypolite Petovan
898fe2db1e Code cleanup 
- Remove extraneous use statements
- Format require_once
 2017-11-19 17:06:18 -05:00
Hypolite Petovan
5ee728972e Remove include/Contact.php 
- Remove all mentions to include/Contact.php
 2017-11-19 17:05:21 -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
Hypolite Petovan
f43aaf5227 Move Item and Conversation from Core to Object 
- Move BaseObject from Core\ to Friendica\
 2017-11-19 16:50:49 -05:00
Michael
920160cb28 The poller is now the worker 2017-11-19 21:47:21 +00:00
Michael
cabfcfc904 We now are having a "scripts" folder 2017-11-19 21:21:54 +00:00
Adam Magness
8057afb039 Function call 
this one must be coming from boot.php
 2017-11-19 15:32:54 -05:00
Adam Magness
d9e9cbe753 Coding Standards 
A few updates for coding standards
 2017-11-19 15:32:54 -05:00
Michael
183999ee08 No german compound wording :-) 2017-11-19 19:47:04 +00:00
Michael
8cd21269ff The last of the big workers moved ... delivery and notifier 2017-11-19 18:59:55 +00:00
Michael
5108115fc1 Now PubSubPublish moved as well 2017-11-19 17:36:20 +00:00
Michael
2de457489f "CreateShadowentry" and "ProfileUpdate" now moved as well 2017-11-19 16:59:37 +00:00
Michael
98686e9091 Queue.php is now moved as well 2017-11-19 16:35:45 +00:00