be62a38cd5
Merge branch 'production'
2017-12-12 10:22:14 +01:00
501fb76c7e
Revert "Revert "Removed flamenco-user and attract-user role linking to subscriber/demo/admin""
...
This reverts commit d46b5d645b
2017-12-12 10:22:07 +01:00
d46b5d645b
Revert "Removed flamenco-user and attract-user role linking to subscriber/demo/admin"
...
Temporarily reverting due to an issue with missing roles and permissions.
This reverts commit c031c1e8ae
2017-12-08 17:42:35 +01:00
5efca08c13
Docker Apache: added svnman XSendFilePath
2017-12-08 17:06:56 +01:00
abb0ded3f2
Lowered log level for webhook call for unknown user
2017-12-08 14:08:04 +01:00
f948969b20
Fixed webhook so that users' full_name isn't reset to the empty string.
2017-12-08 14:04:11 +01:00
1ae090789b
Deploy: added PermitLocalCommand=no to SSH command
...
I'm using a LocalCommand invocation to change the terminal colours when
I SSH into a production server; this shouldn't be done by the deploy
script.
2017-12-08 10:12:55 +01:00
c031c1e8ae
Removed flamenco-user and attract-user role linking to subscriber/demo/admin
...
It was a hack due to the lack of a capabilities system.
2017-12-07 17:09:06 +01:00
00805c3372
Upgraded Python to 3.6.3
2017-12-07 14:02:35 +01:00
035382d1e5
docker: allow running 1_base/build.sh with --no-cache
...
This rebuilds the image from scratch, also pulling in security updates.
2017-12-07 14:02:20 +01:00
7dcc0d5ead
Size-based Apache log rotation
2017-12-07 10:21:55 +01:00
bff51e1e83
Added /renew endpoint to redirect to Blender Store renewal URL.
2017-12-06 14:36:02 +01:00
561db0428d
Using new blender_id.get_user_blenderid() function
2017-12-05 11:56:33 +01:00
f7ce8d74a7
Implemented Blender ID webhook for user change notifications
...
Handles changes in:
- roles
- full name
- email address
2017-12-01 19:06:16 +01:00
532bf60041
Obtain subscription info from Store.
...
This was in Pillar, and is now moved to Blender Cloud. It's used to obtain
the subscription expiration date from Blender Store.
2017-11-30 15:45:40 +01:00
d5d189de8c
Reworked subscription reconciliation to use Blender ID instead of Store
2017-11-30 15:30:41 +01:00
5d281dc6ce
Introduce 'has_subscription' role with 'can-renew-subscription' capability
...
This is in preparation of presenting different messages to users, when their
subscription should be renewed, or when they should buy a (new)
subscription.
2017-11-30 15:30:08 +01:00
efc18c5628
Open "this user on" links in new tab
2017-11-29 14:09:13 +01:00
127e422775
Updated Blender ID link to the new Blender ID
2017-11-29 14:05:39 +01:00
59f4edf192
Moved 'This user on Blender Store/ID' links from Pillar to Blender Cloud
2017-11-29 13:59:12 +01:00
5ea47b6f8f
Fix navbar-toggle not visible on mobile
2017-11-28 16:06:11 +01:00
e27d8a3f08
Welcome: Replace all store URLs with variable
...
Also link Hjalti's video to actual video asset
2017-11-28 15:10:40 +01:00
c6407b4f7a
Welcome page: Fix links to the store
...
And make some titles links as well
2017-11-28 14:44:54 +01:00
71bdff82b3
Home: In Production section for ongoing projects
2017-11-27 10:39:34 +01:00
98f695c54b
Home: In Production section for ongoing projects
2017-11-24 19:36:43 +01:00
30fe3e1360
Welcome page: Explore should go to cloud.blender.org when logged in
...
Pointed out by Dr. Sybren
2017-11-24 16:47:32 +01:00
fd6c9ec02d
Welcome page: Update prices
2017-11-23 18:31:57 +01:00
62dcd93584
Only load markdown.min.js if current_user has subscriber capabilities
...
Since commenting or node editing is the only place we use js markdown now.
2017-11-23 16:51:31 +01:00
8fc9529752
Homepage: Re-use render_blog_post macro to display posts
...
No need to have custom code when we have a nice little macro for it
2017-11-23 16:17:38 +01:00
f4e277f1d1
Homepage: Render attachments on posts
2017-11-23 16:16:10 +01:00
22f5ea7b62
Fixed creation of image sharing group node
2017-11-21 15:16:38 +01:00
1dd3fd3623
Simplified code a bit
2017-11-21 15:16:22 +01:00
48dc3837b5
cloud_share_img.py: stop using my personal hardcoded IDs
2017-11-21 15:09:13 +01:00
c34ffb66db
Added CLI script to share images to the Cloud.
...
Assumes that you are logged in on Blender ID with the Blender ID Add-on.
Haven't tested what happens when you've never shared any images yet.
2017-11-21 15:00:23 +01:00
59d165b6d0
Subscription refresh: refresh the page on a 403
...
A 403 indicates the session isn't valid any more, and a window reload will
fix that (either by automatically logging in via Blender ID or by
providing a login prompt).
2017-11-17 12:13:25 +01:00
9dfe75ed1e
Include pillar-svnman in docker image
2017-11-14 16:28:52 +01:00
494f307900
Fixed deploy script for SVNMan
2017-11-14 16:25:03 +01:00
59dd3352cd
Added svnman to deploy.sh
2017-11-14 16:13:03 +01:00
4207d051a9
Added subscriber-pro role.
...
This is used in svnman to bind to the svn-use capability.
2017-11-14 16:09:29 +01:00
f1d990c03d
Added SVNMan extension
2017-11-14 16:09:29 +01:00
08f56877ca
Homepage: Small cleanup of classes and more space between posts
...
Also fix selectors for comments/assets
2017-11-10 17:35:19 +01:00
0c4db84940
Fix link to comments
2017-11-09 19:38:56 +01:00
5be0f3baf0
Update cache for CSS/JS
2017-11-09 18:59:44 +01:00
8288b4eab1
New Homepage: Featuring more in the blog posts
2017-11-09 18:37:32 +01:00
a34f3435c1
gitignore: ignore cloud/static/assets/css
2017-11-09 17:15:26 +01:00
ba9a2eb134
gitignore: absolute path for cloud/templates
2017-11-09 17:15:16 +01:00
73a0de3157
Merge branch 'master' of git.blender.org:blender-cloud
2017-11-08 16:25:12 +01:00
bcab6ac5b7
Stats files are no longer needed
2017-11-08 16:24:58 +01:00
c2492e8710
When logging in from /welcome, redirect to index
...
Backend logic simplified, to support the next arg if provided, otherwise simply redirect to the request.referrer (last visited page).
2017-11-07 18:25:42 +01:00
08b388f363
Display Log in on button only if current_user.is_anonymous
2017-11-07 18:25:42 +01:00
