Commit graph

4245 commits

Author SHA1 Message Date
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
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
d22adc98b2 Just some precaution 2018-01-19 07:50:11 +00:00
a07670ac30 Ensure that the user id in a thread always stays the same 2018-01-19 07:02:43 +00:00
b6f15ec5ce Bugfix: The Diaspora signature wasn't stored by nested comments 2018-01-18 19:38:51 +00:00
034d46196f "last-child" is not used anymore 2018-01-18 06:54:44 +00:00
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
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
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
eee3ae9617 Only filter for hash tags on federated networks 2018-01-12 00:23:45 +00:00
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
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