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

4312 Commits

Author SHA1 Message Date
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