1776 Commits

Author SHA1 Message Date
88939ba51d Cleaned up ElasticSearch CLI interface 2017-12-08 16:54:08 +01:00
c15fffa11f Allow importing pillar.api.search.index outside of app context 2017-12-08 16:07:10 +01:00
b77527e9a2 No '…'.format(…) in logging 2017-12-08 14:52:38 +01:00
3bdd5197f5 T53161 all py.test things PASSES 2017-12-08 14:47:04 +01:00
199c6b1f77 Auth: also support Bearer token authentication
This is commonly used in OAuth-authenticated calls, and can help us break
away from the username-is-auth-token stuff currently in use.
2017-12-08 14:46:58 +01:00
3ea2504e8c Log more information in Sentry 2017-12-08 14:46:01 +01:00
8eee0d57b6 Update token expiry in tests to be a bit more into the future. 2017-12-08 14:03:45 +01:00
8a400c5c0f Gracefully handle users with empty full_name 2017-12-08 14:03:30 +01:00
fccd3e306e T52710 pytests work 2017-12-08 14:00:30 +01:00
d467f000a7 Merge branch 'elastic' of git.blender.org:pillar into elastic 2017-12-08 13:13:02 +01:00
533544117b T52710 search on id works 2017-12-08 13:12:39 +01:00
3b21027d6f Added missing ElasticSearch requirements 2017-12-08 13:01:46 +01:00
b7773e69c7 Merge branch 'master' into elastic 2017-12-08 12:55:57 +01:00
821f11393c Link to 'edit profile' page on Blender ID directly 2017-12-08 10:42:43 +01:00
ca25078b30 Removed editing of full name from Cloud profile
We take the full name from Blender ID instead.
2017-12-07 17:31:26 +01:00
785145e1c1 Nicer message when username already exists 2017-12-07 17:31:07 +01:00
e1646adff6 More modern use of super() 2017-12-07 17:30:10 +01:00
d20f3d5668 Removed manual bad JSON-encoding 2017-12-07 17:29:49 +01:00
dfc224d8a9 Added capability 'encode-video' and role 'video-encoder'.
Both 'video-encoder' and 'admin' roles get 'encode-video' capability,
which allows users to upload video that gets encoded & displayed as a
video. For users without this capability videos are handled as regular
downloads.
2017-12-07 16:51:16 +01:00
5c7f37a100 Lowered dependency versions to satisfy Eve 2017-12-07 13:02:23 +01:00
fc25ca9c03 Replaced Bugsnag with Sentry - requires config changes!
Note that pillar/bugsnag_extra.py still exists; I'm keeping it around for
a while until we know what info we miss in Sentry, can port it, and then
remove/refactor it.
2017-12-07 12:58:21 +01:00
6c4dd8ae02 Fix T53339: Downgraded Werkzeug 0.12.2 → 0.11.15 2017-12-07 12:44:05 +01:00
9fdcfff4fc Direct users to renewal page on Store instead of /join
/join should only be used when someone can actually buy a new subscription.
/renew should be used when someone already has a subscription that needs
to be renewed.

Since url_for('cloud.xxxx') makes no sense in Pillar, I just hard-coded
/renew instead.
2017-12-06 14:39:30 +01:00
2bcc26860f Removed 'subscriber' cap from 'admin' role
This allows admins to test what happens when users do not have a
subscription. To give the user subscriber capability, just grant demo role
as well.
2017-12-06 12:09:21 +01:00
1e012f860b Registered org-subscriber role so that it shows in the admin 2017-12-06 11:58:21 +01:00
87fe1887e8 Added "Update from Blender ID" button
Added this button in the /u/ user/embed view, so that admins can easily force a re-check from Blender ID without requiring the user themselves to perform any actions.
2017-12-05 11:45:42 +01:00
c8221ea0e4 Simplified javascript in users/edit_embed_base.pug
There is no need to use JQuery, a unique ID for the a-element, and an
invalid href value, just to bind on-click functionality to a link.
2017-12-05 11:44:05 +01:00
517b283893 Accept roles from Blender ID in two formats
This supports {'role_name': bool} dicts (the old format) and any iterable
of strings {'role_name', ...}
2017-12-01 18:10:33 +01:00
b6a93452cd search is completely working in frontend now 2017-12-01 16:36:08 +01:00
1cba014948 search is completely working in frontend now 2017-12-01 16:32:57 +01:00
b0d6f724ef Merge branch 'master' of git.blender.org:pillar into elastic 2017-12-01 16:24:56 +01:00
0b218eb656 Use Blender ID to obtain subscription status.
Instead of performing a call to the Blender Store, call to Blender ID to
get the user's subscription status.

Currently this is performed as a second HTTP call after logging in; in the
future we may want to include the roles in the login response from Blender
ID, so that we can do this in one call instead of two.
2017-11-30 15:28:35 +01:00
8ba4cc5c0c Allow extension of users/edit_embed.pug
This is done by moving users/edit_embed.pug to users/edit_embed_base.pug,
and having a new users/edit_embed.pug extend that. Projects like Blender
Cloud can then provide their own users/edit_embed.pug and override certain
blocks.
2017-11-29 13:58:47 +01:00
2ad65b0485 Project: Remove collapse of sidebar
Since projects went full-width it's not needed anymore.
2017-11-28 15:36:31 +01:00
ce7754ffe4 Renaming IDs to classes 2017-11-24 19:34:58 +01:00
9cd3d97c75 T53161 javascript search stuff almost complete. 2017-11-24 17:47:38 +01:00
7252055e4a Markdown: Convert Markdown via Jinja filter in the template
This gets rid of the use of javascript for converting node/post description.
Now we only use markdown.js for real time as-we-type stuff, like node/post
editing or commenting.
2017-11-23 16:49:19 +01:00
c086cff36e Comments: Only load JS for post/edit comments if we can actually comment 2017-11-23 16:40:58 +01:00
eeba87d333 Blog: Unify the looks of blog posts
Now that the render_blog_post macro is shared with the homepage
2017-11-23 16:20:29 +01:00
cb7a23bc69 Fixed home project menu 2017-11-21 14:48:59 +01:00
1bda98228c T53161 simpification tips from sybren. 2017-11-17 18:04:29 +01:00
8b789d408e T53161 project user search now also elastic 2017-11-17 17:41:43 +01:00
d355e58f2f Merge branch 'elastic' of git.blender.org:pillar into elastic 2017-11-17 16:09:23 +01:00
b03e8d5bd7 T53161 Proof of Concept working USER search. WIP js. 2017-11-17 16:06:51 +01:00
76bb68dcc8 T53161 Proof of Concept working 2017-11-17 16:06:51 +01:00
41eb5e256f T53161 WIP javascript search WIP WIP 2017-11-17 16:06:51 +01:00
d2a8f2a47f T53161 elasticsearch can index nodes now. cli command. NOTE config changes!! 2017-11-17 16:06:51 +01:00
43fa8f1a45 T53161 WIP create elasticsearch app / doc / stuff 2017-11-17 16:06:01 +01:00
fcf19de786 T53161 proces feedback sybren, replace angolia with search 2017-11-17 16:06:01 +01:00
2233d015f3 T53161 start working on elastic.. 2017-11-17 16:06:01 +01:00