Commit Graph

381 Commits

Author SHA1 Message Date
4da7a84c86 Fix for broken urls in blog list
This actually undoes commits 90c62664a6 and 18fe240b93 and simply adds the node.url property when rendering a post in the posts_view function. This is what the template macro actually expected in the first place.
2018-01-18 16:02:29 +01:00
90c62664a6 Fix for broken url in blog post title and meta 2018-01-18 12:30:06 +01:00
18fe240b93 Fix for broken url in blog post header image 2018-01-18 11:37:55 +01:00
bdff391440 Support for rendering of video file attachments 2018-01-17 15:55:25 +01:00
61673ef273 Search: implemented pagination
- Got rid of the nasty off-by-one logic in the JavaScript.
- Implemented pagination at the API.
2018-01-10 17:07:21 +01:00
36aad45b26 Asset search JS: show creation timestamps 2018-01-05 17:23:40 +01:00
72c01cc743 Admin user search actually uses the right end-point 2018-01-05 15:51:41 +01:00
11b5be9d8e Fixed missing video.js errors in asset search page 2018-01-05 15:23:54 +01:00
d240a979ba scrollToLinkedComment: Check for valid ObjectID before passing to jQuery 2018-01-05 15:08:00 +01:00
04684c5f65 remove algolia from css and vendor stuff 2017-12-29 14:19:22 +01:00
d726e15ed8 Merge branch 'master' of git.blender.org:pillar into elastic 2017-12-29 12:19:47 +01:00
8f73dab36e Allow project undeletion, fixes T51244
Projects can be undeleted within a month of deletion.
2017-12-22 16:27:05 +01:00
a7693aa78d Switch from macros to blocks for navigation menus
This affects the user and notifications menus. It happens for two reasons:
- the only argument passed to the macros was current_user, which is always available
- we want to enable overriding and adding items to the menus via extensions

At the moment only the user menu takes advantage of the base template, since the blender-cloud extension makes use of it, while notifications.pug does not need it yet.
2017-12-13 11:08:33 +01:00
6d37046933 Fixed "leave shared project" javascript
Now the project is actually removed from the page. This isn't optimal; see
T53546 for a followup.
2017-12-12 11:48:48 +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
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
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
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
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
0cea8d622d Update cache for CSS/JS 2017-11-09 19:00:01 +01:00
15d2f1ce18 Added links to Blender Store and ID on /u/ user page. 2017-11-09 16:56:34 +01:00
ac9aa59924 Comments: When editing, resize the textarea
Minor tweaks:
* Remove the 'editing' class after cancel/save
* Style <code>, <pre>, etc tags
2017-11-08 22:49:56 +01:00
cb0272fe60 Comments: Put comment content inside a span
So when editing we do not override the author's name.
2017-11-08 22:01:45 +01:00
e01f915abf Comments: Unbind event before binding
Prevents flashing of comments when posting
2017-11-08 20:29:45 +01:00
4f282c1587 Bit more space + scrolling for users at /u/ 2017-11-08 15:45:41 +01:00
5d6e0af605 Comments: Auto-resize textarea field as we type 2017-11-04 01:59:02 +01:00
04f7869e8e Comments: Display actual date on mouse over (not pretty_date) 2017-11-02 15:38:37 +01:00
53aabc8c84 Translations: Mark more strings for translation 2017-10-27 00:54:05 +02:00
3585443508 Use cache or jstree css 2017-10-25 17:27:55 +02:00
a6ab7dda97 Title for loop button on videoplayer 2017-10-25 16:17:08 +02:00
6564fa000d Titles for node details 2017-10-25 16:16:58 +02:00
5fbe62105a Blog: Minor layout tweaks
* Make header image clickable
* Make thumbnails on blog list clickable
* Put action buttons in .blog-action for easier positioning
* Cleanup
2017-10-25 16:02:02 +02:00
771b93b169 Blog: Don't display author name on sidebar 2017-10-25 16:02:02 +02:00
f13310d71b Menu: "Log in" instead of "Login and Explore" 2017-10-25 16:02:02 +02:00
e983d0756d Rename 'Log in' button to 'Log in and Explore' 2017-10-24 15:46:16 +02:00
ed55a73d04 VideoJS: Upgrade and stuff
* Upgrade to the latest stable version 6.2.8
* Move JS files to blender-cloud
* Introducing Hotkeys support (a'la YouTube)
* Introducing Loop button (and a way to easily add new buttons)
* Fix Analytics plugin to work with the VideoJS 6
* Minor style tweaks to work with the latest update
2017-10-24 12:49:39 +02:00
4f3fc91c0a VideoJS: Upgrade and stuff
* Upgrade to the latest stable version 6.2.8
* Move JS files to blender-cloud
* Introducing Hotkeys support (a'la YouTube)
* Introducing Loop button (and a way to easily add new buttons)
* Minor style tweaks to work with the latest update
2017-10-24 12:38:11 +02:00
6ffbd52a36 Comments: Simpler login message
No point in having a disabled input, since we're leaving
the page to login anyway
2017-10-15 05:56:43 +02:00
6d8870ba25 Blog: Check if blog_archive_prev/next exist before showing link
Also minor cleanup of the classes and excessive indenting.
2017-10-05 17:32:55 +02:00