tobias/friendica
1
0
Fork 0
Code Pull requests Activity
16798 commits 2 branches 61 tags 203 MiB
Commit graph

275 commits

Author SHA1 Message Date
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
Michael 501514bd54 expire and gprobe now moved as well 2017-11-19 16:25:13 +00:00
Hypolite Petovan 104a1d7fd3 Move ITemplateEngine to src 
- Fix method name format
 2017-11-19 10:22:18 -05:00
Michael 9832ac7dab Always show dislikes - the setting now just hides the button 2017-11-19 09:55:45 +00:00
Michael 3616ff886e Corrected class name 2017-11-19 00:14:20 +00:00
Michael 02e4cf2a02 Missing variable 2017-11-18 23:46:16 +00:00
Michael 1f28cbd2c6 And now DiscoverPoCo.php 2017-11-18 11:02:46 +00:00
Michael 925d2d2383 Directory moved 2017-11-18 07:59:30 +00:00
Michael 2515d02e6d SpoolPost moved 2017-11-18 07:44:38 +00:00
Michael 28315ee9dd Missing namespace 2017-11-18 07:33:44 +00:00
Michael 13f899542d dbupdate now moved as well 2017-11-18 07:31:33 +00:00
Michael 04cc9bb4de CronJobs moved as well 2017-11-18 06:22:41 +00:00
Michael f2e792662f DBClean moved as well 2017-11-18 05:45:44 +00:00
Michael 911093580b Missing dba 2017-11-18 05:12:57 +00:00
Michael 3687ef2f8c Another worker process moved 2017-11-17 22:16:34 +00:00
Adam Magness 0cbc4153b3 More conditions 
Removed unneeded conditions.
 2017-11-16 19:59:40 -05:00
Adam Magness 72749477ed Remove condition 
Remove unneeded condition.
 2017-11-16 19:55:28 -05:00
Adam Magness f96b841799 Update function call 
missed function call change
 2017-11-16 16:39:42 -05:00
Adam Magness d127d06388 Item to src 
object/Item moved to Friendica\Core namespace.
 2017-11-16 16:39:42 -05:00
Adam Magness 7c00401c66 Conversation to src 
object/Conversation moved to Friendica\Core namespace.
 2017-11-16 16:39:42 -05:00
Adam Magness ecd9e3e07e BaseObject moved to src/Core 
BaseObject moved to Friendica\Core namespace. References and function calls updated.
 2017-11-16 16:39:42 -05:00
Adam Magness cd12de46f8 OStatus moved to src 
OStatus moved to Friendica\Protocol namespace. References and function calls updated.
Related to #3878
 2017-11-15 23:09:11 -05:00
Michael 0aee6d383a Now there are four more ... 2017-11-15 21:12:33 +00:00
Michael 33e98d6264 Moved some workers in their new habitat 2017-11-15 20:59:42 +00:00
Adam Magness 9e90589c21 gsFunctions renamed 
gsFetchUsers -> fetchGsUsers
gsDiscover -> discoverGsUsers
 2017-11-15 12:02:08 -05:00
Adam Magness 326c4a18c0 Missing Worker 
use Friendica\Core\Worker
 2017-11-15 11:51:29 -05:00
Adam Magness 790d80c9fb Missed function call update 
update_gcontact -> update
 2017-11-15 11:49:20 -05:00