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
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
