1
0
Fork 0
Commit graph

4635 commits

Author SHA1 Message Date
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
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
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
5cf745af44 Item distribution is now done via the public post 2018-04-24 13:21:25 +00:00
7230cc0bed Merge remote-tracking branch 'upstream/develop' into item-distribution 2018-04-24 04:23:38 +00:00
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
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
98c677f09f Currently disabled 2018-04-22 11:33:32 +00:00
8f2db61538 Receiving of public posts is now working 2018-04-22 10:58:03 +00:00
b77ae3a8a7 Public posts are now transferred successfully to the DFRN part 2018-04-22 10:42:01 +00:00
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
16beab4652 Better working with private forums 2018-04-21 21:59:02 +00:00
f63be91bd5
Revert "Moved .htconfig.php file & extracted Install business logic" 2018-04-21 16:28:22 +02:00
334d392154 Merge remote-tracking branch 'origin/develop' into install_config 2018-04-21 14:23:49 +02:00
346697d771 Moved .htconfig file
Extracted install business functions to new Class `Install.php`
2018-04-21 14:10:53 +02:00
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
7b6d1e1ab3
Merge pull request #4853 from annando/site-defaults
Default values for site configuration
2018-04-17 10:12:11 +02:00
e5583591d7 Default values for site configuration 2018-04-17 05:18:26 +00:00
150843af5f new info mail address 2018-04-16 17:28:19 +02:00
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
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
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
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
a62ccf0ec1 Added to-do 2018-03-16 07:27:18 +00:00
67fa6aa809 We now change relationships not only for OStatus contacts 2018-03-16 06:58:54 +00:00
59dd353464 DFRN: The relationship between contacts can now be changed afterwards 2018-03-16 06:43:10 +00:00
858fd127a1 Fix: subscribing to the old followers hadn't worked 2018-03-14 00:27:15 +00:00
f17f61df38 Fix indentation 2018-03-13 23:32:38 +00:00
aff99b32fd Improved logging 2018-03-13 21:33:45 +00:00
bc84852682 Added logging 2018-03-13 21:10:19 +00:00
c20a42c889 Completely reformatted and restructured code, using dba functions now. 2018-03-13 21:03:56 +00:00
4d3b1ae918 We don't need the contact-id anymore 2018-03-13 07:16:31 +00:00
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
ab3f28f4c8 Fix: We have to be able to remove delegations as well 2018-03-12 04:50:07 +00:00
eaf4fdefac Security: You have to enter the password of the parent to delegate to this account 2018-03-11 13:12:15 +00:00
26a6846467 Bugfix: Old dba function was used 2018-03-11 12:19:41 +00:00
Hypolite Petovan
fa620022d5 Make feedtest module for logged users only 2018-03-10 18:53:20 -05:00
Hypolite Petovan
17e0d6b6c1 Add feedtest module 2018-03-10 12:43:34 -05:00
Hypolite Petovan
99b4ec147c Fix standards 2018-03-09 07:58:46 -05:00
Hypolite Petovan
71c1be8207 Add external template to mod/babel
- Add HTML methods diagnostic
2018-03-08 23:48:32 -05:00
Hypolite Petovan
789561c7a2 Remove/Update references to include/html2*.php 2018-03-07 16:34:17 -05:00
Hypolite Petovan
5e806ff598 Replace html2plain calls by HTML::toPlaintext 2018-03-07 16:29:44 -05:00
Hypolite Petovan
b5666bd27f Replace html2bbcode calls by HTML::toBBCode 2018-03-07 16:24:13 -05:00
23c2db2ebc Fix: In combination with "showmore" long posts aren't shrinked anymore every few seconds 2018-03-06 07:12:58 +00:00
Hypolite Petovan
bb7f459b47 Remove references to include/bb2diaspora.php 2018-03-04 17:43:41 -05:00
Hypolite Petovan
26ea6f69d7 Update references to bb2diaspora and diaspora2bb 2018-03-04 17:39:41 -05:00
8500bed8cc Corrected typo 2018-03-04 15:07:34 +07:00
Hypolite Petovan
716747cc77
Merge pull request #4541 from rabuzarus/20180303_-_fix_directory_search
fix page counter in directory module
2018-03-03 14:13:51 -05:00
rabuzarus
d572738e95 directory - use dba::select_first() 2018-03-03 20:08:41 +01:00
rabuzarus
e18f3844da fix page counter in directory module 2018-03-03 19:31:15 +01:00
8004a1bd93
Merge pull request #4538 from MrPetovan/bug/4535-user-not-found
Fix missing logical not in admin/users
2018-03-03 15:36:54 +01:00
Hypolite Petovan
9a13e67943 Fix missing logical not in admin/users 2018-03-03 09:34:48 -05:00
rabuzarus
c78572bf47 directory.php - code beautification (PSR) 2018-03-03 14:40:16 +01:00
rabuzarus
2efd4ba780 fix local directory search 2018-03-03 14:06:42 +01:00
Hypolite Petovan
a7db21c8fd Rename Core\Acl to Core\ACL 2018-03-02 18:41:24 -05:00
Hypolite Petovan
dca0fa3f1d Fix wrong variable type in mod/message 2018-03-02 18:40:09 -05:00
Hypolite Petovan
a6c785f693 Prettify mod/acl
- Replace obsolete x() and killme() calls
- Simplify ternary operators with defaults()
- Restore list alignment
- Extract variable initialization from else conditions
2018-03-02 18:40:09 -05:00
Hypolite Petovan
09c717d751 Remove references to include/acl_selectors 2018-03-02 18:40:09 -05:00
Hypolite Petovan
207eac4a16 Move navbar_complete to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
824262b824 Move populate_acl to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
2b35938e34 Move get_acl_permissions to Acl 2018-03-02 18:40:08 -05:00
Hypolite Petovan
113ea38d50 Move contact_select to Acl
- Simplify Acl::getMessageContactSelectHTML parameters
2018-03-02 18:40:08 -05:00
Hypolite Petovan
eef25a3259 Move contact_selector() 2018-03-02 18:40:08 -05:00
Hypolite Petovan
eeafb59c31 Add new class/functions
- Create class Core\Acl
- Add Contact::pruneUnavailable
- Add mod_content
2018-03-02 18:40:08 -05:00
Hypolite Petovan
9f21e7f34f Use default value for uid parameter in Contact::getIdForURL 2018-03-01 19:54:12 -05:00
Hypolite Petovan
e54a7e7834
Merge pull request #4523 from annando/invitation-code
"Invitation ID" is now "invitation code" to unify the description
2018-03-01 15:53:10 -05:00
12f3a5ffad "Invitation ID" is now "invitation code" to unify the description 2018-03-01 19:29:01 +00:00
ccfaf6eef3 Items on the network page should now be ordered always like expected 2018-02-28 20:21:31 +00:00
Michael Vogel
617ace38e4
Merge pull request #4515 from MrPetovan/task/4513-hide-attendno-events
Add attendance check to event reminder
2018-02-28 15:29:16 +01:00
60d00087f0 Don't do the restriction on thread starters when loading a single thread 2018-02-28 06:36:41 +00:00
Hypolite Petovan
f58d8f4108 Add attendance check to event reminder 2018-02-27 20:47:18 -05:00
02e969a73b Only update toplevel posts when ordered after posts 2018-02-27 23:25:29 +00:00
9cf342f02a Improved JS, updating single items now work 2018-02-27 22:37:11 +00:00