aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Issue #362 - Simple comments - Changes based on feedback recieved from ↵Joar Wandborg2011-07-013-22/+13
| | | | | | | | | | | | #mediagoblin * `db.models` - Removed `MediaEntry.get_comments()` and replaced it with a helper which just returns a cursor for the comments query * `media.html` - Added `{% set comment_author = comment.author() %}` * `user_pages.views` - media_home() now passes `MediaEntry.get_comments()` directly to `Pagination`, handles pagination for comments. * Added `MEDIA_COMMENTS_PER_PAGE` to define the number of comments per page in the `media_home()` view.
* Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblinJoar Wandborg2011-06-307-8/+169
|\
| * Excitedly send a user a message that their comment was posted.Christopher Allan Webber2011-06-291-0/+6
| |
| * Use the cleaned_markdown_conversion method instead of doing that manuallyChristopher Allan Webber2011-06-291-8/+5
| |
| * Merge remote branch 'remotes/jwandborg/feature_362-simple_comments'Christopher Allan Webber2011-06-295-11/+158
| |\
| * | Making the messages conform to the 960.gx widthsChristopher Allan Webber2011-06-281-5/+9
| | |
| * | Styling for the messaging list items. A rainbow of messages!Christopher Allan Webber2011-06-281-0/+41
| | |
| * | Merge remote branch 'remotes/gullydwarf-cfdv/f368_msg_framework'Christopher Allan Webber2011-06-285-0/+113
| |\ \
| | * | adds message queue unit testingCaleb Forbes Davis V2011-06-281-0/+44
| | | |
| | * | removes messages.add_message from the global template contextCaleb Forbes Davis V2011-06-271-2/+0
| | | | | | | | | | | | | | | | templates don't add messages. views are responsible for that.
| | * | adds message queueCaleb Forbes Davis V2011-06-274-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature #368 - messaging framework * message levels are debug, info, success, warning, and error * display mechanism - base.html includes messages.html for now * fetch_messages and add_message are available to all templates using jinja2 environment.globals * messages are displayed and cleared. no persistence
* | | | Merge branch 'feature_362-simple_comments'Joar Wandborg2011-06-295-11/+158
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Issue #362 - Added new `wtforms.Form`; `MediaCommentForm()`Joar Wandborg2011-06-291-0/+21
| | | | | | | | | | | | | | | * ADDED `MediaCommentForm` is a form for `MediaComment` user entry and posting.
| * | Issue #362 - Updated `mediagoblin.user_pages.views` to handle new "Simple ↵Joar Wandborg2011-06-291-7/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | comments" feature * ADDED `media_post_comment(request)` which creates `MediaComments` from POST requests * UPDATED `media_home(request, media, **kwargs)` now passes `comments`, `pagination` and `comments_form` to `media.html`
| * | Issue #362 - Updated media.html with things necessary for the simple comment ↵Joar Wandborg2011-06-291-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | feature * `media.html` now imports `wtforms.html` for use in comment form rendering * `media.html` now outputs a commenting form if `request.user` evals to `True` * `media.html` now outputs `MediaComments` if `comments` evals to `True` * `media.html` now includes `pagination.html` to handle comment pagination
| * | Issue #362 - Updated the MediaComment modelJoar Wandborg2011-06-291-4/+20
| | | | | | | | | | | | | | | | | | | | | * `MediaComment.get_comments()` now uses pagination * `MediaComment.get_comments()` now sorts by `created` DESC * `MediaComment.media_entry` is now **required** * `MediaComment.media_entry()` now returns parent `MediaEntry`
| * | Issue #362 - Added a route to MediaComment POST handlerJoar Wandborg2011-06-291-1/+4
| | |
| * | Issue 362 - Add simple commentsJoar Wandborg2011-06-271-1/+25
| | | | | | | | | | | | | | | * Added MediaComment database model Holds `media_entry` (`ObjectId`), `author` (`ObjectId`), `created`, `content` and `content_html`.
* | | Documenging index utils and adjusting how remove_deprecated_indexes gets ↵Christopher Allan Webber2011-06-271-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | arguments More specifically, we now just take a dictionary of lists, like: {'collection': ['index_identifier1', 'index_identifier2']} Previously we took something with more info like in add_new_indexes, but that extra info isn't really necessary.
* | | Documentation updates to indexes.py's docstringChristopher Allan Webber2011-06-271-5/+19
| | | | | | | | | | | | Includes information on how to deprecate indexes.
* | | Updating migrate.py to actually run the indexing commandsChristopher Allan Webber2011-06-271-2/+18
| | |
* | | Adding our current indexes and removing the index that was in models.pyChristopher Allan Webber2011-06-272-11/+12
| | |
* | | Tools to add / remove indexes from collectionsChristopher Allan Webber2011-06-271-0/+65
| | |
* | | Store the collection information in the ACTIVE_INDEXES keysChristopher Allan Webber2011-06-261-14/+9
| | |
* | | A base set of indexes for us to use with our new indexing tool.Christopher Allan Webber2011-06-261-0/+103
|/ /
* | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinChristopher Allan Webber2011-06-264-35/+41
|\|
| * Reordering the uploaded on/by and description sections of media display templateChristopher Allan Webber2011-06-251-8/+10
| |
| * Align images in a gallery to the centerChristopher Allan Webber2011-06-251-0/+1
| |
| * Just adjusting indentation a little bit in the base template.Christopher Allan Webber2011-06-251-22/+24
| |
| * Merge remote branch 'remotes/gullydwarf-cfdv/is330'Christopher Allan Webber2011-06-251-4/+5
| |\ | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/gallery.html
| | * Merge branch 'is330', remote-tracking branch 'origin/master' into is330cfdv2011-06-1932-362/+710
| | |\
| | * | fixes uneven whitespace, and conforms to a strong preference forcfdv2011-06-171-3/+4
| | | | | | | | | | | | | | | | less than 80 characters per line
| * | | Make the width of these fields 100% rather than providing a specific pixel ↵Christopher Allan Webber2011-06-251-1/+1
| | | | | | | | | | | | | | | | width.
* | | | Celery wasn't really being properly connected during tests.Christopher Allan Webber2011-06-265-21/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Lots of fixes to do this. - setup_celery_from_config no longer responsible for checking 'celery_setup_elsewhere'; that's the app's job. (This was a problem because more than the app was relying on using this function) - Allow us to specifically set the config file we're setting up celery from with setup_self - Set up celery_always_eager. This is something we strongly want while doing tests. - Instead of setting up the app in the get_test_app method, let's set that up simply by importing from_tests, which should itself up via from_celery being the environment variable being set.
* | | Put the thumbnail on the edit details part on the top and centerChristopher Allan Webber2011-06-251-2/+4
| | |
* | | Setting height for media thumbnail to also 200pxChristopher Allan Webber2011-06-241-1/+1
| | | | | | | | | | | | | | | Not sure why height wasn't at 200px but anyway not having at 200px means some images would hit overlap.
* | | Adjust the width of the fields on the form submissionChristopher Allan Webber2011-06-242-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Did several things, including: - Call the individual form field rendering macros instead of the auto whole-form renderer so we get better control over the TextArea - Use the textarea specific form field rendering macro - Adds textarea styling to the css - Sets the input, textarea styling to be 460 px wide (the width of the form section, not including padding)
* | | Separates out the field rendering part from the whole form rendering macroChristopher Allan Webber2011-06-241-14/+38
| | | | | | | | | | | | | | | Also adds a textarea-specific version that renders rows and cols as part of the input.
* | | Implement basic footerJef van Schendel2011-06-242-1/+39
| | |
* | | Remove excess grids, change CSS to center formsJef van Schendel2011-06-236-10/+5
| | |
* | | Add <br /> for correct text layoutJef van Schendel2011-06-231-1/+1
| | |
* | | Submit form should not have edit_box classJef van Schendel2011-06-231-1/+1
| | |
* | | Make several small changes to wording and top bar linksJef van Schendel2011-06-233-7/+9
| | |
* | | Merge remote branch 'remotes/schendje/960-grid-system'Christopher Allan Webber2011-06-2211-45/+401
|\ \ \
| * | | Switch css over to 960.gs. If I did everything right, things should look ↵Jef van Schendel2011-06-2311-45/+401
| | | | | | | | | | | | | | | | exactly the same.
* | | | Slightly clearer message about email marked as verified w/ adduser gmg commandChristopher Allan Webber2011-06-221-1/+1
| | | |
* | | | Setting status to active when adding users with ./bin/gmg adduserChristopher Allan Webber2011-06-221-0/+1
| | | |
* | | | Making arguments positional and removing the "usage" functionsChristopher Allan Webber2011-06-221-76/+41
| | | | | | | | | | | | | | | | | | | | | | | | All these arguments were required and might as well be positional thusly. If you don't provide all required positional arguments, argparser will correct you and request usage.
* | | | No need to describe usage of subcommands, gmg subcommand --help does thatChristopher Allan Webber2011-06-221-3/+3
| | | |
* | | | Adding new function to gmg_commands, adduser,makeadmin and changepw issue 373Alejandro Villanueva2011-06-222-0/+141
|/ / /