clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
19,091 Commits 3 Branches 0 Tags 183 MiB
Commit Graph

4527 Commits

Author SHA1 Message Date
Adam Magness 45f8000ba5 Functions and Calls 
finish the other functions before returning to t() and tt()
 2018-01-22 18:03:26 -05:00
Adam Magness c8ecc31405 Update functions and calls 
Update function names and calls.
 2018-01-22 18:03:26 -05:00
Michael 87db789e98 Corrected "attag" query 2018-01-22 21:59:27 +00:00
Michael 812cb3b174 Some clean up for mod/item.php 2018-01-22 21:37:21 +00:00
Michael e8effad7f2 Bugfix: Always comment on the correct entry 2018-01-22 17:16:46 +00:00
Michael Vogel 316d57d186
Merge pull request #4300 from MrPetovan/task/remove-network-nets-groups-from-config 
Remove network nets and groups from config
 2018-01-22 10:20:12 +01:00
Michael d588ef32e0 Bugfix: Commenting on public posts (that you don't follow) was not possible anymore 2018-01-22 07:14:34 +00:00
Hypolite Petovan 0a8e350e4b Remove PConfig nets.selected and group.selected from mod/network 2018-01-21 10:49:05 -05:00
Hypolite Petovan cb1e305970 Fix quote style for non-SQL, non-translation strings in mod/network 2018-01-21 10:48:15 -05:00
Hypolite Petovan 83124a8d57 Fix formatting in mod/network 2018-01-21 10:26:05 -05:00
Hypolite Petovan 986e22d9e1
Merge pull request #4292 from annando/reduce-items.php 
Relocate functions in items.php into several classes
 2018-01-20 20:24:42 -05:00
Hypolite Petovan a827522f53 Update comment with updated expiration time 2018-01-20 19:15:05 -05:00
Hypolite Petovan 071b1c038a Update expiration delay to 60 minutes 2018-01-20 19:14:41 -05:00
Hypolite Petovan ed6f4cdbde Change password reset wording to acknowledge the expiration 2018-01-20 19:12:14 -05:00
Michael efa8dbcfb3 Relocate functions in items.php into several classes 2018-01-20 23:52:54 +00:00
Hypolite Petovan 0888f51b4b Add password reset request expiration 
- Change password reset link to /lostpass/[pwdreset]
 2018-01-20 18:15:55 -05:00
Hypolite Petovan 209c43ebbc Centralize password hashing in Model\User 2018-01-20 17:32:24 -05:00
Hypolite Petovan b1e3d09533 Fix formatting mod/lostpass 2018-01-20 17:31:13 -05:00
Michael 745bc7cf3f Merge remote-tracking branch 'upstream/develop' into item-permissions 2018-01-20 19:51:23 +00:00
Michael 670e2ad271 Some safety precautions 2018-01-20 19:48:51 +00:00
Hypolite Petovan 610f017b28
Merge pull request #4288 from zeroadam/Addon 
Move plugins to Addon
 2018-01-20 14:36:23 -05:00
Michael b8c4332a20 Only enable "pubmail" when it is enabled 2018-01-20 19:31:47 +00:00
Michael b57f455dc8 Removed test comment 2018-01-20 17:34:53 +00:00
Adam Magness fb372877f6 Rename template and doc 
Rename admin/plugins.tpl to admin/addons.tpl and update references. Rename doc/de/Plugins.md to Addons.md
 2018-01-20 09:45:22 -05:00
Adam Magness d1b003c694 Bug fix 
remove require for deleted file
 2018-01-20 09:23:45 -05:00
Michael 1649a12b84 Added documentation 2018-01-20 14:10:37 +00:00
Michael 1b74650807 Reworked mod/item - fixing wrong thread parent and mail stuff 2018-01-20 13:54:14 +00:00
Adam Magness 5d03735238 Update hook names 
update hook names and other plugin references.
 2018-01-20 08:22:18 -05:00
Adam Magness b86b04a81a Change plugin to addon 
change the use of plugin to addon where appropriate.
 2018-01-20 07:48:22 -05:00
Adam Magness 6c4c567319 Remove require 
remove require_once for plugins.php
 2018-01-20 07:48:22 -05:00
Adam Magness d07536e032 Update Theme functions and calls 
Update function names and calls for Theme class.
 2018-01-20 07:48:22 -05:00
Adam Magness 11cf36105c Update Addon functions and calls 
Update function names and calls for Addon class.
 2018-01-20 07:48:22 -05:00
Michael b5b298c8d6 Merge remote-tracking branch 'upstream/develop' into item-permissions 2018-01-20 10:17:04 +00:00
Michael Vogel f0a23aa71c
Merge pull request #4284 from MrPetovan/bug/3020-change-siteinfo-to-servers 
Change /siteinfo to /servers for directory URL on follow page
 2018-01-20 09:19:51 +01:00
Hypolite Petovan 4cca8280b4 Fix undefined variables PHP Notice 
- $order_string in include/dba
- $limit_string in include/dba
- $search in mod/search
- $lang_list in include/pgettext.php
 2018-01-19 22:52:49 -05:00
Hypolite Petovan fee80a57bc Change /siteinfo to /servers for directory URL on follow page 2018-01-19 21:51:42 -05:00
Michael f7e3b29819 Improved user id handling 2018-01-19 22:46:24 +00:00
Hypolite Petovan 035394cbf2 RINO code cleanup 
- Restore original use Friendica\Util\Crypto
- Remove RINO1 deprecation comments
- Fix undefined variable $rino_remote_version
 2018-01-19 11:34:56 -05:00
Hypolite Petovan 5bc7f4a442 Remove RINO2 and RINO3 2018-01-19 11:27:53 -05:00
Hypolite Petovan 5db1717f46 Re-added missing RINO admin setting values 2018-01-19 11:27:53 -05:00
Hypolite Petovan 2e58120bbb Fix RINO admin setting values 2018-01-19 11:27:53 -05:00
Hypolite Petovan de70007a46 Update RINO settings 2018-01-19 11:27:53 -05:00
Hypolite Petovan 7af6cc8454 Add RINO version 3 encrypt/decrypt 
- Add legacy decrypt of RINO2
- Add fallback to RINO1 to encrypt
 2018-01-19 11:27:53 -05:00
Michael d22adc98b2 Just some precaution 2018-01-19 07:50:11 +00:00
Michael a07670ac30 Ensure that the user id in a thread always stays the same 2018-01-19 07:02:43 +00:00
Michael b6f15ec5ce Bugfix: The Diaspora signature wasn't stored by nested comments 2018-01-18 19:38:51 +00:00
Michael 034d46196f "last-child" is not used anymore 2018-01-18 06:54:44 +00:00
Michael 2d66242b4f The delete function is now changed to the new function 2018-01-17 23:22:01 +00:00
fabrixxm f51fda7911 fix for coding standars 2018-01-17 17:27:27 +01:00
fabrixxm fc8e8feec1 Frio: add login background color admin option 2018-01-17 16:33:27 +01:00
fabrixxm 0aafdab810 Use template home.tpl for mod/home 2018-01-17 13:27:41 +01:00
Hypolite Petovan f193f01a7d Fix issues in changed files 
- Initializes $return in Process::insert
- Update the type hint of dba::fetch
- Remove unused $a parameter in worker_init()
- Fix uses
 2018-01-17 00:17:58 -05:00
Hypolite Petovan 78ac7afe9c Move process functions to Model\Process 
- Add start|endProcess functions to Core\Worker
 2018-01-17 00:17:58 -05:00
Adam Magness 0f546f7f0f Update functions and calls 
Update function names and scope. update calls.
 2018-01-15 17:09:06 -05:00
Hypolite Petovan e36f2bb1fb Use short form array syntax everywhere 
- Add short form array syntax to po2php.php generation
 2018-01-15 14:07:17 -05:00
Adam Magness b3e6a1d283 Update functions and calls 
Update functions and calls.
 2018-01-15 12:14:09 -05:00
Hypolite Petovan 46bf82eeb7
Merge pull request #4247 from zeroadam/ProfileSel-#3878 
Move profile_selector to src
 2018-01-15 11:34:35 -05:00
Adam Magness f53e54c705 Update functions and calls 
Update function name and calls.
 2018-01-15 10:15:00 -05:00
Adam Magness 6cf6029ff5 Rename functions and calls 
Rename functions and update calls
 2018-01-15 09:50:06 -05:00
Hypolite Petovan 3ab51bf5cb
Merge pull request #4245 from zeroadam/Mimetype-#3878 
Move attach to src
 2018-01-15 09:17:15 -05:00
Hypolite Petovan 224cfb2746
Merge pull request #4241 from annando/network-update 
Update after comment on public post should now work on the network page
 2018-01-15 09:16:00 -05:00
Michael 94c349a720 Don't use count 2018-01-15 14:02:34 +00:00
Adam Magness a80705a836 Function calls 
Rename function, update calls
 2018-01-15 08:32:11 -05:00
Michael f18d459e46 Update after comment on public post should now work on the network page 2018-01-15 06:59:20 +00:00
Adam Magness 430bd7c6ac Review updates 
Update function name, descriptive variable names.
 2018-01-14 23:44:39 -05:00
Adam Magness 0c5cc291af More use 
more missing use statements
 2018-01-14 21:38:26 -05:00
Adam Magness 4fb2547df8 Update function calls 
update function calls to use profile class
 2018-01-14 21:22:39 -05:00
Hypolite Petovan fabbf810b0 Move library/markdown.php to src 2018-01-14 19:01:09 -05:00
Hypolite Petovan 903b960d4c Improve babel page display 2018-01-14 19:01:09 -05:00
Hypolite Petovan 64e3dbfaa4
Merge pull request #4225 from zeroadam/UserImport-#3878 
Move include/uimport to src
 2018-01-14 17:21:26 -05:00
Hypolite Petovan c89129ad20 Fix typo when referring to dba::exists 2018-01-13 23:46:59 -05:00
Hypolite Petovan c66af117b3 Fix Scrutinizer issues in contacts/credits/crepair 
- Add back uninitialized variables
- Fix formatting
- Use dba::selectFirst whenever possible
 2018-01-13 23:46:59 -05:00
Hypolite Petovan e3b69f97cf Fix formatting in mod/delegate 
- Remove parentheses from language construct
- Add missing braces
- Use dba::* when possible
- Capitalize SQL queries keywords
- Use new array syntax
 2018-01-13 23:46:58 -05:00
Hypolite Petovan f588adb511 Fix formatting in dfrn_confirm 
- Add missing braces
- Use dba::selectFirst whenever possible
- Initialize missing variables
- Remove unused variables
- Use defaults instead of ternary operator
- Simplify sprintf(t()) structure
 2018-01-13 23:46:58 -05:00
Adam Magness 7635421d78 Update function calls 
update function calls and remove require_once
 2018-01-13 09:40:34 -05:00
Adam Magness c1baa5ed7d Update functions 
Update function names and calls. update database functions to dba class calls.
 2018-01-13 09:14:37 -05:00
Michael eee3ae9617 Only filter for hash tags on federated networks 2018-01-12 00:23:45 +00:00
Michael e52a2edcf4 Filtering by network type in hash tag following is now possible 2018-01-12 00:14:58 +00:00
Michael Vogel 91198cb53d
Merge pull request #4206 from MrPetovan/task/fix-scrutinizer-issues 
Improve dba::selectFirst calls
 2018-01-11 20:35:41 +01:00
Michael 220106c90a When commenting on comments, the comment now appears again under the comment 2018-01-11 19:17:40 +00:00
Hypolite Petovan 5fc4927764 Improve dba::selectFirst calls 
- Fix remaining $r[0] references
- Rename $r to meaningful names
 2018-01-11 03:43:57 -05:00
Hypolite Petovan ae66bcaff3 Rename selectOne to selectFirst 2018-01-10 12:57:21 -05:00
Hypolite Petovan c7a7658316 Fix documentation in include/dba 2018-01-10 12:57:21 -05:00
Hypolite Petovan da60893590 Replace dba::select(limit => 1) by dba::selectOne 
- Convert array declarations to new style
 2018-01-10 12:57:21 -05:00
Adam Magness 7723309310 Remove requires 
Remove left over require_once statements.
 2018-01-10 12:11:11 -05:00
Hypolite Petovan 3f3e1c78dd
Merge pull request #4193 from annando/item-unification 
We now are using a single function to store items
 2018-01-10 09:11:36 -05:00
Michael 1549b1d8c1 Typo 2018-01-10 06:58:20 +00:00
Adam Magness 510e0dbb2e Remove requires 
remove old require_once
 2018-01-09 22:48:15 -05:00
Adam Magness a3ef9e35ec Update functions and calls 
Update function names and calls.
 2018-01-09 22:42:04 -05:00
Michael 8060ad265e Fill the cache fields as well 2018-01-09 22:35:50 +00:00
Michael 81925e3730 We now are having an item class and a method to change item entries 2018-01-09 21:13:45 +00:00
Michael ec879f3194 Removed unneeded stuff 2018-01-09 20:50:06 +00:00
Michael eac4bc1960 We now are using a single function to store items 2018-01-09 20:03:00 +00:00
Adam Magness 5358f5742e Rename create 
rename create function to createFromProbe and update calls.
 2018-01-09 11:40:25 -05:00
Adam Magness c81e83c500 Review changes 
Update update and new functions to updateFromProbe and create. Update calls to renamed functions.
 2018-01-09 11:23:26 -05:00
Adam Magness a59ab5552e Includes and calls 
Remove includes and update function calls
 2018-01-09 09:59:52 -05:00
Michael a5536086dd Merge remote-tracking branch 'upstream/develop' into follow-tags 2018-01-08 07:04:15 +00:00
Michael b007823bca Only do it when public commenting is enabled 2018-01-08 06:59:49 +00:00
Michael e2ed1fb426 Only show tagged items when there is no filter active 2018-01-08 06:57:51 +00:00
Hypolite Petovan 4a20bcd6f0 Fix allowed_email() 
- Reworked allowed_domain
- Added more variable checks to allowed_email() and
OEmbed::isAllowedURL()
 2018-01-07 19:10:09 -05:00
Michael 10b237829f We now can follow hash tags 2018-01-07 22:07:16 +00:00
Hypolite Petovan 6496a721ea
Merge pull request #4182 from annando/notify-public-post 
Sends notifications for public posts with "uid=0"
 2018-01-07 15:54:57 -05:00
Michael e12b6e01a2 Best "uid" for sending comments, refresh after commenting might work now 2018-01-07 17:14:43 +00:00
Michael Vogel 511572533e
Merge pull request #4183 from MrPetovan/bug/4173-fix-oembed-iframe-url 
Restore tryoembed callback function
 2018-01-07 18:10:00 +01:00
Hypolite Petovan 96221a58a2 Fix typo in admin settings 2018-01-07 10:15:46 -05:00
Michael f2efd58366 Sends notifications for public posts with "uid=0" 2018-01-07 11:08:36 +00:00
Michael Vogel 76933a106c
Merge pull request #4178 from MrPetovan/task/fix-scrutinizer-issues 
[Scrutinizer] Fix issues in mod/contacts
 2018-01-06 14:51:40 +01:00
Hypolite Petovan 6444f97c98 Fix issues in mod/contacts 
- Fix formatting
- Use DBM::is_result()
- Use dba::select
- Simplify sprintf(t[t]()) structures
- Remove commented out code
- Remove unused variables
- Update documentation type hints
 2018-01-05 21:05:23 -05:00
Michael 5290b1404b Don't show the local community page on single user instances 2018-01-05 20:11:35 +00:00
Hypolite Petovan 388386815e Fix variable confusion in admin 2018-01-05 09:21:23 -05:00
Hypolite Petovan 8d07a69bba Merge branch 'develop' into task/fix-scrutinizer-issues 2018-01-05 09:18:14 -05:00
Michael Vogel 3c0c85e211
Merge pull request #4172 from MrPetovan/task/4144-improve-connectors-settings 
Improve connectors settings
 2018-01-05 15:15:24 +01:00
Michael a157966bb9 Disable editing of public items / Reshare of community items is now possible 2018-01-05 13:48:06 +00:00
Hypolite Petovan 4a52cebb43 Fix typo in mod/admin 2018-01-05 08:30:56 -05:00
Hypolite Petovan 1cc39e7fb4 Scrutinizer fixes for mod/settings 
- Use defaults()
- Remove unused variables and constants
- Fix some formatting
- Improve documentation
 2018-01-05 02:48:02 -05:00
Hypolite Petovan c157e7ffa4 Improve connectors settings display 
- Move settings templates to subfolder
- Add accordion display to "General Theme Settings" in frio
- Replace hand-written template with form field includes
- Simplify sprintf(t()) structures
 2018-01-05 02:17:36 -05:00
Hypolite Petovan 8f477c4ec3 Simplifying admin_page_users_post function 
- Use defaults for request parameters
 2018-01-05 00:35:26 -05:00
Hypolite Petovan 392f66f152 More issues fixed 
- Replaced sizeof by count
- Used DBM::is_result()
 2018-01-05 00:28:56 -05:00
Hypolite Petovan 278068c713 Simplify sprintf(t[t]()) calls 2018-01-04 22:52:00 -05:00
Hypolite Petovan 6cfd3f589f Additional issue fixes 2018-01-04 20:18:30 -05:00
Hypolite Petovan 837ac290dd Fix parse error 2018-01-04 20:09:45 -05:00
Hypolite Petovan 819592c3bd Fix Scrutinizer issues in mod [_well_know -> contactgroup] 
- Remove unused variables and parameter
- Updated function documentation
- Fix formatting
- Add back uninitialized variables
- Simplify nested conditions
 2018-01-04 19:42:48 -05:00
Hypolite Petovan 58d5d91831
Merge pull request #4168 from annando/comment-dfrn 
Commenting to (nearly) every Friendica contact is now possible
 2018-01-04 15:12:07 -05:00
Michael Vogel 066b776dcc
Merge pull request #4166 from MrPetovan/task/fix-scrutinizer-issues 
[Scrutinizer] Fix unused code issues in boot and include
 2018-01-04 20:59:07 +01:00
Michael Vogel c938623a3d
Merge pull request #4167 from MrPetovan/bug/4155-remove-proxy-oembed 
Add settings for OEmbed
 2018-01-04 20:57:27 +01:00
Michael 0c9a9b6f0c Commenting to (nearly) every Friendica contact is now possible 2018-01-04 19:48:56 +00:00
Hypolite Petovan 722782d553 Remove unused parameter in can_write_wall() 2018-01-04 12:21:13 -05:00
Hypolite Petovan 659d637b5a Remove unused param in datetimesel() 2018-01-04 12:19:06 -05:00
Hypolite Petovan d9c6417f5d Remove construct_acl_data() 2018-01-04 12:19:06 -05:00
Tobias Diekershoff 04589ecd38
Merge pull request #4092 from MrPetovan/task/3954-move-auth-to-src 
Move auth to src
 2018-01-04 18:06:42 +01:00
Hypolite Petovan 1f805da94f Move ParseUrl to Util namespace 2018-01-04 12:03:15 -05:00
Hypolite Petovan 50e04d87c2 Add no_oembed_rich_content and allowed_oembed admin settings 2018-01-04 11:58:32 -05:00
Hypolite Petovan 520a068500 Add back missing brace 
- Revert unneeded change to SQL query formatting
 2018-01-04 11:53:57 -05:00
Hypolite Petovan 6e71a84075
Merge pull request #4160 from annando/community 
We now are having a global items page
 2018-01-04 11:50:45 -05:00
Michael 2317a3b81f Auto update does work now 2018-01-04 15:58:07 +00:00
Michael ade987db47 Updates for community pages do work now 2018-01-04 15:46:56 +00:00
Michael 6531313b73 Improved descriptions, improved tab behaviour 2018-01-04 14:22:04 +00:00
Michael f66f631079 We now have a single menu item again 2018-01-04 14:02:04 +00:00
Michael e96dbbe7f7 It's now in a single file 2018-01-04 13:04:12 +00:00
Michael 04e802e0f6 Use network paging 2018-01-04 10:51:49 +00:00
Adam Magness 71534a1475 Review update 
Rename function and add new function.
 2018-01-03 22:36:15 -05:00
Adam Magness e37640c44c Move Photos to xrc 
Move photos from include to Model\Photo class
 2018-01-03 21:01:41 -05:00
Michael b002574590 Make the community pages available to local users every time 2018-01-03 14:49:22 +00:00
Michael 3ffea2cd2c We now have a global page for all global entries from the network. 2018-01-03 13:27:43 +00:00
Michael 6925299e5a Merge remote-tracking branch 'upstream/develop' into community 2018-01-03 01:15:27 +00:00
Hypolite Petovan 0aea615995 Add float casting back to dfrn_poll 
- Add new line at end of new module files
 2018-01-02 19:37:17 -05:00
Hypolite Petovan 9a3e773a9a Merge branch 'develop' into task/3954-move-auth-to-src 2018-01-02 19:30:41 -05:00
Hypolite Petovan 4e6050489d Fix formatting and PHP notice in mod/profile 
- Use x() and defaults() to fix undefined indexes
- Simplify boolean variables assignment
- Add back undefined variables
 2018-01-02 08:18:18 -05:00
Hypolite Petovan 93ca0d79fe Fix formatting and PHP notice in mod/photos 
- Use x() and defaults() to fix undefined indexes.
- Add missing fields in SQL query in dropalbum
- Improve file upload error messaging
- Remove unused variables
- Add back undefined variables
- Simplify nested conditions
- Remove unused public/private code block in photo upload and photo edit
 2018-01-02 08:11:14 -05:00
Hypolite Petovan 97bc54cf1b Fix formatting and PHP notices in network and photo modules 
- Remove unused variable $file and associated SQL
- Add back uninitialized variables
 2018-01-02 08:11:14 -05:00
Hypolite Petovan e52c11cc58 Fix formatting and PHP notice in mod/message 
- Use argc to check for argv existence
- Simplify sprintf(t()) structures
 2018-01-02 08:11:14 -05:00
Hypolite Petovan f7165156f1 Fix formatting and PHP notices in contacts 
- Use x() and defaults() to fix undefined indexes
- Fix variable and constant name typos
- Remove unused variables and commented out code
- Add back undefined variables
 2018-01-02 08:11:14 -05:00
Hypolite Petovan 9f04017e27 Quick fix PHP notices in various files 
- Remove unused variables
- Fix variable name typos
- Use x() and defaults() to fix undefined index
- Add back uninitialized variables
 2018-01-02 08:11:14 -05:00
Hypolite Petovan a964129085 Fix formatting and PHP notices in events 
- Initialized variables in include/event
- Check for argc before retrieving argv in mod/events
 2018-01-02 08:09:50 -05:00
Michael Vogel a86ffd878d
Merge pull request #4152 from MrPetovan/task/4137-add-posts-only-feed 
Add posts only feed
 2018-01-02 10:14:56 +01:00
Hypolite Petovan 23e38cd559 Revert "Updated hcard with the new feed links" 
This reverts commit cc84939658.
 2018-01-01 17:29:50 -05:00
Hypolite Petovan eb1b6605b7 Remove include/oembed and mod/oembed 2017-12-31 20:58:32 -05:00
Adam Magness db653e4451 Move salmonKey to Salmon class 
move the salmonKey function from Crypto to Salmon
 2017-12-31 08:04:36 -05:00
Adam Magness 9e6bf79380 Crypto to src 
move Crypto to src and Friendica\Util namespace
 2017-12-30 11:51:49 -05:00
Hypolite Petovan cc84939658 Updated hcard with the new feed links 2017-12-30 00:40:21 -05:00
Hypolite Petovan a75a27e08f Add Feed module 
- Update profile alternate links
 2017-12-30 00:32:45 -05:00
Hypolite Petovan c2e29f2685 Add type parameter to OStatus::feed 
- Removed unused parameter $a
- Added $nocache parameter
- Updated usages
 2017-12-30 00:19:16 -05:00
Hypolite Petovan 095d458de4 Fix formatting mod/profile 2017-12-29 22:23:58 -05:00
Hypolite Petovan 19878a6397 Fix formatting dfrn_poll 2017-12-29 22:12:18 -05:00
Hypolite Petovan c238154a6e Move include/auth to Login::sessionAuth 
- Remove include/auth
 2017-12-29 21:55:13 -05:00
Hypolite Petovan 2dc598ed5b Move login() to Login module 
- Move nuke_session to include/security
- Remove mod/login
 2017-12-29 21:55:13 -05:00
Hypolite Petovan 2cfcf433a3 Fix formatting in mod 
- mod/api
- mod/bookmarklet
- mod/dfrn_request
 2017-12-29 21:55:13 -05:00
Hypolite Petovan 1724dd3841 Make validate_url more intuitive 
- Remove the parameter passed by reference
- Add modified url in return value
 2017-12-29 21:55:13 -05:00
Hypolite Petovan e16852c2f5 Replace init_groups_visitor with Group::getIdsByContactId 2017-12-29 21:55:12 -05:00
Michael 69d16d9cfa Don't show the connect link in the profile on the "follow" page 2017-12-29 22:53:08 +00:00
Michael 319e21f6e3 Added explanation 2017-12-29 12:47:56 +00:00
Michael c7bcc13451 Reformatted file, improved coding for "twist" 2017-12-28 20:37:23 +00:00
Michael d7039c6862 Merge remote-tracking branch 'upstream/develop' into comment-public 2017-12-27 15:51:36 +00:00
Michael d0a43b8533 Missing include 2017-12-27 15:26:17 +00:00
Michael d707c5afcd Merge remote-tracking branch 'upstream/develop' into comment-public 2017-12-26 23:59:32 +00:00
Tobias Diekershoff 3873d4863f add Socialhome to the federation stats 2017-12-24 16:08:34 +01:00
Michael 5afedb28d4 You can now comment on the community page 2017-12-23 07:33:51 +00:00
Michael 2e022733f6 Standards 2017-12-21 22:54:58 +00:00
Michael 4dcf14f62e Query was simplified 2017-12-21 18:49:27 +00:00
Michael cfa42552bc Standards 2017-12-21 18:46:35 +00:00
Michael fba40b8761 Removed unneeded code 2017-12-21 08:58:36 +00:00
Michael f7272be4a8 Reshares are now working 2017-12-20 18:18:25 +00:00
Michael 343f22e02f Updating after post does now work 2017-12-20 10:16:25 +00:00
Michael fa8a09d977 Comments to public posts no get through 2017-12-19 23:12:37 +00:00
Michael b457ed6876 Preparation for being able to comment every public item 2017-12-19 17:15:56 +00:00
Michael 2b50f001b9 Added statistics 2017-12-19 07:39:21 +00:00
Hypolite Petovan 179b311978 Remove group_member.uid 
- Use contact.uid alternatively
- Use JOIN with group table
 2017-12-14 22:47:58 -05:00
Michael 2d7cd2daf4 "update" is enough 2017-12-14 22:18:53 +00:00
Michael cf56de1e77 Merge remote-tracking branch 'upstream/develop' into dbstructure-class 2017-12-14 21:42:26 +00:00
Michael 15d42de647 Class moved, changes applied 2017-12-14 21:13:02 +00:00
Michael 89ad41aca5 Bugfix: Calls to a renamed function had been changed 2017-12-14 18:06:48 +00:00
Michael ea10a7c002 Map is moved to the new place 2017-12-13 21:37:34 +00:00
Hypolite Petovan 6362296666
Add INNER JOIN to admin pending user list please @annando 2017-12-13 10:32:59 -05:00
Hypolite Petovan 4d72a40aa6 Add Exception support to User::create usages 2017-12-12 21:13:36 -05:00
Hypolite Petovan 9063c830f5 Fix admin pending user list SQL 2017-12-12 21:07:22 -05:00
Hypolite Petovan ac3642e76f Add Exceptions to User::create 2017-12-12 20:43:21 -05:00
Michael 88ef61df95 Removed useless "function_exists" checks 2017-12-12 04:52:33 +00: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 e44abb6c2a Fix formatting of mod/register 2017-12-08 19:26:48 -05:00
Hypolite Petovan bc58e8d3be Rename Model\GlobalContact to Model\GContact 2017-12-07 23:57:56 -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
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
Hypolite Petovan cf45e8738c
Hotfix regmod missing use statement 2017-12-07 14:12:03 -05:00
Hypolite Petovan cd84bf8963 Rename Model\GlobalContact to Model\GContact 2017-12-07 09:09:28 -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
Adam Magness 3772a1c24c Remove mod files 
remove mod files based on lack of usage/obseleteness.
 2017-12-06 16:45:41 -05:00
Tobias Diekershoff c258df0f0a removed x-permission 2017-12-05 07:13:55 +01: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
Hypolite Petovan 27212c7f39 Update function calls to use Model\User and Object\Contact 2017-12-03 22:29:06 -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 Vogel ae1227c9ca
Merge pull request #4001 from MrPetovan/bug/3999-fix-password-change 
Fix password change
 2017-12-03 14:49:10 +01:00
Hypolite Petovan 1eb8355ac8 Fix wrong condition 
Grmbl
 2017-12-03 08:37:01 -05:00
Hypolite Petovan 3359f3f5c7 Fix formatting in mod/settings 2017-12-03 08:36:39 -05:00
Michael df89e0384d Added description to networks, renaming some network names 2017-12-03 13:26:52 +00:00
Tobias Diekershoff ffd04fed85 missing word 2017-12-03 10:26:26 +01:00
Michael 6f7510550d NETWORK_MAIL2 was never finished, so remove it as well 2017-12-03 09:19:58 +00:00
Tobias Diekershoff 2aca406f52 wrong URL in directory 2017-12-03 08:27:15 +01: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
Hypolite Petovan 4d10f3b3b7 Remove unused use statement 2017-12-02 08:42:44 -05:00
Hypolite Petovan 75181322ba Improve page contacblock for frio theme 2017-12-01 22:33:04 -05:00
Hypolite Petovan 8826ece55e Use Contact::getIdForURL instead of probing 
- Add change to mod/admin
- Add change to util/global_community_block
 2017-12-01 22:32:24 -05: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 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 dc09319695 Add admin/contactblock page 
- Add page template
 2017-12-01 00:43:39 -05:00
Hypolite Petovan 16d0c30328 Move admin templates to dedicated sub-folder 2017-12-01 00:40:55 -05:00
Hypolite Petovan 0ae6f571da
Merge pull request #3982 from zeroadam/Photo-#3878 
Photo to src
 2017-11-30 20:33:48 -05:00
Hypolite Petovan 3cebdee867 Fix mod/admin.php formatting 2017-11-29 20:28:30 -05:00
Adam Magness 0373056448 Review and Use statements 
use statements and review changes.
 2017-11-29 17:29:11 -05:00
Michael fe348acb49 Small fixes to "nogroup" 2017-11-29 20:59:06 +00: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
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
Adam Magness f245bc8359 Move xml to namespace 
Relocate xml from include to src
Related to #3878
 2017-11-10 07:18:24 -05:00
Tobias Diekershoff b8a76794e0 add info text about email on registration 2017-11-10 08:06:56 +01:00