Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2024-11-18 05:03:40 +00:00
Code Issues Projects Releases Packages Wiki Activity
20357 commits 3 branches 64 tags 248 MiB
Commit graph

4774 commits

Author SHA1 Message Date
Michael
b5b172500d Merge remote-tracking branch 'upstream/develop' into public-redir 2018-06-01 12:32:51 +00:00
Hypolite Petovan
93daf7883e Merge branch 'master' into develop 
- Updated new develop version label
- Incremented database build number
 2018-06-01 07:30:04 -04:00
Michael
ae8d7267a0 "redir" is now centralized and works with the public contact 2018-06-01 06:46:34 +00:00
Hypolite Petovan
71ab86d0c3
Merge pull request #5150 from abanink/5147 
5147 Typo 'bandwith' should be 'bandwidth'
 2018-05-31 10:35:24 -04:00
Pascal Deklerck
bdb82572ba redo correct typo Bandwith to Bandwidth in mod/settings.php 2018-05-31 06:39:30 +02:00
Pascal Deklerck
de1e514be3 redo correct typo bandwith to bandwidth in mod/admin.php 2018-05-31 06:38:14 +02:00
Pascal Deklerck
8fd33f89ea undo change to mod/admin.php 2018-05-30 20:28:38 +02:00
Pascal Deklerck
307a19074f undo changes to strings files 2018-05-30 20:22:34 +02:00
Pascal Deklerck
e1dd1aa358 5147 Typo 'bandwith' should be 'bandwidth' 2018-05-30 08:50:29 +02:00
Hypolite Petovan
2e97cbe728
Merge pull request #5144 from annando/deleted-item 
Fix for not being able to delete items you don't own
 2018-05-29 15:14:51 -04:00
Michael
5bcb9daa43 Use local_user instead 2018-05-29 18:57:32 +00:00
Tobias Diekershoff
8eefe542df rewording 2018-05-29 16:54:40 +02:00
Michael
8329705eba New function to delete items for users 2018-05-29 05:22:57 +00:00
Tobias Diekershoff
3f93b982b6 hide profile help text clarification 2018-05-28 16:16:23 +02:00
Michael
c5a22f86c7 Merge remote-tracking branch 'upstream/2018.05-rc' into deleted-item 2018-05-27 10:38:49 +00:00
Michael
54136f3a74 Added the new parameter to the delete function. 2018-05-26 21:38:45 +00:00
Michael
4c36109f02 Some more places to add the user id 2018-05-26 20:03:30 +00:00
Michael
bdbc51229a Fix for not being able to delete items 2018-05-26 18:07:27 +00:00
Hypolite Petovan
3965615fbc
Merge pull request #5129 from tobiasd/20180526-adminpanel 
added a warning to an admin setting
 2018-05-26 08:35:17 -04:00
Hypolite Petovan
5cc1405bae
Merge pull request #5127 from tobiasd/20180525-register 
Opt-In to listing in the directory
 2018-05-26 08:34:42 -04:00
Tobias Diekershoff
c65c870032 added a warning to an admin setting 2018-05-26 07:32:39 +02:00
Tobias Diekershoff
112c7b0248 remove false othion HTML ignored 2018-05-26 07:09:32 +02:00
Tobias Diekershoff
9041bacebf exchange help text 2018-05-25 20:32:48 +02:00
Tobias Diekershoff
e996354922 Opt-In to listing in the directory 2018-05-25 19:53:03 +02:00
Hypolite Petovan
44caf05f06
Merge pull request #5110 from annando/nodeinfo 
Nodeinfo: The number of comments is now calculated more reliable
 2018-05-22 17:20:06 -04:00
Michael
5430354f54 Issue 5111: missing "use DBM" in "removeme" 2018-05-22 20:17:32 +00:00
Michael
89a20ddbd7 Nodeinfo: The number of comments is now calculated more reliable 2018-05-22 20:10:18 +00:00
Hypolite Petovan
c41332364f
Merge pull request #5089 from tobiasd/20180519-tos 
privacy statement
 2018-05-20 08:20:16 -04:00
Tobias Diekershoff
f7c24a20ae cite: just some small styling thing 2018-05-20 08:43:43 +02:00
Michael
c70ebadd7d Issue-3412 related: Don't send connection posts anymore 2018-05-19 19:34:51 +00:00
Tobias Diekershoff
dd629d5fa4 registration: added display of privacy statement if enabled 2018-05-19 18:53:54 +02:00
Tobias Diekershoff
ae62c1d1ea admin panel: added privacy statement preview 2018-05-19 18:52:23 +02:00
Tobias Diekershoff
139f7cdc41
Merge pull request #5088 from annando/display-update 
Follow up: Display update should really be fixed now.
 2018-05-19 18:19:52 +02:00
Michael
e28819655c Follow up: Display update should really be fixed now. 2018-05-19 16:04:57 +00:00
Hypolite Petovan
d4ebf7ae52
Merge pull request #5086 from annando/issue-2880 
Issue 2880: Editing post doesn't destroy mentions or hashtags anymore
 2018-05-19 12:01:05 -04:00
Tobias Diekershoff
9b55e52184
Merge pull request #5087 from annando/issue-4819 
Issue 4819: The introduction note is now stored
 2018-05-19 17:44:42 +02:00
Michael
c214353a5d Issue 4819: The introduction note is now stored displayed on the contact page. 2018-05-19 15:29:34 +00:00
Michael
3fe07cca57 Issue 2880: Editing post doesn't destroy mentions or hashtags anymore 2018-05-19 14:55:27 +00:00
Michael
b1a9030369 Fix constant display updates 2018-05-19 06:12:55 +00:00
Tobias Diekershoff
81089e1b2e
Merge pull request #5083 from annando/fix-spamming 
Fix: Avoid getting spammed when an admin has got several accounts
 2018-05-19 08:06:33 +02:00
Michael
1cd6976faa Fix missing $ 2018-05-19 05:59:43 +00:00
Michael
e9848d7b8f End subscription for unreachable subscribers 2018-05-19 03:56:29 +00:00
Michael
a4d976b70f Fix: Avoid getting spammed when an admin has got several accounts 2018-05-19 03:38:43 +00:00
Michael
be469f6bca Fix for subscribing to the wrong feed from OStatus 2018-05-18 13:23:27 +00:00
Michael
feb3d76a5b Fix: Subscriptions from GNU Social partially don't work 2018-05-18 12:18:12 +00:00
Roland Häder
d1783e9aeb
Fixes for #4965: 
- better descriptive tooltip for adding/removing contact from/to group

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-17 02:24:42 +02:00
Roland Häder
6129eb1623
OpenId possibly fixed: 
- The LightOpenId class' constructor now requires the hostname from where the
  requested started, added it now
- sometimes need to invoke get_app() as $a was not around

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-17 00:24:25 +02:00
Roland Häder
5a7bcd4725
Added empty line after if() block (convention) 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:22 +02:00
Roland Häder
bacb7b70f6
Cleanups: 
- added empty lines
- removed old-lost commented out line

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Roland Häder
57e668d9e0
Continued: 
- avoided else() block which reduces code complexibility
- used more x()
- added curly braces
- added known type-hints

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:05 +02:00
Michael
dcfd81e2ee
Some corrections 2018-05-14 22:50:04 +02:00
Michael
d54c79a772
Replace old database queries with the new ones 2018-05-14 22:50:04 +02:00
Roland Häder
8bc565be74
Continued: 
- ops, another rebase-leftover fixed

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:03 +02:00
Roland Häder
befb080b70
Continued: 
- moved to Config class

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:03 +02:00
Roland Haeder
2fd14eac70
Opps, cutted this out by accident ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:50:03 +02:00
Roland Haeder
6579396627
removed TODO, one day this all needs refacturizing ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:50:02 +02:00
Roland Haeder
1d15e68678
added more curly braces + spaces for #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:50:01 +02:00
Roland Häder
bc21bf0ee6
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:50:01 +02:00
Michael
3bb5a416f8
Some corrections 2018-05-14 22:50:00 +02:00
Michael
8b775d48f9
Replace old database queries with the new ones 2018-05-14 22:50:00 +02:00
Roland Häder
cbe12eba76
Continued: 
- ops, another rebase-leftover fixed

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:59 +02:00
Roland Häder
7a29944836
Fixes/cleanup: 
- added missing curly braces (and some absent caused parser errors)
- <include|require>[_once] are keywords, so don't use them as such
- removed/added empty lines

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:59 +02:00
Roland Haeder
8e42e797cc
Opps, cutted this out by accident ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:57 +02:00
Roland Haeder
7514a3beb8
rewrote for() loop to foreach() + added curly braces/spaces 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:57 +02:00
Roland Haeder
5ee91330a7
removed TODO, one day this all needs refacturizing ... 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:57 +02:00
Roland Haeder
85039d41a2
added more curly braces + spaces for #3254 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:56 +02:00
Roland Häder
d9d60346ff
more usage of dbm::is_result() and sorted a bit statements 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:56 +02:00
Roland Haeder
128c9b20e0
fixed curly braces + added more 
Signed-off-by: Roland Haeder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
1de8e31df6
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-14 22:49:55 +02:00
Roland Häder
99440f3c56
Beatification: 
- added space after curly braces (MrPetovan)
- added TODO for possible rewrite candidate

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 14:21:53 +02:00
Roland Häder
87dbe03521
reverted back ... 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:20:15 +02:00
Roland Häder
445cc1cb99
Fixes: 
- brought back comment (ops)
- DBM is the class name (not dbm)

Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:06:43 +02:00
Roland Häder
8d9547777e
Ops, was redundant here. 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:05:31 +02:00
Roland Häder
594f946ad6
No extra empty line here 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-13 10:04:49 +02:00
Michael
249d84c0b3 Automatic table optimisation is deactivated by default now 2018-05-13 05:41:05 +00:00
Roland Häder
5debcbb5a6
added spaces + some curly braces + some usage of dbm::is_result() 
Signed-off-by: Roland Häder <roland@mxchange.org>
 2018-05-10 13:07:22 +02:00
Michael
40d3e7982c Adopt the relay definition according to the suggestions from @jaywink 2018-05-10 11:04:18 +00:00
Michael
6c792588fd Ensure to mostly fetch the item with an non zero user id 2018-05-08 22:26:49 +00:00
Michael
eb4650ff23 dbclean settings are now available from the frontend 2018-05-07 05:37:20 +00:00
Michael
1230ff146a "remote-self" is now working for Diaspora and Twitter as well 2018-05-04 21:12:13 +00:00
Michael
eecd1e47e4 Some corrections 2018-05-02 21:12:48 +00:00
Michael
4ad655ab80 Replace old database queries with the new ones 2018-05-02 19:26:15 +00:00
Hypolite Petovan
352e136132
Merge pull request #4961 from annando/direct-dfrn 
Direct Relay is now working with DFRN as well
 2018-04-30 14:06:35 -04:00
rabuzarus
0c0b715c63 Merge develop into 20180425_-_fix_help_aside 2018-04-30 14:56:25 +02:00
Michael
74aa3499b0 Additional logging 2018-04-30 12:41:56 +00:00
Michael
aa4945f4a0 "x-social-relay" now exposes all supported protocols 2018-04-30 04:01:04 +00:00
Philipp Holzer
b4f5311e7f Add Install Mode 
- merge `friendica/develop` to `nupplaphil/install_mode`
 2018-04-29 20:15:12 +02:00
Michael
fd318a1193 Corrected query to don't show hash tag posts from blocked or ignored contacts 2018-04-28 16:12:45 +00:00
Philipp Holzer
8815d07765 Add Install Mode 
- fixed mistake
 2018-04-28 17:06:08 +02:00
Philipp Holzer
41c6d63052 Add Install Mode 
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
 2018-04-28 15:15:54 +02:00
Philipp Holzer
1ab965c944 Add Install Mode 
- merged `friendica/develop` to `nupplaPhil/install_mode`
- content merged `mod/install.php` to `src/Class/`
 2018-04-28 15:11:01 +02:00
Philipp Holzer
a97ad9dc42 Add Install Mode (Part 2) 
- Added constants to class `App`
- Added global App-Mode to `dba:connect()` instead parameter `$install`
 2018-04-28 12:36:40 +02:00
Hypolite Petovan
66e5586d21
Merge pull request #4939 from astifter/better_curl_error_during_install 
Better curl error during install.
 2018-04-27 16:57:01 -04:00
Andreas Neustifter
70a781fa5a Proper error when rewrite fails during install. 
When Curl tries to fetch the rewrite test URL and something goes wrong the user
has no clue what was the problem. This problems can include:
- The rewriting not working at all.
- HTTPS redirects do not work.
- Curl does not accept the presented SSL cert.

This commit fixes this by providing the Curl error message to the user to further
debug the problem.

Fixes #3629.~
 2018-04-27 21:27:55 +02:00
Andreas Neustifter
846f8becae Install selected theme during settings persistence. 
Themes have to be installed to be usable by the system. This is not done
automatically which lead to the problems with the site when themes where
switched right after the install and before the "Reload themes" button
was pressed in the admin page.

This patch makes sure that the selected them is always installed when
it is selected by the user either in the admin or settings page.

Fixes #4921.
 2018-04-27 20:45:34 +02:00
rabuzarus
3fb993f37b frio - fix help toc aside 2018-04-25 23:30:56 +02:00
Hypolite Petovan
c8cc8e57c2
Merge pull request #4925 from rabuzarus/20180424_-_frio_invite_template 
frio - provide a template for invite page
 2018-04-24 11:37:10 -04:00
rabuzarus
ac753e3320 frio - provide a template for invite page 2018-04-24 17:33:48 +02:00
Michael
5cf745af44 Item distribution is now done via the public post 2018-04-24 13:21:25 +00:00
Michael
7230cc0bed Merge remote-tracking branch 'upstream/develop' into item-distribution 2018-04-24 04:23:38 +00:00
Philipp Holzer
6973aaefc2 Add Install Mode 
- Added $install_mode in Class App instead
- Extracted the install business logic to a new Class Install
- Replaced all $a->module == 'install' with $a->install_mode
 2018-04-23 22:56:59 +02:00
Hypolite Petovan
a66e9b81ba
Merge pull request #4873 from astifter/develop 
Remove pagination when empty, move new Member Tips and use common widget to find people.
 2018-04-23 10:23:21 -04:00
Michael
ba35b19af6 Public federated items now always are having an entry with "uid=0" 2018-04-23 11:14:25 +00:00
Hypolite Petovan
da4892b4d2 Fix count() warning in mod/friendica 
- Add default value for Config call
 2018-04-23 00:00:29 -04:00
Michael Vogel
37e5272f92
Merge pull request #4881 from MrPetovan/task/4867-guess-language-from-plaintext 
Guess language from plaintext
 2018-04-23 00:26:05 +02:00
Friendica
666375fed1 Move new member tips to tab bar. 
The new member tips link looks very misplaced and forlorn at the current position.
Move it to the tab-bar (in a somewhat crude fashion, but its for 14 days/user only.)
 2018-04-22 20:44:22 +00:00
Michael
98c677f09f Currently disabled 2018-04-22 11:33:32 +00:00
Michael
8f2db61538 Receiving of public posts is now working 2018-04-22 10:58:03 +00:00
Michael
b77ae3a8a7 Public posts are now transferred successfully to the DFRN part 2018-04-22 10:42:01 +00:00
Michael
c118c03a70 Merge remote-tracking branch 'upstream/develop' into dfrn-rework 2018-04-22 07:45:28 +00:00
Hypolite Petovan
ee672b946e Add Text\BBCode::toPlaintext to mod/babel 2018-04-21 18:48:10 -04:00
Hypolite Petovan
daf94a8f63
Merge pull request #4891 from annando/private-forum-redux 
Better working with private forums
 2018-04-21 18:19:27 -04:00
Michael
16beab4652 Better working with private forums 2018-04-21 21:59:02 +00:00
Tobias Diekershoff
f63be91bd5
Revert "Moved .htconfig.php file & extracted Install business logic" 2018-04-21 16:28:22 +02:00
Philipp Holzer
334d392154 Merge remote-tracking branch 'origin/develop' into install_config 2018-04-21 14:23:49 +02:00
Philipp Holzer
346697d771 Moved .htconfig file 
Extracted install business functions to new Class `Install.php`
 2018-04-21 14:10:53 +02:00
Michael
e61ed380f7 Reworked dfrn_notify endpoint, added public endpoint 2018-04-21 09:55:41 +00:00
fabrixxm
12b7bce1cc admin users, don't set account-type if page flag isn't PAGE_NORMAL 2018-04-20 14:27:36 +02:00
fabrixxm
9a7f508550 Admin users: Update page type names, add raw flags template context 
Change user table header "Account" to "Type": it use less space :-)
 2018-04-20 14:02:45 +02:00
Friendica
400bab676d Add space before Impressum. 
The page /friendica/ contains an Impressum section which is activated with an AddOn.
Add more space after last paragraph of information, before impressum, because site
looks quite cramped otherwise.
 2018-04-19 19:03:29 +00:00
Tobias Diekershoff
7b6d1e1ab3
Merge pull request #4853 from annando/site-defaults 
Default values for site configuration
 2018-04-17 10:12:11 +02:00
Michael
e5583591d7 Default values for site configuration 2018-04-17 05:18:26 +00:00
Tobias Diekershoff
150843af5f new info mail address 2018-04-16 17:28:19 +02:00
Tobias Diekershoff
d149541dba notify admin when user deletes account 2018-04-15 11:39:05 +02:00
Michael Vogel
c4c0d09744
Merge pull request #4799 from MrPetovan/task/hide-ignored-unfollowed-contact-posts 
Reintroduce own posts in network list
 2018-04-10 06:58:36 +02:00
Hypolite Petovan
20843fee38 Reintroduce own posts in network list 2018-04-09 22:50:03 -04:00
Michael Vogel
74e189039a
Merge pull request #4768 from MrPetovan/task/hide-ignored-unfollowed-contact-posts 
Hide posts from recently ignored/unfollowed contact
 2018-04-09 20:08:20 +02:00
Hypolite Petovan
99b446eccc Remove useless intval() calls in mod/network 2018-04-09 09:19:49 -04:00
Michael
105f3ca747 Relay: Avoid empty tags / Always use the "relay account" 2018-04-09 05:53:23 +00:00
Hypolite Petovan
7563adcc7d Use positive form for relationship check in mod/network 2018-04-08 20:47:16 -04:00
Michael
5c2b54009e The magic link is added at more places 2018-04-08 19:17:50 +00:00
Hypolite Petovan
b28fd98acd Replaced < comparison with IN for contact.rel in mod/network 2018-04-08 09:59:43 -04:00
Hypolite Petovan
c8b0520144 Use CONTACT_IS_SHARING constant instead of rel value 2018-04-07 08:09:13 -04:00
Hypolite Petovan
b798ad126a Hide posts from recently ignored or unfollowed contact in mod/network 2018-04-07 02:42:42 -04:00
Hypolite Petovan
9220025b12 Exchange Sender: and From: headers in mod/invite 2018-04-07 02:26:33 -04:00
Hypolite Petovan
0f02d1a449 Use App->getSenderEmailAddress in mod/invite 
- Use "Sender: " header
- Rename confusing variables
 2018-04-06 21:48:37 -04:00
Hypolite Petovan
9403e614aa Update system.disable_cw help text 2018-04-04 23:08:48 -04:00
Hypolite Petovan
34fd442821 Rename social.disable_cw pconfig to system.disable_cw 2018-04-04 23:08:48 -04:00
Hypolite Petovan
180f7d8218 Add disabled_cw user setting 2018-04-04 23:08:47 -04:00
Tobias Diekershoff
421517c611 consistent use of terms in heading in the admin panel 2018-04-04 07:22:05 +02:00
Hypolite Petovan
2cf35cd8f9
Merge pull request #4727 from tobiasd/20180402-register 
added TOS module
 2018-04-03 10:39:53 -04:00
Tobias Diekershoff
4b7014d367 move the tos module to src/Module 2018-04-03 16:33:10 +02:00
Tobias Diekershoff
297ade6981 removed leftover from the used template 2018-04-03 15:49:54 +02:00
Hypolite Petovan
b2a9fbc249
Merge pull request #4731 from tobiasd/20180403-lostpwd 
pass uid to notification system so securemail addon can pick it up
 2018-04-03 07:14:01 -04:00
Tobias Diekershoff
03ed5e5649 forgot the 2nd mail 2018-04-03 12:47:38 +02:00
Tobias Diekershoff
d10cdfe942 pass uid to notofication system so securemail addon can pick it up 2018-04-03 12:45:27 +02:00
Tobias Diekershoff
3ec4e28af6 updated the privacy statement text and added some headers to the functions 2018-04-03 06:55:25 +02:00
Tobias Diekershoff
6c20b4507d Added /tos module 2018-04-02 18:40:30 +02:00
Michael
0594f13c35 Receiving was tested, sending is implemented and tested as well, currently unused 2018-04-02 12:53:48 +00:00
Tobias Diekershoff
348ee3625d BBCode support in register_text 2018-04-02 08:42:11 +02:00
Michael
7dd64dd465 Merge remote-tracking branch 'upstream/develop' into dfrn-2 2018-04-01 04:49:28 +00:00
Michael
3eb7ab2d9e Fix the version sorting in the federation statistics 2018-03-31 09:34:36 +00:00
Michael
80cca09a53 Fix: Avoid a WSOD when saving the profile 2018-03-31 03:33:19 +00:00
Michael
1613f2a1c4 Ensure that public contacts can't create toplevel posts 2018-03-30 06:20:00 +00:00
Michael
c9f02d534e Merge remote-tracking branch 'upstream/develop' into dfrn-2 2018-03-30 05:45:29 +00:00
Hypolite Petovan
d13f36938c Suppress error message for non-existing contacts in mod/follow 2018-03-29 23:29:41 -04:00
Hypolite Petovan
3a58fe48bd Fix formatting in mod/follow 2018-03-29 23:28:48 -04:00
Tobias Diekershoff
07954f7bcf typo 2018-03-29 06:57:02 +02:00
rabuzarus
6dc6581aca
Merge pull request #4702 from annando/sql-fix 
Fixed SQL query
 2018-03-28 13:43:17 +02:00
Michael
9bfc7bf584 A relocation hadn't changed the hostname 2018-03-28 08:09:45 +00:00
Michael
2465bbaac8 Fixed SQL query 2018-03-28 08:04:20 +00:00
Michael
17a6cb18b8 Relais settings are added to admin backend 2018-03-28 06:16:46 +00:00
Michael
a0451e1c62 Merge remote-tracking branch 'upstream/develop' into update-self 2018-03-24 22:50:14 +00:00
Alexandre Alapetite
e64196c7b3 Fix PHP cannot take a shell script 
Fix part of https://github.com/friendica/friendica/issues/4665
`php [shell file]` does not work, so use `php [php file]` instead.
`php bin/console.php` is more robust than e.g. `bin/console` which does
not work on Windows, or *nix systems without Bash
 2018-03-24 12:47:40 +01:00
Michael
bac60164e7 New function to keep the self contact updated 2018-03-24 06:15:18 +00:00
Hypolite Petovan
a7c48f40b7 Enable CalendarExport widget on /events 2018-03-23 06:34:21 -04:00
Hypolite Petovan
95792f6b79 Fix typo in mod/events 
- Add todo in Model\Event
 2018-03-23 06:34:21 -04:00
Hypolite Petovan
89e9cbb0b5 Remove private key from event array in Event::store 2018-03-23 06:34:21 -04:00
Hypolite Petovan
6e7c6ab0fa Remove references to include/event 2018-03-23 06:32:34 -04:00
Hypolite Petovan
f7e2071117 Replace include/event function with method calls 
- Updated scope of Model\Event methods
- Updated use list
 2018-03-23 06:32:34 -04:00
Hypolite Petovan
27d94023ee Merge branch 'master' into develop 2018-03-23 06:15:55 -04:00
Michael
9d83369d88 DFRN payload is receivable via the Diaspora transport layer 2018-03-23 05:08:47 +00:00
Hypolite Petovan
cd7993f869 Use Config wrapper instead of direct config retrieval 2018-03-21 08:54:58 -04:00
Hypolite Petovan
fd9171a40e Fix egregious whitespace issue in mod/settings 2018-03-21 02:38:04 -04:00
Hypolite Petovan
5b4fb945a2 Add htconfig setting to disable password_exposed() 2018-03-21 02:35:28 -04:00
Hypolite Petovan
701fd41463 Rename checkPasswordExposed to isPasswordExposed 2018-03-21 02:14:43 -04:00
Hypolite Petovan
ca13570251 Add exposed password check to manual password change 2018-03-21 01:33:35 -04:00
Tobias Diekershoff
dca6627682
Merge pull request #4633 from friendica/fabrixxm-36rc-patch-2 
Small fixes and spelling
 2018-03-19 15:22:10 +01:00
fabrixxm
9bf58a0612
Fix spelling for "detailed_notif" help text in settings 2018-03-19 13:56:17 +01:00
fabrixxm
d9aca508cd
Fix another closing bracket in translatable string 2018-03-19 11:19:09 +01:00
Hypolite Petovan
132456697c Remove scripts/dbstructure 
- Updated documentation
 2018-03-18 23:53:53 -04:00
Tobias Diekershoff
5fad0cd123 count from zero... 2018-03-18 14:30:51 +01:00
Tobias Diekershoff
a6845c0180 added check for POSIX kill to the installation wizard 2018-03-18 10:36:28 +01:00
Hypolite Petovan
d1c93e7a60
Merge pull request #4614 from annando/dir-own-contact 
Fix: In the contact search you had been able to delete your own contact
 2018-03-17 08:42:51 -04:00
Michael
782d692b5a Possible fix issue 4611: Don't write to database before it is created 2018-03-17 09:04:38 +00:00
Michael
c7dc3f94c9 Simplified query 2018-03-17 07:12:28 +00:00
Michael
69918f4ae9 Ignore obvious garbage results 2018-03-17 06:54:47 +00:00
Michael
d616bb7564 Fix: In the contact search you had been able to delete your own contact 2018-03-17 06:17:32 +00:00
Michael
a62ccf0ec1 Added to-do 2018-03-16 07:27:18 +00:00
Michael
67fa6aa809 We now change relationships not only for OStatus contacts 2018-03-16 06:58:54 +00:00
Michael
59dd353464 DFRN: The relationship between contacts can now be changed afterwards 2018-03-16 06:43:10 +00:00
Michael
858fd127a1 Fix: subscribing to the old followers hadn't worked 2018-03-14 00:27:15 +00:00
Michael
f17f61df38 Fix indentation 2018-03-13 23:32:38 +00:00
Michael
aff99b32fd Improved logging 2018-03-13 21:33:45 +00:00
Michael
bc84852682 Added logging 2018-03-13 21:10:19 +00:00
Michael
c20a42c889 Completely reformatted and restructured code, using dba functions now. 2018-03-13 21:03:56 +00:00
Michael
4d3b1ae918 We don't need the contact-id anymore 2018-03-13 07:16:31 +00:00
Michael
32ee4ca4b1 OStatus: Fixed communication issues with deleted contacts 2018-03-13 06:21:44 +00:00
Hypolite Petovan
83c4c86251 Fix: The acl lookup now works in multi threaded posts as well 2018-03-12 08:15:59 -04:00
Michael
ab3f28f4c8 Fix: We have to be able to remove delegations as well 2018-03-12 04:50:07 +00:00