Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
MetaGer
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
open-source
MetaGer
Commits
056efb8b
Commit
056efb8b
authored
6 years ago
by
Dominik Hebeler
Browse files
Options
Downloads
Plain Diff
Merge branch '808-quicktip-server-versionsnummern-anpassen' into 'development'
Resolve "Quicktip Server Versionsnummern anpassen" Closes
#808
See merge request
!1320
parents
eea6f6ac
855fefff
No related branches found
Branches containing commit
No related tags found
1 merge request
!1320
Resolve "Quicktip Server Versionsnummern anpassen"
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/Http/Controllers/MetaGerSearch.php
+2
-3
2 additions, 3 deletions
app/Http/Controllers/MetaGerSearch.php
app/Models/Quicktips/Quicktips.php
+0
-1
0 additions, 1 deletion
app/Models/Quicktips/Quicktips.php
with
2 additions
and
4 deletions
app/Http/Controllers/MetaGerSearch.php
+
2
−
3
View file @
056efb8b
...
...
@@ -6,8 +6,7 @@ use App;
use
App\MetaGer
;
use
Illuminate\Http\Request
;
const
TIP_SERVER
=
'https://quicktips.metager3.de/tips.xml'
;
#const TIP_SERVER = 'http://localhost:63825/tips.xml';
const
TIP_SERVER
=
'http://localhost:63825/tips.xml'
;
class
MetaGerSearch
extends
Controller
{
...
...
@@ -77,7 +76,7 @@ class MetaGerSearch extends Controller
public
function
tips
(
Request
$request
)
{
$tips_text
=
file_get_contents
(
TIP_SERVER
);
$tips
=
[];
$tips
=
[];
try
{
$tips_xml
=
simplexml_load_string
(
$tips_text
);
...
...
This diff is collapsed.
Click to expand it.
app/Models/Quicktips/Quicktips.php
+
0
−
1
View file @
056efb8b
...
...
@@ -12,7 +12,6 @@ class Quicktips
{
use
DispatchesJobs
;
//const QUICKTIP_URL = "https://quicktips.metager3.de/quicktips.xml";
const
QUICKTIP_URL
=
"http://localhost:63825/quicktips.xml"
;
const
QUICKTIP_NAME
=
"quicktips"
;
const
CACHE_DURATION
=
60
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment