Christopher Allan Webber [Mon, 16 Jan 2012 20:39:24 +0000 (14:39 -0600)]
Insert migration1 objects. Also, Level1 id from Integer->Unicode
Christopher Allan Webber [Sun, 15 Jan 2012 22:43:14 +0000 (16:43 -0600)]
All theoretical migrations written!
Christopher Allan Webber [Sun, 15 Jan 2012 21:43:59 +0000 (15:43 -0600)]
binding migration metadata to engine, and level_exits_new_table should now work
Christopher Allan Webber [Sun, 15 Jan 2012 20:55:07 +0000 (14:55 -0600)]
More test migration work. Closing to working migrations for set 2...
Also, this file is written in 2012, correct that ;)
Christopher Allan Webber [Sun, 15 Jan 2012 17:36:00 +0000 (11:36 -0600)]
Might as well call it "set2 migrations"
Christopher Allan Webber [Sun, 15 Jan 2012 17:35:26 +0000 (11:35 -0600)]
A theoretical set of models to migrate about with, plus one migration ;)
Christopher Allan Webber [Mon, 2 Jan 2012 22:14:55 +0000 (16:14 -0600)]
Another db->db.engine because I'm bad at things ;)
Thanks again Elrond.
Christopher Allan Webber [Mon, 2 Jan 2012 22:08:32 +0000 (16:08 -0600)]
No need for self here (thanks again Elrond ;))
Christopher Allan Webber [Mon, 2 Jan 2012 20:56:05 +0000 (14:56 -0600)]
Another MigrationManager fix.
self.database -> self.database.engine (thanks again Elrond for the catch)
Christopher Allan Webber [Mon, 2 Jan 2012 20:40:32 +0000 (14:40 -0600)]
Make name the primary key in migration records
Christopher Allan Webber [Mon, 2 Jan 2012 20:04:16 +0000 (14:04 -0600)]
assert was positive when it should be negative, fixed
Christopher Allan Webber [Mon, 2 Jan 2012 19:59:36 +0000 (13:59 -0600)]
Use .first() instead of [0]... thanks elrond :)
Christopher Allan Webber [Mon, 2 Jan 2012 19:38:08 +0000 (13:38 -0600)]
We should probably add that object to the DB also :P
Christopher Allan Webber [Mon, 2 Jan 2012 19:36:19 +0000 (13:36 -0600)]
Commit that new migration record ;)
Christopher Allan Webber [Mon, 2 Jan 2012 15:12:11 +0000 (09:12 -0600)]
Add create_new_migration_record method to MigrationManager
Christopher Allan Webber [Mon, 2 Jan 2012 14:55:25 +0000 (08:55 -0600)]
Added init_tables method to MigrationManager
Christopher Allan Webber [Sun, 1 Jan 2012 22:02:14 +0000 (16:02 -0600)]
More work on SQL MigrationManager
Added methods:
- migration_data
- database_current_migration
- migrations_to_run
Christopher Allan Webber [Sun, 1 Jan 2012 17:47:39 +0000 (11:47 -0600)]
Removing printer argument now that we use self.printer
Christopher Allan Webber [Sun, 1 Jan 2012 17:47:05 +0000 (11:47 -0600)]
Finishing the init_or_migrate function
Christopher Allan Webber [Sat, 31 Dec 2011 14:45:41 +0000 (08:45 -0600)]
More work on migration manager, including adding a dry run function
Christopher Allan Webber [Thu, 29 Dec 2011 20:44:21 +0000 (14:44 -0600)]
Beginnings of the SQL migration manager
Christopher Allan Webber [Thu, 29 Dec 2011 17:15:55 +0000 (11:15 -0600)]
Big ol' start of the SQL migrations system.
Things definitely don't work yet, but should be heading in the right direction.
Christopher Allan Webber [Sun, 29 Jan 2012 19:47:51 +0000 (13:47 -0600)]
Committing extracted and compiled translations
Christopher Allan Webber [Sun, 29 Jan 2012 19:47:36 +0000 (13:47 -0600)]
Committing present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Sun, 29 Jan 2012 19:32:41 +0000 (13:32 -0600)]
Adding a line reminding user to push up commits
Christopher Allan Webber [Sun, 29 Jan 2012 19:31:47 +0000 (13:31 -0600)]
Committing extracted and compiled translations
Christopher Allan Webber [Sun, 29 Jan 2012 19:30:18 +0000 (13:30 -0600)]
Hm, maybe this is better... that didn't fix the stop-in-the-middle issue.
Christopher Allan Webber [Sun, 29 Jan 2012 19:22:21 +0000 (13:22 -0600)]
Update update_translations script to consider several things conditionally
Specifically, previously if there was nothing to git add, whole script would just die
Elrond [Wed, 4 Jan 2012 21:00:44 +0000 (22:00 +0100)]
Nearly complete support for Tags
These changes allow all of the rest of the code to use tags
in sql as they were used on mongo. It's not efficient at
all, as changing tags usually means to remove all old tags
and adding all new.
The only problem here is: Old slugs for tags are not
removed, because they're shared across all MediaTags and
dropping orphans is not always easy.
Joar Wandborg [Sat, 28 Jan 2012 17:53:36 +0000 (18:53 +0100)]
Resized a test_exif test image. 1.9M is unnecessarily large.
Joar Wandborg [Sat, 28 Jan 2012 17:47:01 +0000 (18:47 +0100)]
Merge remote-tracking branch 'joar/exif-rebase'
Elrond [Sat, 24 Dec 2011 15:53:32 +0000 (16:53 +0100)]
Add develover sql switch
If you want to play with the current state of sql, you need
a switch to turn it on. So here is the super secret
developer switch.
So you want to know where it is?
Here it is:
Create a file mediagoblin/db/sql_switch.py and put one line
in it: "use_sql = True" (or False to disable again). Right,
that's it. If you want to delete it, remember to delete the
*.pyc too.
Be careful not to "git add" it by accident!
Christopher Allan Webber [Sat, 28 Jan 2012 17:31:26 +0000 (11:31 -0600)]
We were using translitcodec and I didn't understand how it worked ;)
My bad!
Christopher Allan Webber [Sat, 28 Jan 2012 17:13:03 +0000 (11:13 -0600)]
We aren't using translitcodec anymore. Kill it!
Elrond [Sun, 22 Jan 2012 16:11:43 +0000 (17:11 +0100)]
Let some code support "media without slug"
The upcoming SQL database will allow having media without a
slug again. This might especially be useful for API
support, where the uploaded image (media) does not have
*any* information to generate a slug from.
This code change mostly allows the sql backend to have no
slug in its model and improves some parts to properly
handle that.
It specifically does not have any web frontend support to
edit/create MediaEntries with no slug.
Joar Wandborg [Sat, 28 Jan 2012 00:31:56 +0000 (01:31 +0100)]
JavaScript fixes - AGPL headers, etc
- Added AGPL header to comment_show.js, show_password.js
and geolocation-map.js
- Removed console.log from geolocation-map.js
Joar Wandborg [Fri, 27 Jan 2012 01:13:07 +0000 (02:13 +0100)]
Scripts and styleshets for geolocation map - Conditional
Scripts and stylesheets for the geolocation map are now
switched on/off with the geolocation map itself.
Joar Wandborg [Fri, 27 Jan 2012 00:55:50 +0000 (01:55 +0100)]
Adding previously erroneously gitignored extlib/leaflet/{lib,dist,build}/ files
Joar Wandborg [Fri, 27 Jan 2012 00:52:57 +0000 (01:52 +0100)]
Updated .gitignore due to it blacking out the extlib/leaflet/dist/ directory
Elrond [Sun, 22 Jan 2012 19:17:43 +0000 (20:17 +0100)]
Move declarative_base Base into base.py
The base class of all models "Base" should be in base.py.
Elrond [Thu, 26 Jan 2012 21:14:48 +0000 (22:14 +0100)]
Add "mediagoblin/templates *.txt" to packaging
Again thanks to Clint Byrum!
Elrond [Thu, 26 Jan 2012 21:10:46 +0000 (22:10 +0100)]
Drop all buildout things
virtualenv is working for everyone.
No need for the buildout stuff any more.
Elrond [Thu, 26 Jan 2012 20:33:49 +0000 (21:33 +0100)]
Packaging improvement by Clint Byrum from Debian/Ubuntu
1) MANIFEST.in missed a bunch of things, especially
config_spec.ini.
2) You need to specify include_package_data=True in
setup.py to actually activate MANIFEST.in it seems.
Thanks go to Clint Byrum!
Joar Wandborg [Wed, 25 Jan 2012 22:53:02 +0000 (23:53 +0100)]
Refractored media.html template and related includes
- Added <p> around license part to separate it properly
from other sidebar content
- Moved exif part to mediagoblin/utils/exif.html
- Moved geolocation map to mediagoblin/utils/geolocation_map.html
Joar Wandborg [Wed, 25 Jan 2012 22:05:47 +0000 (23:05 +0100)]
Acts on feedback from Chris
- Added EXIF tests
- Removed pdb from image processing "ifmain"
- Fixed comment typo in image processing
- Removed unused import in tools.exif
Joar Wandborg [Fri, 20 Jan 2012 09:27:26 +0000 (10:27 +0100)]
Moved EXIF to sidebar, added conditions for visibility configuration settings
Joar Wandborg [Fri, 20 Jan 2012 01:31:29 +0000 (02:31 +0100)]
Added exif_visisble and geolocation_map_visible to config_spec
Joar Wandborg [Mon, 16 Jan 2012 02:45:58 +0000 (03:45 +0100)]
EXIF fixes
- Moved exif functions from mediagoblin.media_types.image.processing
to mediagoblin.tools.exif
- Moved EXIF.py link from mediagoblin.media_types to mediagoblin.tools.extlib
- Refractored and updated EXIF exctraction and presentation
Joar Wandborg [Mon, 16 Jan 2012 02:25:57 +0000 (03:25 +0100)]
Removed link to EXIF.py in media_types.image
Joar Wandborg [Tue, 10 Jan 2012 01:59:07 +0000 (02:59 +0100)]
EXIF extraction, geolocation map, image rotation
- Images are now rotated based on EXIF image orientation
(in case the image isn't flipped on X or Y axis or
correctly oriented, then we do nothing)
- *Always* create a medium.jpg in image.processing, for
the sake of rotation of display image
- Extract EXIF and GPS tags from images and insert them
into media_data
- Geolocation map display added to media.html
- EXIF display added, then removed. It is not in this
revision, although some of it is (the "EXIF" h4
header). Need to make it presentable, filtering out
purely robotical tags, perhaps.
Joar Wandborg [Tue, 10 Jan 2012 01:53:46 +0000 (02:53 +0100)]
Added code for leaflet geolocation map
Joar Wandborg [Tue, 10 Jan 2012 01:14:37 +0000 (02:14 +0100)]
Installed EXIF.py in extlibs/
Joar Wandborg [Tue, 10 Jan 2012 00:54:37 +0000 (01:54 +0100)]
Installed leaflet in extlib
Elrond [Wed, 4 Jan 2012 21:13:19 +0000 (22:13 +0100)]
Proper url_to_{prev,next} for SQL
Uses complete sqlalchemy syntax now.
Elrond [Mon, 2 Jan 2012 12:07:16 +0000 (13:07 +0100)]
Create a fully functional get_comments for SQL
Using proper sqlalchemy syntax instead of the emulated
mongo one.
Christopher Allan Webber [Sat, 21 Jan 2012 23:00:42 +0000 (17:00 -0600)]
Canonical license URIS for CC stuff should have a trailing slash.
Christopher Allan Webber [Sat, 21 Jan 2012 22:58:03 +0000 (16:58 -0600)]
Show the license list in sorted form
Christopher Allan Webber [Sat, 21 Jan 2012 22:56:49 +0000 (16:56 -0600)]
Oops, I broke teh all rights reserved ;)
Christopher Allan Webber [Sat, 21 Jan 2012 22:51:21 +0000 (16:51 -0600)]
Provided a SORTED_SUPPORTED_LICENSES (but keep the old unsorted dict!)
Christopher Allan Webber [Sat, 21 Jan 2012 22:41:07 +0000 (16:41 -0600)]
Convert over the license field, too!
Christopher Allan Webber [Sat, 21 Jan 2012 22:40:39 +0000 (16:40 -0600)]
License "all rights reserved" default should be None/NULL, not empty string
Elrond [Sat, 21 Jan 2012 18:24:36 +0000 (19:24 +0100)]
Fix unit tests with new license support
Make the license field in the forms optional and let them
properly be defaulted to "".
Aaron Williamson [Fri, 20 Jan 2012 03:00:08 +0000 (22:00 -0500)]
Added migration for license field, resolved conflict in db/sql/models.py
Elrond [Thu, 19 Jan 2012 23:17:05 +0000 (00:17 +0100)]
Add copyright header and a bit of pep8ification
Nearly all the sql files missed a copyright header.
So added it!
And while there fixed a few pep8 things.
Elrond [Sat, 24 Dec 2011 17:20:20 +0000 (18:20 +0100)]
Use custom query class
A custom query class allows to add more methods on
queries (read: "cursors").
This custom query class especially adds a .sort with a
calling convention exactly like the mongo one.
Makes a lot of existing code happy!
Aaron Williamson [Thu, 19 Jan 2012 02:21:49 +0000 (21:21 -0500)]
Minor formatting and syntax fix.
Aaron Williamson [Thu, 19 Jan 2012 02:07:55 +0000 (21:07 -0500)]
Moved get_license_data to mixin.py, added license to sql media model, added translation tags to license template.
Aaron Williamson [Thu, 19 Jan 2012 01:40:18 +0000 (20:40 -0500)]
Merge branch 'mediagoblin-upstream' into feature544_basic_license_data
Elrond [Thu, 29 Dec 2011 10:07:58 +0000 (11:07 +0100)]
sql/fake.py: Some fake objects/methods to calm the code
sql/fake.py contains some fake classes and functions to
calm the rest of the code base. Or provide super minimal
implementations.
Currently:
- ObjectId "class": It's a function mostly doing
int(first_arg) to convert string primary keys into
integer primary keys.
- InvalidId exception
- DESCENING "constant"
Michele Azzolari [Tue, 17 Jan 2012 22:15:47 +0000 (23:15 +0100)]
Cleaned the code
Michele Azzolari [Tue, 17 Jan 2012 21:42:36 +0000 (22:42 +0100)]
We handle exceptions if PuSH fails
Elrond [Tue, 17 Jan 2012 17:30:15 +0000 (18:30 +0100)]
Merge remote branch 'remotes/macno/pushatom'
* remotes/macno/pushatom:
As per spec, we permit to have more then 1 hub
As suggested by Elrond, we use only one setting
Default is now PuSH disabled
Added PuSH capability
Aaron Williamson [Tue, 17 Jan 2012 06:23:21 +0000 (01:23 -0500)]
Changed license.html to fit new layout better
Aaron Williamson [Tue, 17 Jan 2012 06:22:02 +0000 (01:22 -0500)]
Fixed a syntax error in edit/views and added back in some missing license stuff from models
Aaron Williamson [Tue, 17 Jan 2012 06:13:55 +0000 (01:13 -0500)]
Added new files
Aaron Williamson [Tue, 17 Jan 2012 06:05:15 +0000 (01:05 -0500)]
Fixed merge with upstream
Aaron Williamson [Tue, 17 Jan 2012 05:59:21 +0000 (00:59 -0500)]
Merged changes with upstream
Aaron Williamson [Tue, 17 Jan 2012 05:33:55 +0000 (00:33 -0500)]
First crack at basic license support.
Jef van Schendel [Sun, 15 Jan 2012 16:23:21 +0000 (17:23 +0100)]
Small fix to simplify font style
Jef van Schendel [Sun, 15 Jan 2012 16:10:35 +0000 (17:10 +0100)]
Another small text style fix
Jef van Schendel [Sun, 15 Jan 2012 16:07:15 +0000 (17:07 +0100)]
Small margin/font-weight fix
Elrond [Fri, 13 Jan 2012 21:59:14 +0000 (22:59 +0100)]
Drop sessions with invalid ObjectIds
The session can contain invalid objectids when switching a
more or less live instance (with logged in users) from
mongo to sql or vice versa.
So drop the complete session and force the user to login
again.
Elrond [Sat, 14 Jan 2012 11:54:16 +0000 (12:54 +0100)]
Move maketarball.sh into devtools/
Now that there is a devtools directory, use it!
Christopher Allan Webber [Sat, 14 Jan 2012 02:27:53 +0000 (20:27 -0600)]
make this script executable
Christopher Allan Webber [Sat, 14 Jan 2012 02:26:36 +0000 (20:26 -0600)]
Simple translation update script
Elrond [Fri, 13 Jan 2012 22:38:21 +0000 (23:38 +0100)]
Fix request.user==None error
If one isn't logged in and views the profile of a user
without media, one gets a problem, because request.user is
None and has no _id attribute.
Fix this.
Jef van Schendel [Fri, 13 Jan 2012 22:23:02 +0000 (23:23 +0100)]
Remove unnecessary piece of text in media.html. Fix "Markdown text" indentation so they are the same.
Jef van Schendel [Fri, 13 Jan 2012 16:38:20 +0000 (17:38 +0100)]
Add CC0 license header to Sphinx MediaGoblin theme (mg.css)
Michele Azzolari [Thu, 12 Jan 2012 10:05:05 +0000 (11:05 +0100)]
As per spec, we permit to have more then 1 hub
Michele Azzolari [Wed, 11 Jan 2012 23:00:28 +0000 (00:00 +0100)]
As suggested by Elrond, we use only one setting
Michele Azzolari [Wed, 11 Jan 2012 15:11:23 +0000 (16:11 +0100)]
Default is now PuSH disabled
Michele Azzolari [Wed, 11 Jan 2012 14:48:37 +0000 (15:48 +0100)]
Added PuSH capability
Elrond [Sat, 31 Dec 2011 22:01:34 +0000 (23:01 +0100)]
Add MediaFile table and related infrastructure.
- This adds a new SQL table field type for path tuples.
They're stored as '/' separated unicode strings.
- Uses it to implement a MediaFile table.
- Add relationship and proxy fields on MediaEntry to give a
nice media_files "view" there.
- Let the converter fill the MediaFile.
Elrond [Sun, 25 Dec 2011 19:04:41 +0000 (20:04 +0100)]
Dot-Notation: Some random places
Elrond [Wed, 11 Jan 2012 10:16:35 +0000 (11:16 +0100)]
Fix url_for_self mixup
Move changes from mongo/models:url_for_self back into
mixin:url_for_self.
Christopher Allan Webber [Tue, 10 Jan 2012 14:12:30 +0000 (08:12 -0600)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Conflicts:
mediagoblin/db/mongo/models.py
Michele Azzolari [Thu, 5 Jan 2012 17:48:23 +0000 (18:48 +0100)]
Fixed #724 and added extra infos to the atom feed (author uri and links to the html version of each entry)
Joar Wandborg [Tue, 10 Jan 2012 12:12:14 +0000 (13:12 +0100)]
Added check for request.user to media.html attachment-related conditional
Elrond [Tue, 10 Jan 2012 11:52:01 +0000 (12:52 +0100)]
Test Suite: Enable attachments, add failing test
attachments are an optional part. But it doesn't hurt to
enable them in the test suite at all.
Also (with enabled attachmemtns) the main media view fails,
if one isn't logged in (joar found it!). So add a simple
(currently failing) test for this.
Elrond [Mon, 9 Jan 2012 13:33:57 +0000 (14:33 +0100)]
Fix reset.css reference and drop link to video-js.css
1. reset.css was moved to /css/extlib/ some time ago.
So update the staticdirect link to it.
2. We don't have video-js.css (any more?). Drop link to it.