| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
| |
The .uploader() method conflicts with the uploader database
field. As we're moving to .FIELD for db field access, this
is a relevant conflict.
So renaming .uploader() to .get_uploader()
|
|
|
|
| |
will be ordered ascending, otherwise descending
|
|
|
|
|
|
|
|
|
| |
Note: Migrations can't use "Dot Notation"!
Migrations run on pymongo, not mongokit.
So they can't use the "Dot Notation".
This isn't really a big issue, as migrations are anyway
quite mongo specific.
|
|
|
|
|
|
|
|
|
|
| |
mongokit documents can allow to use x.FIELD instead of
x["FIELD"].
First it looks a lot more pythonic.
Second it might allow us an easier migration path towards
an sqlalchemy database backend.
Docs: http://namlook.github.com/mongokit/tutorial.html#dot-notation
|
|\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/user_pages/views.py
mediagoblin/util.py
|
| |
| |
| |
| |
| |
| |
| | |
* Removed trailing whitespace
* Line length < 80 where possible
* Honor conventions on number of blank lines
* Honor conventions about spaces around :, =
|
| | |
|
|/
|
|
| |
tools/[file].py
|
|\
| |
| |
| |
| | |
Conflicts:
mediagoblin/auth/routing.py
|
| | |
|
| | |
|
|/ |
|
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
mediagoblin/db/migrations.py
|
| |
| |
| |
| |
| | |
- deleted the thumbnail_file from the media_entries collection
- added a migration to remove the field from previous db versions
|
|\| |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
mediagoblin/config_spec.ini
mediagoblin/edit/views.py
mediagoblin/util.py
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
- adds a function to convert the tag list of dicts to a text string
properly delimited for loading into forms
- tag string conversion function updated to generate list of dicts
- updates all mentions of the conversion of the string to the tags db
object
- adds a tags template utility and updates the media template accordingly
|
|/ / |
|
| | |
|
| | |
|
| | |
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
mediagoblin/db/migrations.py
mediagoblin/db/models.py
mediagoblin/process_media/__init__.py
mediagoblin/templates/mediagoblin/user_pages/media.html
mediagoblin/util.py
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* `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()`
|
|\ \ \ |
|
| | |/
| |/| |
|
|/ / |
|
| |
| |
| |
| | |
the merge!
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | | |
'remotes/gullydwarf-cfdv/f423_match_image_ordering_between_scroll_and_gallery'
Conflicts:
mediagoblin/db/models.py
|
| | | |
|
|\ \ \ |
|
| |/ / |
|
|/ /
| |
| |
| | |
Bug #434 - identifies media by slug instead of _id in prev/next
|
|\ \
| | |
| | |
| | |
| | |
| | | |
Conflicts:
mediagoblin/db/models.py
mediagoblin/templates/mediagoblin/user_pages/media.html
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Feature #401 - previous/next navigation on media pages
* media.html includes a new prev_next.html template containing the links
* prev_next.html calls functions added to the media model to retrieve
the appropriate objects from the database, formatted with urlgen
* a small change to util.py brings ASCENDING into the mix
|
| |\ \ |
|
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
#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.
|
|\ \ \
| |/ /
|/| /
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
* `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`
|
| |
| |
| |
| |
| | |
* Added MediaComment database model
Holds `media_entry` (`ObjectId`), `author` (`ObjectId`), `created`, `content` and `content_html`.
|
|/ |
|
|
|
|
|
|
| |
adds the migration_handler to the User db class, connecting the
migration steps in ../db/migrations.py to the migration code in
gmg_commands
|
|\ |
|
| |\ |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
adds
* url and bio fields to database
* form for editing the user profile
* route to the edit profile controller
* view for the profile editing page
* template for the profile editing page
* link to edit profile in the welcome page
still needs
* thorough inspection to see if it makes sense
* tests
* ?
|
| |/
|/| |
|
|/ |
|