keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
23746 commits 4 branches 0 tags 179 MiB
Commit graph

5433 commits

Author SHA1 Message Date
Tobias Diekershoff
a675bd5fa4 clarification 2019-02-06 17:15:14 +01:00
Hypolite Petovan
a0b14a46cb
Merge pull request #6581 from nupplaphil/config_refact 
Config Refactoring
 2019-02-06 09:57:41 -05:00
Tobias Diekershoff
9f7fdb1bff Storage Backend: wording of admin panel help 2019-02-06 07:35:57 +01:00
Philipp Holzer
40d8b04795
using Config::get (automatically use the right cache) 2019-02-05 23:09:57 +01:00
Philipp Holzer
87acace660
removing code for now 2019-02-05 23:06:28 +01:00
Tobias Diekershoff
b654784396 File storage options, naming of the default option and EN docs 2019-02-05 16:30:46 +01:00
Hypolite Petovan
3c62a7206e Improve Markdown::convert panel display in mod/babel 2019-02-04 21:46:34 -05:00
Philipp Holzer
1e0e1674f2
4) Adding Factories to other entrypoints 2019-02-03 22:46:50 +01:00
Philipp Holzer
4af0119b73
3) Introducing ConfigFactory 2019-02-03 22:22:04 +01:00
Philipp Holzer
be6b229534
1) Refactor App->config[] into Core\Config 2019-02-03 18:54:25 +01:00
rabuzarus
ba03ec857a attachment preview: some small corrections 2019-02-03 16:26:13 +01:00
rabuzarus
a6322b1c4e attachment preview: some backend work in the item module: 
- convert attachment to bbcode and
- add the attachment bbcode to the item body
 2019-02-01 23:42:36 +01:00
rabuzarus
07d1932efc attachment preview: frontend work (works with frio) 2019-02-01 19:18:08 +01:00
Hypolite Petovan
f0ec729466 Remove mod/profile.php 2019-01-30 08:07:31 -05:00
Hypolite Petovan
0615c8438a Add new Module\Profile class 
- Update reference to legacy module function profile_content
 2019-01-30 08:07:20 -05:00
Tobias Diekershoff
cb72a5fd3b look in the config directory for the file 2019-01-30 10:40:28 +01:00
Tobias Diekershoff
b26d09d62b warn in admin panel when legacy config is used 2019-01-30 07:09:47 +01:00
Hypolite Petovan
bd031d0b87 Add result window for item tags in mod/babel 2019-01-29 20:39:38 -05:00
Hypolite Petovan
e6dccc42e4 [frio] Fix help TOC display 2019-01-29 08:51:02 -05:00
Hypolite Petovan
0c12d8af5f Rename conflicted variable $info in admin settings 2019-01-28 21:45:43 -05:00
Michael
5ded967129 Fix database error 2019-01-27 19:54:08 +00:00
Aditoo17
0564e710f0
Replace help/guide with help/Quick-Start-guide 2019-01-26 10:51:20 +01:00
Hypolite Petovan
bfc0729752 Use new log levels in admin log settings page 2019-01-23 09:07:01 -05:00
Hypolite Petovan
724c4fb94d Fix output of /friendica/json for invite only and approval registration policy 2019-01-22 22:24:46 -05:00
Hypolite Petovan
a1b773e149 Cleanup register artifacts 
- Remove mod/register
- Remove REGISTER_* constants
 2019-01-22 22:24:46 -05:00
Hypolite Petovan
cef6757c92 Replace REGISTER_* constants by Module\Register::* ones 2019-01-22 22:24:15 -05:00
Michael Vogel
73a81290ff
Merge pull request #6487 from MrPetovan/bug/critical-fixes-after-develop-rebase 
Critical fixes after develop rebase
 2019-01-22 15:45:33 +01:00
Hypolite Petovan
0cc1a07cfa Fix default value of contact parameter of OStatus::import in mod/salmon 2019-01-22 08:53:53 -05:00
Tobias Diekershoff
169e9b0fc5 add comment about the PATH 2019-01-22 13:44:49 +01:00
Tobias Diekershoff
31fedf359d restore THEMEPATH variable in mod/view 2019-01-22 10:36:42 +01:00
Hypolite Petovan
b161bd1dfa Improve get_responses() prototype 2019-01-21 11:37:05 -05:00
Hypolite Petovan
aa0d464264 Revert unwarranted selectFirstForUser change in mod/display 2019-01-21 11:12:53 -05:00
Hypolite Petovan
182bffcc6b Fix wrong git-fu in mod/directory 2019-01-21 11:12:51 -05:00
Hypolite Petovan
57ab858486 Fix calls to DBA::select missing parameters 2019-01-21 11:12:50 -05:00
Hypolite Petovan
abe60f0f9a Fix call to Contact::content in mod/update_contact 2019-01-21 11:12:49 -05:00
Hypolite Petovan
e95ad45de5 Fix logic in mod/hovercard 2019-01-21 11:12:49 -05:00
Hypolite Petovan
9f75adf015 Fix item retrieval logic in mod/display 2019-01-21 11:12:49 -05:00
Hypolite Petovan
8a5ef2b6f4 Replace deprecated calls to q() in mod/fsuggest and mod/photos 2019-01-21 11:12:48 -05:00
Hypolite Petovan
7f2dc40601 Fix potential bugs without expected behavior change 
- Fix uninitialized variables
- Fix potentially not set variables
- Fix wrong parameter default value
- Fix method scope
- Fix missing return value
 2019-01-21 11:04:19 -05:00
Hypolite Petovan
45ada943b4 Update missing namespace uses in mod/ 
- Update missing constant moves in mod/
 2019-01-21 10:56:28 -05:00
Hypolite Petovan
3d839bb176 Move Contact::ACCOUNT_TYPE_* constants to User::ACCOUNT_TYPE_* 
- Keep Contact::TYPE_* constants for comparison with contact.contact-type
 2019-01-21 10:56:27 -05:00
Hypolite Petovan
ad9c67663d Move Contact::Page_* constants to User::PAGE_FLAGS_* 2019-01-21 10:55:37 -05:00
Hypolite Petovan
dbc6eb5422 Remove unused code in mod/ 
- Remove commented code
- Remove unused/immediately overwritten variables
- Remove extraneous parameters
- Remove unreachable code
 2019-01-21 10:53:32 -05:00
Hypolite Petovan
0c4f8277e6 Update namespace in mod/view 2019-01-21 10:45:37 -05:00
Hypolite Petovan
c5cb976b62 Update PHPDoc in include/ 2019-01-21 10:44:46 -05:00
Hypolite Petovan
14e4ab544a Update namespace use calls in mod/ 2019-01-21 10:44:21 -05:00
Hypolite Petovan
070aa016e0 Update more PHPDoc, including in include/ 2019-01-21 10:39:28 -05:00
Hypolite Petovan
af9067a381 Update PHPDoc in mod/ 2019-01-21 10:39:27 -05:00
Philipp Holzer
2e602afd3e Add Monolog 2019-01-21 10:10:40 -05:00
fabrixxm
518f28a7bf Small fixes 
- Avoid an intermediate variable
- Use `rawContent()` in `Attach` module
- Small typo
 2019-01-21 10:08:09 -05:00
Hypolite Petovan
2f49c4a058 Revert "Add monolog" 2019-01-21 10:08:09 -05:00
fabrixxm
14622c4bfd Use more Attach model 2019-01-21 10:00:47 -05:00
fabrixxm
19b55f5f8d Use Attach model while deleting in video tab 2019-01-21 10:00:46 -05:00
fabrixxm
906b7841d4 Fix Attach model store() and storeFile() 2019-01-21 10:00:45 -05:00
fabrixxm
b7b3086263 Attach: store, update, delete. Model and views 2019-01-21 10:00:44 -05:00
fabrixxm
fc2b804ccc Move mod/attach to src, add Attach model, update attach table to use storage backends 2019-01-21 10:00:44 -05:00
Philipp Holzer
ff162dfef2 Replacing log usage 2019-01-21 09:59:09 -05:00
Philipp Holzer
fe8f0e0045 Add Monolog 2019-01-21 09:58:05 -05:00
Hypolite Petovan
55e54bb950 Replace deprecated Addon::callHooks with Hook::callAll 
- Update documentation
 2019-01-21 09:50:56 -05:00
Hypolite Petovan
895b3abf32 Remove/replace killme() with *exit() 2019-01-21 09:49:17 -05:00
Jeroen De Meerleer
5cb56a6b12 Fixes some more things 2019-01-21 09:45:37 -05:00
Hypolite Petovan
a3c1beb265 Replace rogue instance of "contacts" by "contact" (#5891) 2019-01-21 09:33:25 -05:00
Hypolite Petovan
dea1a98a5d Fix various documentation issues/unused variables 2019-01-21 09:33:24 -05:00
fabrixxm
204c5a4d99 Don't try to save form for "None" backend. 2019-01-21 09:12:32 -05:00
fabrixxm
3f03f3b4b7 Don't try to build form for "None" backend. 
Fix #6266
 2019-01-21 09:12:32 -05:00
fabrixxm
55292c954b Remove resourceid parameter from Photo::exists() 2019-01-21 09:12:29 -05:00
fabrixxm
8c75c26361 Use Model\Photo as much as possible 
Most important is to use `Photo::delete()` to have backend
to remove data.
 2019-01-21 09:12:28 -05:00
fabrixxm
fdc6608af8 Add storage options form in admin/site page 2019-01-21 09:11:39 -05:00
fabrixxm
6f59c82978 Code standards 2019-01-21 09:10:46 -05:00
fabrixxm
3e13799e70 Add update() to Photo model 
Edit mod/photos.php to use Photo model
 2019-01-21 09:10:45 -05:00
fabrixxm
76579e02cc profile_photo: use Photo model function to get photo and image 2019-01-21 09:02:57 -05:00
fabrixxm
3ca0b0bf9d photos: use model delete() to delete photos 2019-01-21 09:02:56 -05:00
fabrixxm
b96dbcd4cb Move Photo module, update Photo model 2019-01-21 08:40:47 -05:00
Hypolite Petovan
f4502af239 Fix docblock in mod/admin.php 2019-01-19 22:04:01 -05:00
Hypolite Petovan
6aa0899d67 Move theme selection to init() in mod/admin 2019-01-19 21:53:17 -05:00
rabuzarus
7b78ba3929 Bugfix - use magicLinks also for common/all friends and the directory 2019-01-19 15:12:46 +01:00
Michael
d8d72083c0 Google+ will be history soon, so we remove the first traces 2019-01-18 06:58:23 +00:00
Michael
3c1635c45f Solves redirect error message 2019-01-13 18:16:26 +00:00
Michael
28f14c7d60 Don't show deleted contacts, changed "pending" behaviour 2019-01-12 13:28:14 +00:00
Tobias Diekershoff
59f701d5a9
Merge pull request #6419 from annando/unfollow 
Unfollow should now work with Pleroma again
 2019-01-10 11:08:23 +01:00
Tobias Diekershoff
6bc865ff4d
Merge pull request #6356 from MrPetovan/task/6355-add-password-rules 
Add password rules
 2019-01-10 10:37:32 +01:00
Michael
cc6836b89c Pending must only be set when we connect as well 2019-01-10 09:19:19 +00:00
Hypolite Petovan
3b80f335fa
Merge pull request #6412 from annando/issue-6149 
Issue 6149: Making OWA (hopefully) compatible with Hubzilla
 2019-01-08 09:17:05 -05:00
Michael
8c6df8f156 Issue 6149: Making OWA (hopefully) compatible with Hubzilla 2019-01-08 11:17:05 +00:00
Hypolite Petovan
dca8a0088f Update new password help text 2019-01-06 17:23:03 -05:00
Hypolite Petovan
e447375cdd
Merge branch '2019.01-rc' into bug/6334-escape-get-app 2019-01-06 16:38:48 -05:00
Hypolite Petovan
935b86749d Unescape invite_desc template variable 2019-01-03 21:29:30 -05:00
Hypolite Petovan
5e1ceb57de Escape global namespaced get_app() calls 
- Add deprecated status
 2019-01-03 21:27:36 -05:00
Hypolite Petovan
e86b8ef782 Use nickname instead of email for Login Name 2019-01-03 20:42:29 -05:00
Hypolite Petovan
61664ee659 Update usages of User::updatePassword 
- Add password rules in mod/settings display
 2019-01-01 01:15:52 -05:00
Tobias Diekershoff
e7ee3d7200
Merge pull request #6345 from MrPetovan/bug/6283-clear-message-notifications 
Clear private message notifications
 2018-12-31 08:21:55 +01:00
Tobias Diekershoff
034d0f650b
Merge pull request #6340 from MrPetovan/bug/1495-fix-admin-theme-settings 
Fix site theme settings modal form
 2018-12-30 10:35:44 +01:00
Hypolite Petovan
e9b05bd13f Remove fake private message notifications from ping output 2018-12-30 01:11:30 -05:00
Hypolite Petovan
36f995ed20 Add notification clear on private message display 2018-12-30 01:11:02 -05:00
Hypolite Petovan
5abc22f6c5 Replace q() with DBA methods, fix code style 
- Remove unused variables
- Fix doc block
- Fix indentation
 2018-12-30 01:08:51 -05:00
Hypolite Petovan
d838e6d0ec Fix unread message conversation title display 2018-12-30 01:04:52 -05:00
Hypolite Petovan
838c0f96de Use minimal mode to change site theme settings 
- Use textarea in colorbox instead of inline HTML
- Add mode propagation to site theme setting form
- Set theme for site theme settings form to load JS dependencies
 2018-12-29 15:40:05 -05:00
Tobias Diekershoff
7efde8e334
Merge pull request #6209 from MrPetovan/task/move-config-to-php-array 
Remove util/ folder
 2018-12-29 11:43:55 +01:00
Michael Vogel
94eca77041
Merge pull request #6315 from MrPetovan/bug/6309-add-fulltext-index-profile 
Rework mod/match and mod/msearch
 2018-12-27 18:04:06 +01:00
Hypolite Petovan
c07fa5d069
Merge pull request #6332 from annando/assign-uid 
Only assign a uid to the profile if not defined by now
 2018-12-27 09:28:22 -05:00
Michael
826965f6df Only assign a uid to the profile if not defined by now 2018-12-27 09:58:21 +00:00
Hypolite Petovan
fabc90e9dd
Merge branch '2018.12-rc' into task/move-config-to-php-array 2018-12-27 01:47:53 -05:00
Hypolite Petovan
620395378e Normalize uses of Strings::formatNetworkName to $network_link 
- Unescape HTML template variable $network_link
 2018-12-26 11:11:38 -05:00
Hypolite Petovan
a939581cf8
Merge pull request #6325 from annando/always-magic 
Always use magic on the same server
 2018-12-25 16:16:03 -05:00
Michael
a565406b47 Always usa magic on the same server 2018-12-25 19:43:57 +00:00
Hypolite Petovan
761e94d134 Remove redundant htmlentities/htmlspecialchars 2018-12-25 11:37:57 -05:00
Hypolite Petovan
4cd2c83d5c Replace q() calls in mod/viewcontacts 2018-12-25 11:37:57 -05:00
Hypolite Petovan
00f90571ad Remove random profile behavior from /profile 2018-12-25 11:37:57 -05:00
Hypolite Petovan
56d612b2f0
Merge pull request #6323 from annando/issue-6316 
Issue 6316: Do not double encode / Avoid notice
 2018-12-25 11:26:54 -05:00
Michael
9feab828c8 Fixing double encoding here as well 2018-12-25 12:30:27 +00:00
Tobias Diekershoff
6488738790
Merge pull request #6321 from MrPetovan/bug/6316-escape-event-output 
Escape event output
 2018-12-25 08:33:43 +01:00
Hypolite Petovan
4285f2f8bb Remove unused template variable in dfrn_req_confirm 
- Replace killme() by exit() in mod/dfrn_request
 2018-12-24 23:14:09 -05:00
Hypolite Petovan
a8b0aa8c8d Normalize expected format for event fields summary, desc and location 
- Remove unnecessary HTML escaping on event submit
- Add HTML escaping on event display
- Add HTML to BBCode conversion for received ActivityPub events
 2018-12-24 23:00:35 -05:00
Hypolite Petovan
c9c9fc3a96 Code cleanup in events 
- Replace killme() with exit()
- Use correctly escaped query string
- Simplify perms2str input filtering
- Add expected json header to /events/json
 2018-12-24 23:00:35 -05:00
Hypolite Petovan
acaee626f5 Remove include/ requires that are now done directly from Composer 2018-12-24 09:56:25 -05:00
Hypolite Petovan
b962fc989a Rework mod/msearch 
- Remove deprecated q()/killme() calls
- Ensure an output on empty search string
- Fix page number nonsense (-1, +1,...)
 2018-12-24 00:57:21 -05:00
Hypolite Petovan
1938ec3ebe Rework mod/match 
- Replace classic pager with a start index
- Remove q() calls
- Ensure template is still loaded even with no results.
- Improve Minimal Pager display of next link
 2018-12-24 00:56:14 -05:00
Michael
c06f7ad11e The curl result is an object, not an array 2018-12-22 17:00:28 +00:00
Michael Vogel
1cab44827f
Merge pull request #6280 from MrPetovan/bug/4738-fix-message-list-query 
Fix message list query
 2018-12-21 22:17:20 +01:00
Hypolite Petovan
1c58363696 Remove unused/empty template variables in register 2018-12-20 23:59:15 -05:00
Hypolite Petovan
66bf39216b Remove unreliable ANY_VALUE from message list query 2018-12-19 06:41:08 -05:00
Jonny Tischbein
5d81738034 Add page-wrapper for probe + webfinder 2018-12-17 23:15:14 +01:00
Jonny Tischbein
58067cdfbf Add generic content wrapper + frio btn primary buttons class to newmemeber, unfollow, follow (auto + dfrn) 2018-12-17 23:09:08 +01:00
Michael
f6c3974c8f Issue 6257: Make notes visible again 2018-12-13 20:09:19 +00:00
Michael
cced018825 Possibly fix a memory issue with large posts 2018-12-11 18:48:33 +00:00
Michael
f2e2066d33 Non public content is now displayed again to visitors. 2018-12-09 13:09:49 +00:00
Michael
8fbe0d46e9 Fix for remote authentication when visiting contact's pages 2018-12-08 20:28:01 +00:00
Michael
491fc5f78a Issue 6168: "redir" now mostly use OWA 2018-12-04 07:12:55 +00:00
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