fa78f148c8
AutomaticInstallation - use config file
...
- added new parameter "-f config file" to `AutomaticInstallation.php`
2018-05-01 13:11:25 +02:00
1935a8150d
Merge pull request #4964 from annando/delivery-foo
...
Fixed private messaging/relaying is controlled by the parent
2018-05-01 11:30:31 +02:00
1e0200884f
Fixed private messaging/relaying is controlled by the parent
2018-05-01 06:37:12 +00:00
Andreas Neustifter
59b57459c6
Fix layout issue introduced with PR #4873 .
...
The find button in the find-people widget was badly layouted on Firefox under Debian.
Remove the width constraint and float: left so the button gracely drops to the next
line when necessary.
2018-04-30 21:22:59 +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
b72bc0735f
Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
2018-04-30 16:52:44 +00:00
a182dd3400
Improved logging, avoiding PHP warning
2018-04-30 16:46:49 +00:00
1a8d0a573e
Bugfix: Contact wasn't added on probing
2018-04-30 16:45:00 +00:00
Hypolite Petovan
2975d1a0be
Merge pull request #4959 from koyuawsmbrtn/develop
...
Added dark scheme to frio
2018-04-30 10:30:01 -04:00
Koyu Berteon
90b24251d2
Renamed files as requested
2018-04-30 15:38:46 +02:00
Koyu Berteon
125c3e7cab
Corrected time
2018-04-30 15:34:23 +02:00
Koyu Berteon
01bd3a3a7b
Fixed identation in dark.php
2018-04-30 15:27:40 +02:00
Koyu Berteon
72cab9bb93
Added dark scheme to frio
2018-04-30 15:25:31 +02:00
Hypolite Petovan
c1fe35523c
Merge pull request #4958 from rabuzarus/20180425_-_fix_help_aside
...
The add widget class to the left aside for /help
2018-04-30 09:20:43 -04:00
4909075321
Merge branch 'direct-dfrn' of github.com:annando/friendica into direct-dfrn
2018-04-30 13:09:11 +00:00
5588f0d2ae
Improved logging
2018-04-30 13:08:48 +00:00
b2b597288c
Deliver with the new function when delivering to a "uid=0" contact
2018-04-30 13:07:40 +00:00
rabuzarus
0c0b715c63
Merge develop into 20180425_-_fix_help_aside
2018-04-30 14:56:25 +02:00
74aa3499b0
Additional logging
2018-04-30 12:41:56 +00:00
Hypolite Petovan
262665a176
Merge pull request #4955 from tobiasd/20180430-fi
...
update FI translations THX Kris
2018-04-30 06:51:52 -04:00
839fd9f17e
update FI translations THX Kris
2018-04-30 08:34:47 +02:00
bbbebb2b9c
Don't spool relay deliveries
2018-04-30 05:56:40 +00:00
d0dd5c44d9
Update or create relay contact from discovery / process new protocol values
2018-04-30 05:33:47 +00:00
aa4945f4a0
"x-social-relay" now exposes all supported protocols
2018-04-30 04:01:04 +00:00
Hypolite Petovan
493314a067
Merge pull request #4920 from nupplaphil/install_mode
...
Add Application Mode (Install, Maintenance, Normal)
2018-04-29 14:31:13 -04:00
b4f5311e7f
Add Install Mode
...
- merge `friendica/develop` to `nupplaphil/install_mode`
2018-04-29 20:15:12 +02:00
Michael Vogel
bd0ba24518
Merge pull request #4951 from MrPetovan/bug/4946-move-current-theme-to-app
...
Move current_theme() to App
2018-04-29 19:11:49 +02:00
2c1b1841bb
Merge pull request #4954 from annando/hide-contacts
...
Fix PR 4942: Fixed item query
2018-04-29 18:40:01 +02:00
78f563407a
Fix PR 4942: Fixed item query
2018-04-29 16:32:46 +00:00
da9ac7b879
Add Install Mode
...
- increased code quality
2018-04-29 18:13:24 +02:00
6cb277b0bb
Add Install Mode
...
- added PHP docBlock to methods
- increased code quality
2018-04-29 18:11:24 +02:00
Hypolite Petovan
cc2703ce8d
Merge pull request #4953 from tobiasd/20180429-msg
...
regenerated master messages.po file
2018-04-29 07:05:02 -04:00
52cc67e767
regenerated master messages.po file
2018-04-29 07:19:20 +02:00
cb364f440f
Merge pull request #4952 from MrPetovan/bug/4947-fix-content-filter-self
...
Fix own post check for content filter
2018-04-29 06:41:55 +02:00
Hypolite Petovan
baf235e200
Merge pull request #4948 from annando/hash-ignored
...
Corrected query to don't show hash tag posts from blocked or ignored contacts
2018-04-28 20:37:47 -04:00
Hypolite Petovan
20289393da
Fix own post check for content filter
2018-04-28 19:11:11 -04:00
Hypolite Petovan
220242b55a
Remove current_theme() and current_theme_url() functions
2018-04-28 18:37:41 -04:00
Hypolite Petovan
fde3d6f870
Replace current_theme() and current_theme_url() calls
2018-04-28 18:37:25 -04:00
Hypolite Petovan
3213715b60
Fix formatting in frio_boot.php
2018-04-28 18:36:32 -04:00
Hypolite Petovan
964bf3f3cc
Add new methods to src
...
- Add App::getCurrentTheme()
- Add App::getCurrentThemeStylesheetPath()
- Add Theme::getStylesheetPath()
2018-04-28 18:30:13 -04:00
Hypolite Petovan
acbc733dce
Fix formatting in Core\Theme
2018-04-28 18:28:23 -04:00
Michael Vogel
833fe0e0dc
Merge pull request #4942 from MrPetovan/task/import-post-ignored-contact
...
Import posts from ignored contacts
2018-04-28 18:16:30 +02:00
fd318a1193
Corrected query to don't show hash tag posts from blocked or ignored contacts
2018-04-28 16:12:45 +00:00
Hypolite Petovan
9edff6cc5c
Add exception for self-contact in item_joins()
2018-04-28 11:38:01 -04:00
8815d07765
Add Install Mode
...
- fixed mistake
2018-04-28 17:06:08 +02:00
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
Hypolite Petovan
c417f779c4
Add missing readonly check for displaying items in item_joins
2018-04-28 07:47:02 -04: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
Michael Vogel
5dc47e5815
Merge pull request #4945 from tobiasd/20180428-pl
...
update PL translations THX waldis
2018-04-28 11:03:28 +02:00
