aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/templates
Commit message (Collapse)AuthorAgeFilesLines
* Put buttons for blog create and blog dashboard on view using template_hooks ↵Aditi Mittal2013-09-071-8/+1
| | | | for blog plugin not to be interfering with original code.
* Insert URL to blog in a user's profile page by spaetzAditi Mittal2013-09-071-0/+1
|
* Add blog dashboard button.Aditi Mittal2013-09-051-1/+5
|
* Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblinAditi Mittal2013-08-312-2/+2
|\
| * pdf media_type now have their own config_spec.iniRodney Ewing2013-08-291-1/+1
| |
| * video media_type now have their own config_spec.iniRodney Ewing2013-08-291-1/+1
| |
* | Pull changes and resolve merge conflict.Aditi2013-08-283-9/+57
|\|
| * Fixing another typo, thanks to Laura Arjona (again!)Christopher Allan Webber2013-08-261-1/+1
| |
| * Merge remote-tracking branch 'refs/remotes/rodney757/email'Christopher Allan Webber2013-08-252-8/+56
| |\
| | * move links to the bottom of the page until we have a tabbed UIRodney Ewing2013-08-201-13/+11
| | |
| | * maybe have change password and email on same pageRodney Ewing2013-08-202-0/+50
| | |
* | | Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblinAditi2013-08-253-6/+13
|\| |
| * | Merge remote-tracking branch 'refs/remotes/rodney757/notifications'Christopher Allan Webber2013-08-212-0/+7
| |\ \
| | * | use urlgen and store it in a variableRodney Ewing2013-08-201-0/+3
| | | |
| | * | add the ability to mark all notifications read.Rodney Ewing2013-08-201-0/+4
| | |/
| * | Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing'Christopher Allan Webber2013-08-211-3/+3
| |\ \ | | |/ | |/| | | | | | | | | | Conflicts: mediagoblin/processing/task.py mediagoblin/submit/lib.py
| | * rename webm_640 to webm_video since it might be a different resolutionRodney Ewing2013-08-201-3/+3
| | |
| * | use href='javascript:;' instead of href='#notifications', etcRodney Ewing2013-08-201-3/+3
| |/
* | Resolve merge conflict and merge.Aditi2013-08-227-14/+131
|\|
| * load js at the end of the pageRodney Ewing2013-08-162-2/+2
| |
| * Merge branch 'persona_resquash'Christopher Allan Webber2013-08-152-6/+35
| |\
| | * made it so that the create account button works with only persona enabledRodney Ewing2013-07-031-1/+1
| | |
| | * moved persona template stuff to use template_hooksRodney Ewing2013-07-034-27/+2
| | |
| | * merge --squash persona branch to take care of a false merge commit inRodney Ewing2013-07-035-6/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the basic_auth branch that persona is forked from Conflicts: mediagoblin/templates/mediagoblin/auth/login.html mediagoblin/templates/mediagoblin/auth/register.html mediagoblin/templates/mediagoblin/edit/edit_account.html These are commit messages from the squashed persona stuff: - added tests and fixed minor errors - fixed a redirect loop when only persona is enabled and accessing /auth/login - moved persona.js to plugin's static dir - fixes for add/remove persona emails - add and remove personas - working with multiple plugins - working version - switched to hidden form instead of ajax - beginings
| * | Merge remote-tracking branch 'refs/remotes/tsyesika/master'Christopher Allan Webber2013-08-152-0/+89
| |\ \ | | | | | | | | | | | | New oauth tools! Heck yeah!
| | * \ Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblinxray72242013-07-144-32/+42
| | |\ \
| | * | | Adds more support for oauth - access_token & decorators still to doxray72242013-07-112-0/+89
| | | |/ | | |/|
| * | | Avoiding the celery warnings that we seem to be confusing people lately.Christopher Allan Webber2013-08-143-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | Basically, it's shuffling around the notifications stuff. This commit sponsored by Günter Kraft. Thank you!
| * | | change dropdown button to <a> from <div> so that it is tabbableRodney Ewing2013-08-091-2/+2
| | | |
* | | | Change path for tinymce.Aditi2013-08-101-1/+1
| | | |
* | | | Change button names to Save and Blog.Aditi2013-08-101-1/+1
| | | |
* | | | Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblinAditi2013-08-092-3/+7
|\| | |
| * | | Switching the MediaGoblin homepage image over to using the "official" ↵Christopher Allan Webber2013-08-081-2/+2
| | | | | | | | | | | | | | | | gavroche style
| * | | Add ?next= when trying to add a comment when not logged inRodney Ewing2013-08-081-1/+2
| | | |
| * | | Changed how the comment was encoded/read.Emily O'Leary2013-08-071-0/+1
| | | | | | | | | | | | | | | | | | | | Fixed CSRF + Post with comment preview. Merged with latest master
| * | | Added comment preview functionality to user pages. It works by passing the ↵Emily O'Leary2013-08-071-0/+2
| | |/ | |/| | | | | | | | | | | | | comment's value as a JSON string to a new handler that lives at /ajax/comment/preview. The query string is decoded, unquoted, and has its leading and trailing quotes removed to match the input that cleaned_markdown_conversion expects. It does this in real time with a 500ms lag by using a timer. Initially I tried the onChange handler but you need to lose focus for that to process. The javascript timer is only invoked if the add comment button is pressed. A request is only sent if the comment box is not empty and the current value is not the same as the last value.
* | | Replace edit blogpost url from default media_edit url to blogpost edit url.Aditi2013-08-091-3/+3
| | |
* | | Move templates to blog plugin from all mediagoblin/templates.Aditi2013-08-075-280/+0
| | |
* | | show all blogposts.Aditi2013-08-072-6/+5
| | |
* | | Specify the status of blog post.Aditi2013-08-071-2/+14
| | |
* | | Write template for draft view of a blog post.Aditi2013-08-071-0/+42
| | |
* | | Display date of creation of the blog post.Aditi2013-08-071-1/+17
| | |
* | | button to start with blogging.Aditi2013-08-061-0/+4
| | |
* | | remove underline from the urls.Aditi2013-08-064-3/+10
| | |
* | | Configure tinymce with various plugins.Aditi2013-08-061-4/+9
| | |
* | | Change font color.Aditi2013-08-051-3/+3
| | |
* | | safe pipelline for blog description.Aditi2013-08-051-1/+1
| | |
* | | Add url for delete blogpost button.Aditi2013-08-051-4/+7
| | |
* | | New elements added for the styling of blog post listing view.Aditi2013-08-051-4/+3
| | |
* | | Add safe pipe for proper rendering of cleaned html.Aditi2013-08-051-2/+2
| | |