Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
atmospheric-portal
Manage
Activity
Members
Plan
Jira
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
EIP
atmospheric-portal
Commits
c9ad3211
Commit
c9ad3211
authored
8 years ago
by
Jonathan Cooper
Browse files
Options
Downloads
Plain Diff
Merge branch 'develop' of gitlab.ceh.ac.uk:eip/atmospheric-portal into develop
Merged
parents
991414b9
9875808c
Branches
develop
Tags
1.0.2
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/scripts/models/TimeSeries.coffee
+1
-1
1 addition, 1 deletion
src/scripts/models/TimeSeries.coffee
vhost.conf
+1
-1
1 addition, 1 deletion
vhost.conf
with
2 additions
and
2 deletions
src/scripts/models/TimeSeries.coffee
+
1
−
1
View file @
c9ad3211
...
...
@@ -6,7 +6,7 @@ define [
defaults
:
data
:
[]
urlRoot
:
'/api/sitedata/'
urlRoot
:
'/
apps/atmospheric/
api/sitedata/'
fetchLoc
:
->
@
fetch
data
:
@
collection
.
app
.
get
'gridcell'
...
...
This diff is collapsed.
Click to expand it.
vhost.conf
+
1
−
1
View file @
c9ad3211
...
...
@@ -29,7 +29,7 @@
### Python config
WSGIDaemonProcess
api
user
=
www
-
data
group
=
www
-
data
processes
=
1
threads
=
5
WSGIScriptAlias
/
api
/
var
/
www
/
api
/
api
.
wsgi
WSGIScriptAlias
/
apps
/
atmospheric
/
api
/
var
/
www
/
api
/
api
.
wsgi
<
Directory
/
var
/
www
/
api
>
WSGIProcessGroup
api
...
...
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