1
1
Fork 0
Commit graph

4486 commits

Author SHA1 Message Date
Hypolite Petovan
180f7d8218 Add disabled_cw user setting 2018-04-04 23:08:47 -04:00
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
4b7014d367 move the tos module to src/Module 2018-04-03 16:33:10 +02:00
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
03ed5e5649 forgot the 2nd mail 2018-04-03 12:47:38 +02:00
d10cdfe942 pass uid to notofication system so securemail addon can pick it up 2018-04-03 12:45:27 +02:00
3ec4e28af6 updated the privacy statement text and added some headers to the functions 2018-04-03 06:55:25 +02:00
6c20b4507d Added /tos module 2018-04-02 18:40:30 +02:00
0594f13c35 Receiving was tested, sending is implemented and tested as well, currently unused 2018-04-02 12:53:48 +00:00
348ee3625d BBCode support in register_text 2018-04-02 08:42:11 +02:00
7dd64dd465 Merge remote-tracking branch 'upstream/develop' into dfrn-2 2018-04-01 04:49:28 +00:00
3eb7ab2d9e Fix the version sorting in the federation statistics 2018-03-31 09:34:36 +00:00
80cca09a53 Fix: Avoid a WSOD when saving the profile 2018-03-31 03:33:19 +00:00
1613f2a1c4 Ensure that public contacts can't create toplevel posts 2018-03-30 06:20:00 +00:00
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
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
9bfc7bf584 A relocation hadn't changed the hostname 2018-03-28 08:09:45 +00:00
2465bbaac8 Fixed SQL query 2018-03-28 08:04:20 +00:00
17a6cb18b8 Relais settings are added to admin backend 2018-03-28 06:16:46 +00:00
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
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
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
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
5fad0cd123 count from zero... 2018-03-18 14:30:51 +01:00
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
782d692b5a Possible fix issue 4611: Don't write to database before it is created 2018-03-17 09:04:38 +00:00
c7dc3f94c9 Simplified query 2018-03-17 07:12:28 +00:00
69918f4ae9 Ignore obvious garbage results 2018-03-17 06:54:47 +00:00
d616bb7564 Fix: In the contact search you had been able to delete your own contact 2018-03-17 06:17:32 +00:00