Commit graph

4029 commits

Author SHA1 Message Date
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
Michael 9612496e9e The function "template_escape" doesn't exist anymore. 2017-11-27 06:44:49 +00:00
Michael a6de1a1ae8 Posting images to public forums now really does work. 2017-11-26 22:28:46 +00: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 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 661f9af93a Network page: Selecting a forum overrides the group selection 2017-11-26 16:17:32 +00:00
Hypolite Petovan 3fbf2e3bcf
Merge pull request #3966 from rabuzarus/20171122_-_port_tagcloud
A tag cloud widget for the profile page
2017-11-26 11:16:14 -05:00
Michael f059b33390 Avoid empty user export when there are UTF8 problems 2017-11-26 13:58:24 +00:00
Hypolite Petovan 068d3dc746
Merge pull request #3959 from annando/image-forum
Images that are uploaded to public forums are now public
2017-11-25 21:40:33 -05:00
Michael cb7648359c When we are requesting a conneczion, the contactis no longer "blocked" 2017-11-26 02:31:26 +00:00
Michael a7088f5b67 Images that are uploaded to public forums are now public 2017-11-26 02:03:59 +00:00
rabuzarus 4224209497 Merge develop into 20171122_-_port_tagcloud
Conflicts:
	include/features.php
2017-11-25 23:41:20 +01:00
Michael 1adff81a25 Documentation for "fetch further information" 2017-11-25 14:43:28 +00:00
Michael 3cb906c420 Issue 3911: Fetch keywords for feeds 2017-11-25 11:59:20 +00: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
rabuzarus 19afabd268 tags: possibility to filter posts for tags and profile owner (profile) 2017-11-23 00:59:20 +01:00
rabuzarus d7d653aab6 port tag cloud widget from hubzilla 2017-11-22 21:29:07 +01:00
Adam Magness 7cee150868 ForumManager to src
ForumManager moved to Friendica\Content namespace
2017-11-21 07:20:22 -05:00
Hypolite Petovan 33ad6b6d7e
Merge pull request #3927 from rabuzarus/20171121_-_fix_reg_notifs
Bugfix: show no registrations notifs if there are none
2017-11-20 23:54:11 -05:00
rabuzarus 04a7291303 Bugfix: show no registrations notifs if there are none 2017-11-21 03:45:13 +01:00
Adam Magness 69fd3c60b0 Indentation fix
errant indentation change
2017-11-20 19:03:58 -05:00
Adam Magness 1726ededac Emailer to src
Move emailer to src Friendica\Util namespace
2017-11-20 15:37:30 -05:00
Adam Magness ddacbf2c13 XML class standards
updated the xml class for PSR-2
2017-11-20 12:56:31 -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
Michael 920160cb28 The poller is now the worker 2017-11-19 21:47:21 +00:00
Adam Magness a6d501bc4e Overzealous rename
reverted change to function name.
2017-11-19 16:14:16 -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 2de457489f "CreateShadowentry" and "ProfileUpdate" now moved as well 2017-11-19 16:59:37 +00:00
Hypolite Petovan 2336fa9d74 Add smart_threading user setting 2017-11-19 00:57:31 -05:00
Michael 1f28cbd2c6 And now DiscoverPoCo.php 2017-11-18 11:02:46 +00:00
Michael 01362461cf poller.php is cleaned up, unneeded stuff has been removed 2017-11-18 11:01:01 +00:00
Michael 925d2d2383 Directory moved 2017-11-18 07:59:30 +00: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
Adam Magness 259f91caa9 PortableContact created
Create PortableContact and remove socgraph, update references, and calls
2017-11-15 10:53:16 -05:00
Adam Magness 47db624105 GlobalContact created
Moved DirSearch and GlobalContact related functions to Friendica\Model namespace
2017-11-15 09:47:49 -05:00
Michael 476facde61 Onepoll moved as well 2017-11-12 18:50:35 +00:00
Adam Magness 4d146acf90 Smilies to src
Move Smilies to Friendica\Content namespace.

Related to #3878
2017-11-11 07:21:15 -05:00
Hypolite Petovan 6b23548a2b
Merge pull request #3896 from tobiasd/20171110-community
adding a global community disclaimer
2017-11-10 16:17:38 -05:00
Tobias Diekershoff fd2b807292 halfe the double 2017-11-10 22:00:39 +01:00
Tobias Diekershoff 4f95b413fa some corrections 2017-11-10 20:57:02 +01:00
Tobias Diekershoff 3e1d0bf7a8 move HTML to template and add an optional hint that a global community page shows all arriving public postings 2017-11-10 20:25:17 +01:00
Adam Magness bc49fc974c Capitalized XML
Acronym classes should be capitalized
2017-11-10 07:45:33 -05:00