Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Feature #400 - Resize images to fit on page - Additions | Joar Wandborg | 2011-07-03 | 5 | -21/+44 |
| | | | | | | | | | | | | | | | | | * `migrations.py` * Removed empty line * Added empty line * `models.py` * Added `MediaEntry.get_display_media()` helper function * `process_media.__init__.py` * Updated `process_media_initial()` * Renamed `main` => `original`. * Added condition to `medium`, it's only created if the original dimensions exceed the MEDIUM_SIZE dimensions. * `media.html` * The image tag is now populated by `MediaEntry.get_display_media()` * `util.py` * Added `DISPLAY_IMAGE_FETCHING_ORDER`, used by `MediaEntry.get_display_media()` | ||||
* | Feature #400 - Resize images to fit on page | Joar Wandborg | 2011-07-03 | 2 | -13/+32 |
| | | | | | | | | | | * `mediagoblin.process_media.__init__` * Added `medium` size image conversion * Updated `thumbnail` conversion to use `queued_filename` instead of `queued_file` * `media.html` * If there exists a `medium` size for the `MediaEntry`, it will display instead of the original `main` image. | ||||
* | Actually make use of CELERY_SETUP in from_tests.py | Christopher Allan Webber | 2011-06-30 | 1 | -3/+6 |
| | |||||
* | Merge remote branch 'remotes/schendje/master' | Christopher Allan Webber | 2011-06-30 | 5 | -88/+97 |
|\ | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/media.html | ||||
| * | Put messages.html in grid_12, above content | Jef van Schendel | 2011-06-29 | 2 | -13/+6 |
| | | |||||
| * | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-29 | 6 | -0/+158 |
| |\ | |||||
| * \ | Merge remote-tracking branch 'gitorious/master' | Jef van Schendel | 2011-06-28 | 4 | -7/+216 |
| |\ \ | |||||
| * | | | Tiny changes | Jef van Schendel | 2011-06-27 | 2 | -3/+1 |
| | | | | |||||
| * | | | Implement sidebar on media page | Jef van Schendel | 2011-06-27 | 3 | -32/+45 |
| | | | | |||||
* | | | | Comment indexes | Christopher Allan Webber | 2011-06-30 | 1 | -0/+10 |
| | | | | |||||
* | | | | Excitedly send a user a message that their comment was posted. | Christopher Allan Webber | 2011-06-29 | 1 | -0/+6 |
| | | | | |||||
* | | | | Use the cleaned_markdown_conversion method instead of doing that manually | Christopher Allan Webber | 2011-06-29 | 1 | -8/+5 |
| | | | | |||||
* | | | | Merge remote branch 'remotes/jwandborg/feature_362-simple_comments' | Christopher Allan Webber | 2011-06-29 | 5 | -11/+158 |
|\ \ \ \ | |_|_|/ |/| | | | |||||
| * | | | Issue #362 - Added new `wtforms.Form`; `MediaCommentForm()` | Joar Wandborg | 2011-06-29 | 1 | -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 Wandborg | 2011-06-29 | 1 | -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 Wandborg | 2011-06-29 | 1 | -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 model | Joar Wandborg | 2011-06-29 | 1 | -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 handler | Joar Wandborg | 2011-06-29 | 1 | -1/+4 |
| | | | | |||||
| * | | | Issue 362 - Add simple comments | Joar Wandborg | 2011-06-27 | 1 | -1/+25 |
| |/ / | | | | | | | | | | | | | * Added MediaComment database model Holds `media_entry` (`ObjectId`), `author` (`ObjectId`), `created`, `content` and `content_html`. | ||||
* | | | Making the messages conform to the 960.gx widths | Christopher Allan Webber | 2011-06-28 | 1 | -5/+9 |
| | | | |||||
* | | | Styling for the messaging list items. A rainbow of messages! | Christopher Allan Webber | 2011-06-28 | 1 | -0/+41 |
| | | | |||||
* | | | Merge remote branch 'remotes/gullydwarf-cfdv/f368_msg_framework' | Christopher Allan Webber | 2011-06-28 | 5 | -0/+113 |
|\ \ \ | |_|/ |/| | | |||||
| * | | adds message queue unit testing | Caleb Forbes Davis V | 2011-06-28 | 1 | -0/+44 |
| | | | |||||
| * | | removes messages.add_message from the global template context | Caleb Forbes Davis V | 2011-06-27 | 1 | -2/+0 |
| | | | | | | | | | | | | templates don't add messages. views are responsible for that. | ||||
| * | | adds message queue | Caleb Forbes Davis V | 2011-06-27 | 4 | -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 | ||||
* | | | Documenging index utils and adjusting how remove_deprecated_indexes gets ↵ | Christopher Allan Webber | 2011-06-27 | 1 | -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 docstring | Christopher Allan Webber | 2011-06-27 | 1 | -5/+19 |
| | | | | | | | | | | | | Includes information on how to deprecate indexes. | ||||
* | | | Updating migrate.py to actually run the indexing commands | Christopher Allan Webber | 2011-06-27 | 1 | -2/+18 |
| | | | |||||
* | | | Adding our current indexes and removing the index that was in models.py | Christopher Allan Webber | 2011-06-27 | 2 | -11/+12 |
| | | | |||||
* | | | Tools to add / remove indexes from collections | Christopher Allan Webber | 2011-06-27 | 1 | -0/+65 |
| | | | |||||
* | | | Store the collection information in the ACTIVE_INDEXES keys | Christopher Allan Webber | 2011-06-26 | 1 | -14/+9 |
| | | | |||||
* | | | A base set of indexes for us to use with our new indexing tool. | Christopher Allan Webber | 2011-06-26 | 1 | -0/+103 |
| |/ |/| | |||||
* | | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin | Christopher Allan Webber | 2011-06-26 | 4 | -35/+41 |
|\| | |||||
| * | Reordering the uploaded on/by and description sections of media display template | Christopher Allan Webber | 2011-06-25 | 1 | -8/+10 |
| | | |||||
| * | Align images in a gallery to the center | Christopher Allan Webber | 2011-06-25 | 1 | -0/+1 |
| | | |||||
| * | Just adjusting indentation a little bit in the base template. | Christopher Allan Webber | 2011-06-25 | 1 | -22/+24 |
| | | |||||
| * | Merge remote branch 'remotes/gullydwarf-cfdv/is330' | Christopher Allan Webber | 2011-06-25 | 1 | -4/+5 |
| |\ | | | | | | | | | | | | | Conflicts: mediagoblin/templates/mediagoblin/user_pages/gallery.html | ||||
| | * | Merge branch 'is330', remote-tracking branch 'origin/master' into is330 | cfdv | 2011-06-19 | 26 | -312/+588 |
| | |\ | |||||
| | * | | fixes uneven whitespace, and conforms to a strong preference for | cfdv | 2011-06-17 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | less than 80 characters per line | ||||
| * | | | Make the width of these fields 100% rather than providing a specific pixel ↵ | Christopher Allan Webber | 2011-06-25 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | width. | ||||
* | | | | Celery wasn't really being properly connected during tests. | Christopher Allan Webber | 2011-06-26 | 5 | -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 center | Christopher Allan Webber | 2011-06-25 | 1 | -2/+4 |
| | | | |||||
* | | | Setting height for media thumbnail to also 200px | Christopher Allan Webber | 2011-06-24 | 1 | -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 submission | Christopher Allan Webber | 2011-06-24 | 2 | -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 macro | Christopher Allan Webber | 2011-06-24 | 1 | -14/+38 |
| | | | | | | | | | | | | | | | Also adds a textarea-specific version that renders rows and cols as part of the input. | ||||
* | | | Implement basic footer | Jef van Schendel | 2011-06-24 | 2 | -1/+39 |
| | | | |||||
* | | | Remove excess grids, change CSS to center forms | Jef van Schendel | 2011-06-23 | 6 | -10/+5 |
| | | | |||||
* | | | Add <br /> for correct text layout | Jef van Schendel | 2011-06-23 | 1 | -1/+1 |
| | | | |||||
* | | | Submit form should not have edit_box class | Jef van Schendel | 2011-06-23 | 1 | -1/+1 |
| | | | |||||
* | | | Make several small changes to wording and top bar links | Jef van Schendel | 2011-06-23 | 3 | -7/+9 |
| | | |