Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Put buttons for blog create and blog dashboard on view using template_hooks ↵ | Aditi Mittal | 2013-09-07 | 1 | -8/+1 |
| | | | | for blog plugin not to be interfering with original code. | ||||
* | Insert URL to blog in a user's profile page by spaetz | Aditi Mittal | 2013-09-07 | 1 | -0/+1 |
| | |||||
* | Add blog dashboard button. | Aditi Mittal | 2013-09-05 | 1 | -1/+5 |
| | |||||
* | Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin | Aditi Mittal | 2013-08-31 | 2 | -2/+2 |
|\ | |||||
| * | pdf media_type now have their own config_spec.ini | Rodney Ewing | 2013-08-29 | 1 | -1/+1 |
| | | |||||
| * | video media_type now have their own config_spec.ini | Rodney Ewing | 2013-08-29 | 1 | -1/+1 |
| | | |||||
* | | Pull changes and resolve merge conflict. | Aditi | 2013-08-28 | 3 | -9/+57 |
|\| | |||||
| * | Fixing another typo, thanks to Laura Arjona (again!) | Christopher Allan Webber | 2013-08-26 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'refs/remotes/rodney757/email' | Christopher Allan Webber | 2013-08-25 | 2 | -8/+56 |
| |\ | |||||
| | * | move links to the bottom of the page until we have a tabbed UI | Rodney Ewing | 2013-08-20 | 1 | -13/+11 |
| | | | |||||
| | * | maybe have change password and email on same page | Rodney Ewing | 2013-08-20 | 2 | -0/+50 |
| | | | |||||
* | | | Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin | Aditi | 2013-08-25 | 3 | -6/+13 |
|\| | | |||||
| * | | Merge remote-tracking branch 'refs/remotes/rodney757/notifications' | Christopher Allan Webber | 2013-08-21 | 2 | -0/+7 |
| |\ \ | |||||
| | * | | use urlgen and store it in a variable | Rodney Ewing | 2013-08-20 | 1 | -0/+3 |
| | | | | |||||
| | * | | add the ability to mark all notifications read. | Rodney Ewing | 2013-08-20 | 1 | -0/+4 |
| | |/ | |||||
| * | | Merge remote-tracking branch 'refs/remotes/rodney757/reprocessing' | Christopher Allan Webber | 2013-08-21 | 1 | -3/+3 |
| |\ \ | | |/ | |/| | | | | | | | | | | Conflicts: mediagoblin/processing/task.py mediagoblin/submit/lib.py | ||||
| | * | rename webm_640 to webm_video since it might be a different resolution | Rodney Ewing | 2013-08-20 | 1 | -3/+3 |
| | | | |||||
| * | | use href='javascript:;' instead of href='#notifications', etc | Rodney Ewing | 2013-08-20 | 1 | -3/+3 |
| |/ | |||||
* | | Resolve merge conflict and merge. | Aditi | 2013-08-22 | 7 | -14/+131 |
|\| | |||||
| * | load js at the end of the page | Rodney Ewing | 2013-08-16 | 2 | -2/+2 |
| | | |||||
| * | Merge branch 'persona_resquash' | Christopher Allan Webber | 2013-08-15 | 2 | -6/+35 |
| |\ | |||||
| | * | made it so that the create account button works with only persona enabled | Rodney Ewing | 2013-07-03 | 1 | -1/+1 |
| | | | |||||
| | * | moved persona template stuff to use template_hooks | Rodney Ewing | 2013-07-03 | 4 | -27/+2 |
| | | | |||||
| | * | merge --squash persona branch to take care of a false merge commit in | Rodney Ewing | 2013-07-03 | 5 | -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 Webber | 2013-08-15 | 2 | -0/+89 |
| |\ \ | | | | | | | | | | | | | New oauth tools! Heck yeah! | ||||
| | * \ | Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin | xray7224 | 2013-07-14 | 4 | -32/+42 |
| | |\ \ | |||||
| | * | | | Adds more support for oauth - access_token & decorators still to do | xray7224 | 2013-07-11 | 2 | -0/+89 |
| | | |/ | | |/| | |||||
| * | | | Avoiding the celery warnings that we seem to be confusing people lately. | Christopher Allan Webber | 2013-08-14 | 3 | -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 tabbable | Rodney Ewing | 2013-08-09 | 1 | -2/+2 |
| | | | | |||||
* | | | | Change path for tinymce. | Aditi | 2013-08-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Change button names to Save and Blog. | Aditi | 2013-08-10 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin | Aditi | 2013-08-09 | 2 | -3/+7 |
|\| | | | |||||
| * | | | Switching the MediaGoblin homepage image over to using the "official" ↵ | Christopher Allan Webber | 2013-08-08 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | gavroche style | ||||
| * | | | Add ?next= when trying to add a comment when not logged in | Rodney Ewing | 2013-08-08 | 1 | -1/+2 |
| | | | | |||||
| * | | | Changed how the comment was encoded/read. | Emily O'Leary | 2013-08-07 | 1 | -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'Leary | 2013-08-07 | 1 | -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. | Aditi | 2013-08-09 | 1 | -3/+3 |
| | | | |||||
* | | | Move templates to blog plugin from all mediagoblin/templates. | Aditi | 2013-08-07 | 5 | -280/+0 |
| | | | |||||
* | | | show all blogposts. | Aditi | 2013-08-07 | 2 | -6/+5 |
| | | | |||||
* | | | Specify the status of blog post. | Aditi | 2013-08-07 | 1 | -2/+14 |
| | | | |||||
* | | | Write template for draft view of a blog post. | Aditi | 2013-08-07 | 1 | -0/+42 |
| | | | |||||
* | | | Display date of creation of the blog post. | Aditi | 2013-08-07 | 1 | -1/+17 |
| | | | |||||
* | | | button to start with blogging. | Aditi | 2013-08-06 | 1 | -0/+4 |
| | | | |||||
* | | | remove underline from the urls. | Aditi | 2013-08-06 | 4 | -3/+10 |
| | | | |||||
* | | | Configure tinymce with various plugins. | Aditi | 2013-08-06 | 1 | -4/+9 |
| | | | |||||
* | | | Change font color. | Aditi | 2013-08-05 | 1 | -3/+3 |
| | | | |||||
* | | | safe pipelline for blog description. | Aditi | 2013-08-05 | 1 | -1/+1 |
| | | | |||||
* | | | Add url for delete blogpost button. | Aditi | 2013-08-05 | 1 | -4/+7 |
| | | | |||||
* | | | New elements added for the styling of blog post listing view. | Aditi | 2013-08-05 | 1 | -4/+3 |
| | | | |||||
* | | | Add safe pipe for proper rendering of cleaned html. | Aditi | 2013-08-05 | 1 | -2/+2 |
| | | |