debfc4e356
Layout tweaks for landing page
2018-04-16 17:30:34 +02:00
541663ce0c
Skip nodes with no image in landing gallery
2018-04-16 16:36:03 +02:00
1fb044e7c1
Use macro for rendering secondary navigation
2018-04-16 16:24:00 +02:00
4769e2e904
New landing page for Hero project
2018-04-16 14:38:08 +02:00
cf99383b9c
Only load clipboard.min.js when authenticated
...
This is used in the attachments form, which is only available to
authenticated users.
2018-04-03 11:28:13 +02:00
8613ac7244
Merge branch 'master' into production
2018-04-03 11:10:01 +02:00
8c48a61114
Switched attachment rendering to shortcode system
...
Requires Pillar 3b452d14ce32e1a744fc526a922e1bb60b83ef25 or newer.
2018-04-03 11:02:33 +02:00
0259c5e0ec
Add clipboard.min.js to layout
...
This is needed for the copy button on file asset uploading. Rather than
including it on all pages that could feature the file uploader it's now
loaded globally.
2018-03-29 17:34:22 +02:00
a726fd1fbe
Remove time from logs; timestamp is added by Apache anyway.
2018-03-29 11:01:51 +02:00
df71738623
Nodes preview now uses typewatch and csrf_token
2018-03-28 23:38:09 +02:00
6a698daaa0
Remove time from logs; timestamp is added by Apache anyway.
2018-03-27 16:42:43 +02:00
7f538bdaee
Replace "Intel" with "Intel Software" logo
2018-03-27 12:12:26 +02:00
5f07c7ce17
Use new hashing of static file names.
...
Every time the docker image is rebuilt a random hash is chosen.
Requires Pillar d560f89704e3a6f4490df57712525048c469bed2 or newer.
2018-03-23 17:39:04 +01:00
5a42e2dcb8
Flip condition to unindent pretty much all the code
...
No semantic changes.
2018-03-23 17:24:36 +01:00
d5a54b7cf1
Formatting
2018-03-23 16:37:58 +01:00
7cb4b37ae2
Renamed some docker files to Dockerfile
...
This makes it simpler to manage by using the default name. It also helps
my editor to recognise the file and highlight it properly.
2018-03-23 12:42:56 +01:00
1fca473257
Moved Apache files into separate subdir
2018-03-23 12:12:39 +01:00
5a6035a494
Change hostname from blender-cloud → cloud.local in docker-compose.yml
2018-03-23 12:11:59 +01:00
98698be7eb
Add redirect for waking-the-forest project
...
Waking the Forest was originally part of the Art Gallery, but was
moved to its own dedicated workshop to increase visibility.
2018-03-19 11:17:45 +01:00
d4f072480c
Add convenience redirect from /hero to /p/hero
2018-03-14 14:35:27 +01:00
2d036ee657
Fix rsync of MongoDB backup to Swami
...
- Forcing IPv4 no longer necessary
- Directory on Swami is determined by rrsync parameters on Swami side
.ssh/authorized_keys file.
2018-03-09 14:02:39 +01:00
1bb762db6b
Document simplified deployment procedure
2018-03-07 15:44:13 +01:00
11743c54e2
Fixed quarterly pricing + all pricing layout tweak
2018-03-07 15:12:36 +01:00
29d1d02bfd
Prevent error when there are no Mongo backups to remove yet.
2018-02-22 10:01:59 +01:00
f7e5db2174
Copy files from work directory instead of $DOCKER_DEPLOYDIR
...
Those files aren't run from inside docker, so it's unnecessary to rebuild
the docker image when we want to deploy new versions.
2018-02-21 11:30:48 +01:00
2141aed06c
Added script to run on server for nightly MongoDB backups
...
Forced to use IPv4 due to IPv6 connectivity issues with Swami.
2018-02-21 11:30:48 +01:00
6b56df9e9c
Welcome page additions
...
New projects: Hero, Spring, and Minecraft Animation Workshop!
2018-02-20 18:56:18 +01:00
5a4519659a
Welcome page: typo in Quarterly
...
Thanks to Michael Glass @WebSmith for reporting!
2018-02-14 12:06:20 +01:00
c3ddc831aa
Stricter XSendFilePath in Apache config
2018-02-14 11:07:47 +01:00
1a63b51c48
Ignore files created by running celery-beat outside docker
2018-02-13 12:33:24 +01:00
484ac34c50
T53983: Explicitly version the picohttp docker image
2018-02-13 12:32:19 +01:00
908360eb1c
Scripts for easier deployment without leaving ./deploy/
...
You can choose between build-quick.sh (which only does 4_run/build.sh) and
build-all.sh (which does a full Docker image rebuild).
2018-02-13 11:46:29 +01:00
3bf1c3ea1b
About: introducing team profiles
...
CSS should be refactored, probably in the page itself.
2018-02-12 00:32:12 +01:00
fc58fbef5b
Resize and cleanup team profile pictures
2018-02-12 00:29:22 +01:00
9e961580d3
Fix bad URL to store
2018-02-06 10:59:23 +01:00
87cf5a9844
Revert "Add https://cloud*/ * as virtual host to haproxy config"
...
This reverts commit 3be926b9b3
2018-02-02 13:00:57 +01:00
5a3a7a3883
LetsEncrypt fixes
...
- Changed virtual host weight for the letsencrypt docker so that it is
higher than any other weight
- Copy the renewal script to the server (previously it was available
to the host at /data/git/blender-cloud/…, but no longer.
2018-02-02 12:39:07 +01:00
3be926b9b3
Add https://cloud*/ * as virtual host to haproxy config
...
This allows testing on https://cloud3/ for example, without having to
edit the docker-compose.yml file on the cloud3 server.
2018-02-02 12:20:39 +01:00
ff5af22771
Added missing hostname in README
2018-02-02 12:20:00 +01:00
6f73222dcd
Add the most-changing files as last step for faster Docker rebuilds.
2018-02-02 12:09:16 +01:00
1617a119db
No more branch check for subprojects
...
We only need the locations of those subprojects to get their Git URL, and
the state of the work directory doesn't matter.
2018-02-02 12:04:47 +01:00
bef402a6b0
Updated documentation for the new way to deploy Blender Cloud
2018-02-02 12:01:47 +01:00
94ef616593
Placing code + assets directly into Docker image
...
This radically changes the way we deploy to the production server, as a
Git checkout is no longer required there. All the necessary files are
now inside the docker image. As a result, /data/git should no longer be
mounted as a Docker volume.
- Renamed docker/build.sh → docker/full_rebuild.sh
This makes it clearer that it performs a full rebuild of the Docker images.
- Full rebuilds should be done on a regular basis to pull in Ubuntu
security updates.
- Removed rsync_ui.sh, we no longer need it. Other projects can also
remove their rsync_ui.sh.
- Moved deploy.sh → deploy/2docker.sh and added deploy/2server.sh
2018-02-02 12:01:17 +01:00
ffc4f271e8
Upgrade Docker base image to Ubuntu 17.10
2018-02-01 15:53:33 +01:00
917417a8d5
Email: send link to homepage via login endpoint
...
This way we avoid displaying the welcome page if they are not
logged in.
2018-01-26 17:14:57 +01:00
48fd9f401a
Email: tweaks to welcome message layout and content
...
According to the discussion after commit c2518e9ae1
2018-01-26 17:09:45 +01:00
7ba1c55609
Biling page: moved user classification logic from template → view code
...
This is the kind of stuff that's much easier expressed in Python than in
the template code.
API calls removed:
- fetching the user isn't necessary, since we have
pillar.auth.current_user anyway.
- a call for each group the user is member of, since we only used it to
check whether the user has demo access anyway.
2018-01-25 14:06:13 +01:00
33aa819040
Override Roles & Caps explanation with something more specific for Cloud
2018-01-25 14:06:13 +01:00
70f28074a0
Use Jinja2 inheritance to render user settings pages.
...
This requires Pillar e55d38261b36756a2850716a453c08c9ee6be9e2 or newer.
2018-01-25 14:06:13 +01:00
14d77da47a
store.blender.org → EXTERNAL_SUBSCRIPTIONS_MANAGEMENT_SERVER
...
I've only done this on the billing page, because there it's important
for debugging purposes to know which URL was actually checked to obtain
the subscription expiry information.
2018-01-25 14:06:13 +01:00
