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
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
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
298aae5ddf
Merge remote-tracking branch 'upstream/develop' into develop
2018-04-28 08:57:52 +00:00
24da379c06
update PL translations THX waldis
2018-04-28 10:08:52 +02:00
2c2d4e5869
Merge pull request #4941 from MrPetovan/task/4938-update-dir-url-protocol
...
Update directory URL protocol
2018-04-28 09:42:06 +02:00
02c046e630
Merge pull request #4944 from astifter/fix_better_curl_error_during_install
...
Fix #4943 .
2018-04-28 08:58:45 +02:00
Andreas Neustifter
91e0a9227e
Fix #4943 .
...
PR #4939 introduced a bug that only surfaces when using Network from extern.
Use proper self reference to fix that.
2018-04-28 06:46:46 +00:00
Hypolite Petovan
bd21fc3751
Import posts from ignored contacts
2018-04-27 21:08:19 -04:00
Hypolite Petovan
5bb35756dc
Update directory URL protocol
2018-04-27 20:56:34 -04: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
Hypolite Petovan
e2612514e8
Merge pull request #4940 from astifter/fix_login_when_openid_disabled
...
frio: Fix login page layout without OpenId.
2018-04-27 16:49:38 -04:00
Andreas Neustifter
9bf58e46f6
Changes requested by @MrPetovan .
2018-04-27 20:22:17 +00:00
Andreas Neustifter
babb45efd8
Fix login page layout without OpenId.
...
When OpenId is disabled and the input therefore is missing from the login the page looks
weird. Fix that.
2018-04-27 20:00:46 +00:00
Andreas Neustifter
5b4dce5983
Exclude editor backups from Git.
2018-04-27 21:28:22 +02: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
d5b68cd146
Add a App-Mode with defined constants
...
- Normal Mode = 0
- Install Mode = 1
- Maintenance Mode = 2
Moved Install-Mode check to class `App`
Replaced all maintenance and install checks with $a->mode checks
2018-04-27 21:07:04 +02:00
Hypolite Petovan
8a7c9d6666
Merge pull request #4937 from astifter/install_theme_when_set
...
Install selected theme during settings persistence.
2018-04-27 14:59:52 -04: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
a19784d209
Merge pull request #4890 from astifter/reorganize_login
...
Reorganize Login to Fix #4878
2018-04-27 19:56:25 +02:00
rabuzarus
e2b4690d6f
Merge pull request #4930 from MrPetovan/task/improve-frio-bg-image
...
[frio] Improve background image settings
2018-04-27 19:55:47 +02:00
