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.
Elrond [Mon, 9 Jan 2012 13:26:01 +0000 (14:26 +0100)]
Warn about unknown staticdirect paths.
Use pkg_resource to check for the existence of any files
referenced by staticdirect. If they don't exist, warn about
this.
This might raise false warnings in the future for more
advanced setups.
Elrond [Mon, 9 Jan 2012 13:22:28 +0000 (14:22 +0100)]
Create a default logging config
paste uses paste.ini to configure python's logging module.
Until now, there was NO config, not even a useful default
one. This means: any messages went away unseen.
Not good.
The new default logs everything to stderr at level INFO and
higher. Maybe not the best, but a good starting point.
Elrond [Wed, 4 Jan 2012 23:18:17 +0000 (00:18 +0100)]
Add DB Mixin classes and use them
A bunch of functions on the db objects are really more like
"utility functions": They could live outside the classes
and be called "by hand" passing the appropiate reference.
They usually only use the public API of the object and
rarely use database related stuff.
Goals:
- First, simple: Share the code with the SQL objects, so
that the code doesn't need to be duplicated.
- Second, it might unclutter the db models and make them
more into "model only" stuff.
- Doesn't really hurt.
Christopher Allan Webber [Sat, 7 Jan 2012 19:48:12 +0000 (13:48 -0600)]
Committing extracted and compiled translations
Christopher Allan Webber [Sat, 7 Jan 2012 19:47:33 +0000 (13:47 -0600)]
Committing present MediaGoblin translations before pushing extracted messages
Jef van Schendel [Fri, 6 Jan 2012 23:04:38 +0000 (00:04 +0100)]
Increase docs sidebar width
Jef van Schendel [Fri, 6 Jan 2012 22:58:43 +0000 (23:58 +0100)]
New docs logo, small css changes
Jef van Schendel [Fri, 6 Jan 2012 18:56:50 +0000 (19:56 +0100)]
First push with new style (includes css file, logo image, fonts)
Jef van Schendel [Fri, 6 Jan 2012 12:44:00 +0000 (13:44 +0100)]
Fix div breaking in user.html; add media query bits
Jef van Schendel [Fri, 6 Jan 2012 12:34:25 +0000 (13:34 +0100)]
Resize image below 660px width
Jef van Schendel [Thu, 5 Jan 2012 22:36:16 +0000 (23:36 +0100)]
* Rename mediagoblin_header, mediagoblin_body, mediagoblin_footer, mediagoblin_header_right, mediagoblin_logo
* Add html5shiv for older browsers
* Small size fix (940px instead of 960pgx)
Jef van Schendel [Thu, 5 Jan 2012 21:46:21 +0000 (22:46 +0100)]
Add closing bracket so the whole thing doesn't break down
Jef van Schendel [Thu, 5 Jan 2012 20:52:28 +0000 (21:52 +0100)]
Remove last 960.gs leftover; fix classes for edit forms
Jef van Schendel [Thu, 5 Jan 2012 20:42:56 +0000 (21:42 +0100)]
Fix merge conflicts
Jef van Schendel [Thu, 5 Jan 2012 20:36:24 +0000 (21:36 +0100)]
Several changes for mobile layout
Jef van Schendel [Thu, 5 Jan 2012 14:58:03 +0000 (15:58 +0100)]
Always show 'Change account settings' link
Elrond [Thu, 5 Jan 2012 13:54:03 +0000 (14:54 +0100)]
Fix Unit Tests for new password changing
Elrond [Thu, 5 Jan 2012 13:47:15 +0000 (14:47 +0100)]
Make show-password-js work for change password too
The show password js depends on the password field to have
an id of "password". So give it a proper id.
Also fixed the label generation for the case of field.name
and field.id being different.
Elrond [Thu, 5 Jan 2012 13:46:27 +0000 (14:46 +0100)]
Fix more StrictUndefined issues
Jef van Schendel [Wed, 4 Jan 2012 23:18:29 +0000 (00:18 +0100)]
Add change-account-settings link to user.html
Jef van Schendel [Wed, 4 Jan 2012 23:17:51 +0000 (00:17 +0100)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Jef van Schendel [Wed, 4 Jan 2012 23:17:45 +0000 (00:17 +0100)]
Create edit_account.html
Elrond [Wed, 4 Jan 2012 22:48:55 +0000 (23:48 +0100)]
f691: Use StrictUndefined for templates and fix some issues
References to undefined variables in templates were
silently ignored/converted to None/empty strings. This
makes coding lazy stuff easy, but it makes catching typos
harder.
(It would have catched one of the SQL things earlier!)
But on the other hand it might make the current templates
error out everywhere. In fact, early testing has shown two
instances, that errored out. Those are fixed with this
commit too.
If this turns out to make things more complex and useless
than actually solving any problems, it can easily be
dropped again.
Elrond [Mon, 2 Jan 2012 15:02:02 +0000 (16:02 +0100)]
Import MigrationManager from mongo in mongo backend.
Inside the mongo db backend, use the mongo
MigrationManager. This is hopefully the last reference to
the generic MigrationManager reference on db.util.
Jef van Schendel [Wed, 4 Jan 2012 16:48:16 +0000 (17:48 +0100)]
Add Markdown for submit page, edit page, profile edit page; thus fixing ticket #690
Elrond [Tue, 13 Dec 2011 10:18:39 +0000 (11:18 +0100)]
Dot-Notation for MediaEntry.queued_media_file
Elrond [Tue, 13 Dec 2011 09:49:51 +0000 (10:49 +0100)]
Dot-Notation for MediaEntry.state
Elrond [Wed, 4 Jan 2012 10:57:08 +0000 (11:57 +0100)]
Dot-Notation for MediaEntry.media_files
Elrond [Sat, 24 Dec 2011 14:55:33 +0000 (15:55 +0100)]
sql convert: Use more library functions
1. Use the new setup_connection_and_db_from_config in the
sql backend.
2. Use sql and mongo specific functions wherever
appropiate instead of the generic "db.X" one. This makes
the converter more indepedent of the current backend
choice.
Jef van Schendel [Sun, 1 Jan 2012 21:58:32 +0000 (22:58 +0100)]
Seperate jQuery bit that was still in media.html
Elrond [Sun, 1 Jan 2012 18:20:38 +0000 (19:20 +0100)]
Fix unit tests for new forget password flow
After changing the password, the login page is now shown.
It contains a message. (we can't test for that easily
currently. There is a bug open on this problem.)
At least for the login page being shown now.
Jef van Schendel [Sun, 1 Jan 2012 18:13:23 +0000 (19:13 +0100)]
Remove fp_changed_success.html, use log in page + notification message instead
Jef van Schendel [Sun, 1 Jan 2012 18:00:56 +0000 (19:00 +0100)]
Remove fp_email_sent.html and refs to it
Elrond [Sun, 1 Jan 2012 16:24:02 +0000 (17:24 +0100)]
Factor out check_db_migrations_current
When initializing the database connection the current mongo
based setup checked for new migrations and warned about
them. This was mongo specific so factor'd it out into a
more generic check_db_migrations_current function in the
mongo backend.
Also created a dummy one in the sql backend.
Jef van Schendel [Sun, 1 Jan 2012 17:14:39 +0000 (18:14 +0100)]
Forgot this one. Also disable horizontal resize for the bio field
Jef van Schendel [Sun, 1 Jan 2012 17:12:18 +0000 (18:12 +0100)]
Remove border-bottom from media_specs
Jef van Schendel [Sun, 1 Jan 2012 17:11:39 +0000 (18:11 +0100)]
Disable horizontal resize for text areas.
Joar Wandborg [Sat, 31 Dec 2011 21:57:08 +0000 (22:57 +0100)]
Fixed submission error handling and broken tests
- Fixed broken test_auth test
- Fixed error handling on submission, it now raises the exception
if it is not explicitly relevant to file submission.
Elrond [Sat, 31 Dec 2011 20:57:51 +0000 (21:57 +0100)]
Merge remote branch 'remotes/joar/tests'
* remotes/joar/tests:
Fixed broken confirm_password test
Joar Wandborg [Wed, 30 Nov 2011 20:21:39 +0000 (21:21 +0100)]
ASCII media type support & fix a bug in file submission error handling
* Added ASCII media processing
* Added ASCII media display
* Added ASCII media type
Rebased from Joar Wandborg's ascii art branch (squashed to remove the
commits borrowing code of dubious license)
Fixed a bug in file submission error handling:
- Moved file-extension condition out of loop (what did it do there?)
- Updated file submission tests
- Changed error handling in file submission, should now report more
than absolutely necessary.
Jef van Schendel [Fri, 30 Dec 2011 20:29:15 +0000 (21:29 +0100)]
Change forgotten password process: different redirect, added/changed messages
Jef van Schendel [Fri, 30 Dec 2011 19:17:59 +0000 (20:17 +0100)]
Fix #712: Comment counter always uses plural
Jef van Schendel [Fri, 30 Dec 2011 18:45:00 +0000 (19:45 +0100)]
Fix #715: On media submit page, "Separate" is misspelled
Joar Wandborg [Fri, 30 Dec 2011 18:11:47 +0000 (19:11 +0100)]
Fixed broken confirm_password test
Jef van Schendel [Fri, 30 Dec 2011 17:01:28 +0000 (18:01 +0100)]
Random changes that break stuff and eat piglets
Jef van Schendel [Fri, 30 Dec 2011 13:23:12 +0000 (14:23 +0100)]
Lots of little fixes and removal of all 960.gs classes:
* Removed <p> margin-top
* Vertically align logo so Add-media button does not fall off
* Remove last 960.gs traces (grid_X/container_X) and add custom classes/sizes to css
* Add clear class
* Update form_box and add form_box_xl for bigger forms
* Switch all pages that use forms to new classes
* Remove padding from notification messages so they take full width
* Other tiny fixes I forgot about
Jef van Schendel [Thu, 29 Dec 2011 21:56:42 +0000 (22:56 +0100)]
Forgot to include the newly created JS file
Jef van Schendel [Thu, 29 Dec 2011 21:54:31 +0000 (22:54 +0100)]
Isolate JavaScript; add new show_password.js to forgot-password-page as well
Jef van Schendel [Thu, 29 Dec 2011 21:40:45 +0000 (22:40 +0100)]
Finished #485 and worked out bugs: password fields always update, added margins, fixed Chrome width bug, wrapped checkbox in label element
Elrond [Sun, 25 Dec 2011 18:09:23 +0000 (19:09 +0100)]
Add a .save method on the sql db objects
This is a shortcut to adding the object to a session (if
needed) and giving a commit on the session.
In reality, calling code should probably utilize the
session on its own and call commit in an appropiate place.
Elrond [Sun, 25 Dec 2011 15:01:25 +0000 (16:01 +0100)]
Support .get(fieldname) on sql db objects
Some parts of the code like to call .get("somefield") on
the db objects. It's easy to support this on sqlalchemy
based objects, so lets do it.
Elrond [Wed, 28 Dec 2011 22:46:36 +0000 (23:46 +0100)]
Fix "bin/gmg migrate" after mongo move
When moving most stuff from db to db/mongo, "gmg migrate"
was left out.
Fix it now!
Elrond [Wed, 28 Dec 2011 22:27:46 +0000 (23:27 +0100)]
Show --log-file option in lazyserver help.
Elrond [Sat, 24 Dec 2011 15:00:05 +0000 (16:00 +0100)]
SQL Model: Add relationship properties
MediaEntry now has a get_uploader (property) loading the
appropiate User object for the MediaEntry (and caches it).
MediaComment has the same for author as get_author.
Elrond [Sat, 24 Dec 2011 17:12:38 +0000 (18:12 +0100)]
SQL Model: Forgot MediaEntry.state field
While creating the new SQL model, the "state" field of
MediaEntry was left out. Currently using a plain unicode
string for it.
Maybe should use sqlalchemy.types.Enum?
Elrond [Sun, 25 Dec 2011 19:03:11 +0000 (20:03 +0100)]
Implement _id proxy on sql objects (on User for now)
So that the old code can access the primary key still as
"._id".
Quite simple Python Descriptor thing.
Very generic.
Elrond [Fri, 23 Dec 2011 23:08:28 +0000 (00:08 +0100)]
Turn media.get_uploader into a property
sqlalchemy gives autoloading (hopefully caching) link to
other objects as properties. So turn get_uploader on the
current mongo based stuff into a property to ease
transition.
Elrond [Tue, 20 Dec 2011 17:47:33 +0000 (18:47 +0100)]
Use media.url_for_self instead of calling urlgen directly
Replace
urlgen('ID', user=media.get_uploader().username, media=media.*)
by
media.url_for_self(urlgen)
in a few places.
It's just a lot nicer!
Elrond [Sun, 25 Dec 2011 19:11:09 +0000 (20:11 +0100)]
Move verification key generation to view
Instead of creating the email verication key on the db
model as a default for the field, create it in the
registration view.
Now all verification key generation is only in
auth/views.py!
Elrond [Sun, 25 Dec 2011 18:58:37 +0000 (19:58 +0100)]
Translate one string
"There doesn't seem to be any media here yet..." is now
translated also here (it's already in the list from another
place).
Elrond [Mon, 19 Dec 2011 21:29:40 +0000 (22:29 +0100)]
Replace media.get_uploader()._id by media.uploader
media.get_uploader()._id loads a complete user object
without actually needing it, because media.uploader already
has the id!
Elrond [Sat, 24 Dec 2011 17:19:40 +0000 (18:19 +0100)]
Improve .one() by using sqlalchemy's .one()