Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-14 05:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
22139 commits 3 branches 64 tags 246 MiB
Commit graph

5205 commits

Author SHA1 Message Date
Hypolite Petovan
5e60fa8210
Merge pull request #6225 from annando/http-error 
Using the standard function to return http errors
 2018-12-02 16:15:04 -05:00
Michael
02a72ef04f Simplify the call 2018-12-02 20:14:53 +00:00
Michael
649228cd3d More detailled HTTP error explanations 2018-12-02 20:10:53 +00:00
Michael
83489b36c4 Using the standard function to return http errors 2018-12-02 19:33:01 +00:00
Hypolite Petovan
924869ab5b
Merge branch 'develop' into bug/6211-fix-contact-nets-all 2018-12-02 10:24:50 -05:00
Michael Vogel
5a3991d4f7
Merge pull request #6219 from MrPetovan/task/remove-x 
Remove x()
 2018-12-01 23:40:51 +01:00
Hypolite Petovan
f9f4afa35c
Merge pull request #6220 from AndyHee/patch20181129 
Fixing permanent deletion counter
 2018-12-01 08:19:38 -05:00
AndyHee
4e20c0e50a Typo 2018-12-01 13:25:58 +07:00
AndyHee
14b4fac818 Fixing permanent deletion counter 2018-12-01 13:21:54 +07:00
Hypolite Petovan
458981f75c Replace x() by isset(), !empty() or defaults() 
- Remove extraneous parentheses around empty() calls
- Remove duplicate calls to intval(), count() or strlen() after empty()
- Replace ternary operators outputting binary value with empty() return value
- Rewrite defaults() without x()
 2018-11-30 09:06:22 -05:00
Hypolite Petovan
663ba65f17 Remove "all" value for nets parameter 2018-11-30 05:43:07 -05:00
Michael
9d8eca2287 Using the same function for display and objects 2018-11-29 22:42:10 +00:00
Michael
39ce33f7ed Issue 6212: No need of a redirect for fetching content 2018-11-29 15:06:00 +00:00
Hypolite Petovan
b42760b0e6 Move credits out of util/ 2018-11-28 22:59:06 -05:00
Michael Vogel
ea4e772b1e
Merge pull request #6199 from MrPetovan/task/move-config-to-php-array 
Move config to PHP array
 2018-11-26 23:57:56 +01:00
Michael
4ce320fc79 Contact search is now escaped 2018-11-25 19:48:26 +00:00
Michael
56f21a4b89 Some more escaping 2018-11-25 19:26:46 +00:00
Tobias Diekershoff
8fda63ca86
Merge pull request #6198 from MrPetovan/task/user-removal-improvements 
User removal improvements
 2018-11-25 08:45:45 +01:00
Hypolite Petovan
5437e99090
Merge pull request #6181 from JonnyTischbein/feature_admin_subsubpages 
[Frio] Add collapsable panel groups for admin/site with anchors at headlines
 2018-11-25 02:36:48 -05:00
Jonny Tischbein
3af59eaba4 Move all warning text in L10n + frio: make warning closable 2018-11-25 08:32:05 +01:00
Hypolite Petovan
c964e193b9 Replace *.ini.php by *.config.php in comments 2018-11-25 01:44:51 -05:00
Hypolite Petovan
1501b998fa Add self-removal prevention in mod/admin 2018-11-24 20:59:38 -05:00
Hypolite Petovan
54f4ac6ae0 Remove redirection from User::remove 2018-11-24 20:58:41 -05:00
Hypolite Petovan
0bae80a2d3 Update deprecated calls in Model\user and mod/removeme 2018-11-24 20:56:38 -05:00
Jonny Tischbein
66a18702c0 Frio: Move relocation warning from headline to bootstrap danger box 2018-11-24 22:50:42 +01:00
Michael Vogel
3f4636d490
Merge pull request #6183 from MrPetovan/bug/6135-hide-follower-only-birthdays 
Hide follower-only birthday reminders
 2018-11-24 15:55:43 +01:00
Hypolite Petovan
f001a830ee
Merge pull request #6196 from annando/notices 
Fixes a notice and wrong counting of nodes
 2018-11-24 08:21:23 -05:00
Michael Vogel
42a3610a79
Merge pull request #6184 from MrPetovan/task/normalize-bbcode-hashtags 
Normalize BBCode hashtags links
 2018-11-24 13:14:50 +01:00
Michael
88894511a3 Fixes a notice and wrong counting of nodes 2018-11-24 11:38:36 +00:00
Jonny Tischbein
36aca259d5 Change saving active panel from js localStorage to via html #anker 2018-11-24 00:44:11 +01:00
Hypolite Petovan
c23d1b2776 Urlencode /network file parameter 2018-11-23 10:02:30 -05:00
Hypolite Petovan
9774fd8be9 Remove unused parameter $save in HTML::search 
- Remove unused variables in saved_search()
 2018-11-23 09:53:14 -05:00
Hypolite Petovan
8d7fb35463 Prevent fatal error when $friends isn't an array 2018-11-22 19:03:24 -05:00
Hypolite Petovan
03c5c7ca0a Fix formatting in mod/ostatus_subscribe 2018-11-22 19:03:02 -05:00
Hypolite Petovan
81f89ccae8 Remove stored URL from hashtag terms 2018-11-22 09:33:42 -05:00
Hypolite Petovan
4874f7f8ab Remove useless rawurlencode calls for building hashtag bbcode 
- Fix some formatting
 2018-11-22 09:32:41 -05:00
Hypolite Petovan
d71e856535 Replace remaining occurrences of "0001-01-01" with DBA::NULL_DATE 2018-11-21 23:53:45 -05:00
Hypolite Petovan
c91a87bc07 Fix typo in comment in mod/redir 2018-11-21 22:27:57 -05:00
Hypolite Petovan
20e7e7e3ac Add new REGISTER_INVITATION value to mod/friendica output 2018-11-21 22:27:50 -05:00
Hypolite Petovan
2ef23300a3
Merge pull request #6179 from Alkarex/sql-distinct-fix 
Fix SQL grammar error: ORDER BY clause is not in SELECT
 2018-11-21 08:07:33 -05:00
Alexandre Alapetite
a1238d03a6 Fix SQL grammar error: ORDER BY clause is not in SELECT 
```
2018-11-21T08:31:28Z@e3393hprfvfqnblturqp56rjnp [Info]:DBA.php:557:p
DB Error 3065: Expression #1 of ORDER BY clause is not in SELECT list,
references column 'friendica.item.created' which is not in SELECT list;
this is incompatible with DISTINCT
q, profile_content, update_profile_content,
LegacyModule::runModuleFunction, LegacyModule::content, call_user_func,
App::runFrontend
SELECT DISTINCT(`parent-uri`) AS `uri` FROM `item` INNER JOIN `contact`
ON `contact`.`id` = `item`.`contact-id` AND NOT `contact`.`blocked` AND
NOT `contact`.`pending` WHERE `item`.`uid` = 1 AND `item`.`visible` AND
(NOT `item`.`deleted` OR `item`.`gravity` = 3) AND NOT
`item`.`moderated` AND `item`.`wall` AND `item`.`unseen` ORDER BY
`item`.`created` DESC
```
 2018-11-21 09:57:34 +01:00
Michael
85529ed8ff "viewcontacts" hadn't displayed the AP contacts 2018-11-21 08:50:43 +00:00
Michael
d89e3f4264 To safe or not so save, that is the question 2018-11-19 16:36:31 +00:00
Michael
b486e48cd6 14 days 2018-11-19 10:02:44 +00:00
Michael
ad3502078f Merge remote-tracking branch 'upstream/develop' into dbclean 2018-11-19 10:01:09 +00:00
Michael
191c1a400a The expiry of conversations can now be configured in the admin panel 2018-11-19 06:58:46 +00:00
Michael
43079bfaf8 Several default features are now in the core 2018-11-18 20:13:46 +00:00
Jonny Tischbein
7c690c93bb Fix setting permisson as post for uploaded photo in album via modal create post 2018-11-17 19:14:59 +01:00
Hypolite Petovan
22fedc9a1a
Merge pull request #6152 from JonnyTischbein/issue_delete_from_saved_folder 
Fix deleting last element and displaying empty saved folder
 2018-11-17 11:59:24 -05:00
Jonny Tischbein
590fbe8c6f More Code Standard 2018-11-17 17:27:12 +01:00
Jonny Tischbein
4f8e50d834 Code Standard 2018-11-17 17:24:30 +01:00
fabrixxm
1e9e06a325 Use appropriate redirect in dfrn_poll 
Got an error while remote auth to a local user, where $destination_url
is relative.
 2018-11-17 16:12:45 +01:00
Jonny Tischbein
56406b9910 Fix SQL Error if no items where found + Fix setting to null 2018-11-17 13:22:32 +01:00
Jonny Tischbein
52eb2281e4 Fix deleting last element from saved folder + Fix displaying empty saved folder 2018-11-17 12:41:00 +01:00
Alexandre Alapetite
b190c2e9c7 Title difference for two different ATOM feeds 
Fix for
https://github.com/friendica/friendica/issues/6128#issuecomment-439016471
 2018-11-17 00:05:13 +01:00
Alexandre Alapetite
51f0d52100 WebSub fixes 
More fixes related to https://github.com/friendica/friendica/issues/6128
* Bug when using direct ATOM URL, which ends with .atom after nick name
* Bug when callback URL already has some ?query=parameters (which is
quite usual)
Slight refactoring
 2018-11-15 12:54:04 +01:00
Tobias Diekershoff
b0d8a2fcd0
Merge pull request #6127 from annando/notice 
Avoid "Cannot modify header information - headers already sent"
 2018-11-14 10:20:47 +01:00
Hypolite Petovan
6996a172e8
Merge pull request #6130 from annando/develop 
Issue 6128: Websub could work now
 2018-11-13 18:46:17 -05:00
Michael
a5ddaa9dbc Issue 6128: Websub could work now 2018-11-13 22:23:16 +00:00
Hypolite Petovan
d697dbd794
Convert remaining instances of "contacts" in mod/follow 2018-11-13 16:02:33 -05:00
Hypolite Petovan
537164fd02
Convert remaining instances of "contacts" in mod/unfollow 2018-11-13 16:01:01 -05:00
Michael
83ae873646 Avoid "Cannot modify header information - headers already sent" 2018-11-13 20:20:54 +00:00
Tobias Diekershoff
320c986e05
Merge pull request #6121 from annando/hide 
Don't suggest hidden contacts / Added AP to the suggestions
 2018-11-13 09:39:58 +01:00
Michael
edc6ba976d Output all technical fields - even for hidden contacts 2018-11-13 07:09:14 +00:00
Michael
b5fa518998 Don't suggest hidden contacts / Added AP to the suggestions 2018-11-13 05:52:21 +00:00
Michael
cc0904eb77 Issue 6032: Avoid fatal error 2018-11-12 19:10:40 +00:00
Michael
de0ddfa0d8 Fix wromg server detecting / improved Pleroma version numbers 2018-11-11 21:54:50 +00:00
Steffen K9
de759e41c5
Missing use for Strings 
In line 72 'Strings::' is used but the 'use Friendica\Util\Strings' was missing.
 2018-11-11 01:14:50 +01:00
Hypolite Petovan
7242b706f0 Improve return path in mod/follow 2018-11-10 08:24:31 -05:00
Adam Magness
218f0734be Rename removeTags to escapeTags 
rename function and update calls.
 2018-11-09 13:29:42 -05:00
Adam Magness
063f0e9cb0 Rename escapeTags to escapeHtml 
rename function and update calls.
 2018-11-09 13:27:58 -05:00
Adam Magness
b5a97c1abe Move getTags to BBCode 
move getTags function to BBCode class and update calls.
 2018-11-09 13:24:19 -05:00
Adam Magness
e4354a0d7b Update and Remove isValidEmail 
change function calls, and remove unneeded function.
 2018-11-09 13:18:42 -05:00
Adam Magness
ffc406d819 normalise_link calls 
implement normaliseLink function
 2018-11-08 11:28:29 -05:00
Adam Magness
5276c28a78 link_compare calls 
implement compareLink function.
 2018-11-08 10:46:50 -05:00
Adam Magness
6fc9c6de3b base64url calls 
implement base64UrlEncode and base64UrlDecode functions
 2018-11-08 10:37:08 -05:00
Adam Magness
0efcbe5d15 protect_sprintf calls 
implement protectSprintf function
 2018-11-08 10:30:45 -05:00
Adam Magness
46d7767fd0 formatBytes calls 
implement function in new class
 2018-11-08 10:28:49 -05:00
Adam Magness
b73af72deb deindent calls 
implement function in new class
 2018-11-08 10:26:49 -05:00
Adam Magness
916b3e551e format_network_name calls 
implement formatNetworkName function
 2018-11-08 10:24:47 -05:00
Adam Magness
b99925060a autoname calls 
implement getRandomName function
 2018-11-08 10:22:20 -05:00
Adam Magness
0e01568ccd escape_tags calls 
implement escapeTags function
 2018-11-08 10:20:03 -05:00
Adam Magness
a0f65ca7a1 notags calls 
implement removeTags function
 2018-11-08 10:14:37 -05:00
Adam Magness
991f259ecb random_string calls 
implement getRandomHex function
 2018-11-08 08:45:46 -05:00
Adam Magness
e537f7d017 Function calls 
update function calls to new class
 2018-11-06 21:16:27 -05:00
Jonny Tischbein
93d50af700 move live update: update_contacts to update_contact 2018-11-06 22:22:42 +01:00
Hypolite Petovan
dc669fa736
Merge pull request #6090 from zeroadam/TextToL10n 
Split functions to L10n
 2018-11-06 13:44:30 -05:00
Hypolite Petovan
dd35cd0701
Merge pull request #6086 from friendica/fabrixxm-patch-1 
Fix Friendica node info json
 2018-11-06 10:48:00 -05:00
fabrixxm
0441a169a9 Fix code style 2018-11-06 16:37:58 +01:00
Adam Magness
352da9bcf3 Update function calls 
update function calls for moved functions
 2018-11-06 09:52:58 -05:00
fabrixxm
56484eaaeb
Fix Friendica node info json 
And stop worker sending warning from PortableContacts.php
 2018-11-06 10:07:22 +01:00
Adam Magness
a71eb1d127 functions moved to HTML class 
update function calls to moved class.
 2018-11-05 21:06:26 -05:00
Philipp Holzer
6e10bdf361
Move random Digits to Crypto class 2018-11-05 21:02:54 +01:00
Hypolite Petovan
0472c7b57d
Merge pull request #6070 from zeroadam/TextToXML 
split xml functions out of text.php
 2018-11-05 13:50:09 -05:00
Hypolite Petovan
81e81bd8c8
Merge pull request #6079 from annando/issue-dir-15 
Directory issue 15: Support the "account-type"
 2018-11-05 13:49:28 -05:00
Michael
b011e42ad2 Issue 6074: Language and "explicit" are now exported 2018-11-05 18:14:58 +00:00
Adam Magness
9e51be7554 Revert "Update function calls" 
This reverts commit 748fb8b946.
 2018-11-05 13:07:07 -05:00
Michael
9d63c3eb01 Language is now transmitted as well 2018-11-05 18:03:26 +00:00
Michael
58ce0d799b Directory issue 15: Support the "account-type" 2018-11-05 17:59:46 +00:00
Adam Magness
748fb8b946 Update function calls 
update function calls to new class
 2018-11-05 07:40:18 -05:00