friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity
17,620 Commits 2 Branches 63 Tags 238 MiB
Commit Graph

4261 Commits

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