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 [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()
Elrond [Sat, 24 Dec 2011 18:08:20 +0000 (19:08 +0100)]
Add search level one() method
And create a _fix_query_dict which converts '_id' to 'id'.
Elrond [Sun, 18 Dec 2011 21:52:49 +0000 (22:52 +0100)]
Turn MediaComment's author() into get_author property
1) MediaComment's author method conflicts with the author
field. So rename it to get_author.
2) Turn it from a normal function into a python property.
That means you call it by ".get_author" not by
".get_author()". This is exactly what sqlalchemy gives
us free of charge.
Karen Rustad [Thu, 22 Dec 2011 23:45:20 +0000 (15:45 -0800)]
added translation tags to html5 wwarning
Karen Rustad [Mon, 19 Dec 2011 06:50:36 +0000 (22:50 -0800)]
Added a 'you don't have HTML5 so this video will not work' warning using just the inherent properties of the <video> tag (and some css for style)
Elrond [Tue, 20 Dec 2011 23:34:02 +0000 (00:34 +0100)]
Note reported bug in workaround
So that the workaround can eventually be removed, note the
URL for the relevant bug in a comment.
Elrond [Tue, 20 Dec 2011 23:06:38 +0000 (00:06 +0100)]
Workaround for Routes/urlgen bug.
This is relevant for fcgi:
Some servers (cherokee for example) put "HTTP":"off" in the
environ. And the following code in urlgen breaks on this:
if environ.get('HTTPS') or environ.get('wsgi.url_scheme') == 'https' \
or environ.get('HTTP_X_FORWARDED_PROTO') == 'https':
hostinfo['protocol'] = 'https'
workaround is to remove HTTPS:off from the environ.
Elrond [Tue, 20 Dec 2011 21:58:16 +0000 (22:58 +0100)]
Merge remote branch 'remotes/joar/webfinger'
* remotes/joar/webfinger:
Added references to docstring in mediagoblin.webfinger
Removed mediagoblin.tools.feed which was accidentally included
Polishing the webfinger implementation
webfinger fully compliant with webfinger.org! Still *preliminary* solution.
Changed some thngs to be compatible with webfinger.org, still *very preliminary*
Added *very preliminary* support for webfinger
Joar Wandborg [Tue, 20 Dec 2011 21:55:13 +0000 (22:55 +0100)]
Added references to docstring in mediagoblin.webfinger
and mediagoblin.webfinger.views [references mediagoblin.webfinger]
Joar Wandborg [Tue, 20 Dec 2011 21:13:43 +0000 (22:13 +0100)]
Removed mediagoblin.tools.feed which was accidentally included
Joar Wandborg [Tue, 20 Dec 2011 21:06:36 +0000 (22:06 +0100)]
Polishing the webfinger implementation
- Changed quotes in the templates from " to '
- Changed all link generation to use request.urlgen
- Moved xrd links data generation from template to view
- Added parsing of the account URI using urlparse
Elrond [Tue, 20 Dec 2011 19:41:21 +0000 (20:41 +0100)]
Move db/models.py -> db/mongo/models.py
To my surprise, there was only ONE reference to models.py.
From open.py.
Elrond [Tue, 20 Dec 2011 19:33:33 +0000 (20:33 +0100)]
Move db/migrations.py -> db/mongo/migrations.py
And change references.
Elrond [Tue, 20 Dec 2011 18:35:47 +0000 (19:35 +0100)]
Move db/util.py -> db/mongo/util.py
- Change some reference
- Provide a wrapper db/util.py
Elrond [Tue, 20 Dec 2011 18:20:09 +0000 (19:20 +0100)]
Move db/indexes.py to db/mongo/indexes.py
And change references (one!).
Elrond [Tue, 20 Dec 2011 18:06:04 +0000 (19:06 +0100)]
Move db/open.py to db/mongo/open.py
Starting to move the mongo specific stuff into db/mongo.
And create thin "from db.mongo.Y import z" wrappers in
db/Y.py.
Why?
1) Will make it lots easier to switch to sql for
testing/developing.
2) The mongo stuff needs to stay around after moving to
sql, because the converter needs it.
Elrond [Sun, 18 Dec 2011 16:02:27 +0000 (17:02 +0100)]
SQL: mongokit like interface
In trying to ease the migration to SQL, created an
interface to sqlalchemy that looks a lot like the interface
that is currently in use.
*WARNING* Work in progress
Jef van Schendel [Sat, 17 Dec 2011 23:31:39 +0000 (00:31 +0100)]
Show actual comment number. Only shows plural for now (ticket #712)
Elrond [Sat, 17 Dec 2011 20:37:02 +0000 (21:37 +0100)]
Simple Mongo -> SQL migration tool
This is just a start at a Migration tool from Mongo to SQL.
It fills all currently available SQL models with data from
MongoDB. A few fields in the SQL tables are left out,
because some data format migrations are needed (notably:
queue_file_name).
This thing lives in mediagoblin/db/sql/convert.py because
it has a lot of stuff hardcoded and is not, repeat not for
end users!
Hard coded:
- output database: ./mediagoblin.db (sqlite)
- Mediagoblin config: ./mediagoblin.ini
Elrond [Sat, 17 Dec 2011 16:34:55 +0000 (17:34 +0100)]
Little sql model update
- Add title to the MediaEntry
- Rename fp_verification_expire to fp_token_expire to
follow the mongo model.
Joar Wandborg [Thu, 15 Dec 2011 22:49:52 +0000 (23:49 +0100)]
Fixed import_export
- Mongokit instead of pymongo
- db.MediaEntry instead of db.media_entry (pymongo style)
Elrond [Thu, 15 Dec 2011 21:11:49 +0000 (22:11 +0100)]
SQL: Some toys and little fix
Run bin/python mediagoblin/db/sql/models.py and watch the
create tables on a memory sqlite db.
Also unicode strings need unicode defauls. Warning by
sqlalchemy.
Elrond [Thu, 15 Dec 2011 20:15:21 +0000 (21:15 +0100)]
Move sql models into db/sql/
So we can play with the sql models, let's put them in a
proper place.
Elrond [Thu, 15 Dec 2011 20:10:01 +0000 (21:10 +0100)]
Merge remote branch 'remotes/cwebber/sqlalchemy'
* remotes/cwebber/sqlalchemy:
Beginnings of sqlalchemy models
Joar Wandborg [Thu, 15 Dec 2011 18:35:53 +0000 (19:35 +0100)]
webfinger fully compliant with webfinger.org! Still *preliminary* solution.
Will Kahn-Greene [Thu, 15 Dec 2011 14:27:56 +0000 (09:27 -0500)]
Fix -dev version and add version number docs
Version numbers should adhere to PEP-386.
Joar Wandborg [Wed, 14 Dec 2011 23:58:14 +0000 (00:58 +0100)]
Changed some thngs to be compatible with webfinger.org, still *very preliminary*
Joar Wandborg [Wed, 14 Dec 2011 23:46:10 +0000 (00:46 +0100)]
Added *very preliminary* support for webfinger
Jef van Schendel [Wed, 14 Dec 2011 15:42:40 +0000 (16:42 +0100)]
Change "Submit" to "Add" for ticket #466
Jef van Schendel [Wed, 14 Dec 2011 15:36:29 +0000 (16:36 +0100)]
Remove "X license" placeholder from media page
Jef van Schendel [Wed, 14 Dec 2011 15:18:26 +0000 (16:18 +0100)]
Change wording for change_fp; improved the button text
Elrond [Tue, 13 Dec 2011 20:35:15 +0000 (21:35 +0100)]
Merge remote branch 'joar/b681-comments_from_reviewing_video'
* joar/b681-comments_from_reviewing_video:
Bug 681 - Comments from reviewing the new video merge
Jef van Schendel [Tue, 13 Dec 2011 14:15:57 +0000 (15:15 +0100)]
Merge jQuery branch, resolve conflicts
Elrond [Mon, 12 Dec 2011 17:53:03 +0000 (18:53 +0100)]
Merge branch 'sql/dot-notation'
* sql/dot-notation:
Dot-Notation for MediaEntry.media_data
Dot-Notation for MediaEntry.media_type
Dot-Notation for MediaEntry.description(_html)
Dot-Notation for MediaEntry.slug
Dot-Notation for MediaEntry.title
Dot-Notation for MediaEntry.uploader
Dot-Notation for MediaEntry.created
Dot-Notation: tests/test_edit.py
Dot-Notation for Users.fp_token_expire
Dot-Notation for Users.fp_verification_key
Dot-Notation for Users.bio and .bio_html
Dot-Notation for Users.url
Dot-Notation for Users.is_admin
Dot-Notation for Users.verification_key
Dot-Notation for Users.status
Dot-Notation for Users.email_verified
Dot-Notation for Users.pw_hash
Dot-Notation for Users.email
Dot-Notation for Users.username
Will Kahn-Greene [Mon, 12 Dec 2011 16:52:24 +0000 (11:52 -0500)]
Changer version to -dev
Will Kahn-Greene [Mon, 12 Dec 2011 16:41:29 +0000 (11:41 -0500)]
Update version numbers
Will Kahn-Greene [Mon, 12 Dec 2011 16:12:59 +0000 (11:12 -0500)]
Fix doc footer
This has the correct copyright statement.
Will Kahn-Greene [Mon, 12 Dec 2011 15:48:24 +0000 (10:48 -0500)]
Tweak rest formatting
Christopher Allan Webber [Mon, 12 Dec 2011 15:45:45 +0000 (09:45 -0600)]
Updated translations
Christopher Allan Webber [Mon, 12 Dec 2011 15:44:48 +0000 (09:44 -0600)]
Added the "Media types" chapter
Will Kahn-Greene [Mon, 12 Dec 2011 15:20:05 +0000 (10:20 -0500)]
Doc updates
* fixed some language
* fixed some consistency issues
* fixed some 80-line-width issues
* fixed some typos and markup problems
Will Kahn-Greene [Mon, 12 Dec 2011 15:17:03 +0000 (10:17 -0500)]
Add some documentation to lazyserver.sh
I had no idea what it did, so I asked and tossed the answer at the
top of the script.
Will Kahn-Greene [Mon, 12 Dec 2011 14:53:41 +0000 (09:53 -0500)]
Update README
* tweaked some language
* fixed some statements that aren't correct anymore
Will Kahn-Greene [Mon, 12 Dec 2011 14:46:23 +0000 (09:46 -0500)]
Tweak runtests to be more helpful
If nose isn't installed, then runtests.sh says it can't find nosetests
and exits, but doesn't tell you what you need to do to fix the situation.
This fixes that.
Christopher Allan Webber [Mon, 12 Dec 2011 14:15:16 +0000 (08:15 -0600)]
Removed extraneous whitespace from video.html
Christopher Allan Webber [Mon, 12 Dec 2011 14:13:46 +0000 (08:13 -0600)]
Add a note on how to up the upload size limit
Christopher Allan Webber [Mon, 12 Dec 2011 14:10:10 +0000 (08:10 -0600)]
Allow administrators to disable keeping the original. That's the new default!
Christopher Allan Webber [Mon, 12 Dec 2011 13:35:47 +0000 (07:35 -0600)]
Mark "newer/older" buttons for translation
Jef van Schendel [Sat, 10 Dec 2011 20:03:18 +0000 (21:03 +0100)]
Style changes for media_uploader (now media_specs); removed margins from button_action buttons
Jef van Schendel [Sat, 10 Dec 2011 18:58:02 +0000 (19:58 +0100)]
Remove pagination images and replace them with unicode characters
Jef van Schendel [Fri, 9 Dec 2011 22:47:11 +0000 (23:47 +0100)]
Change wording in tags.html
Jef van Schendel [Fri, 9 Dec 2011 21:48:20 +0000 (22:48 +0100)]
Open Markdown link in new windows; I know _blank is sometimes frowned upon but it may be useful here
Jef van Schendel [Fri, 9 Dec 2011 21:45:26 +0000 (22:45 +0100)]
Only apply textarea style to comment box
Jef van Schendel [Fri, 9 Dec 2011 21:37:20 +0000 (22:37 +0100)]
Lots of changes to media page; rearranged things, added new styles, added jquery bits, gave the comment section a refresh
Jef van Schendel [Wed, 7 Dec 2011 21:15:48 +0000 (22:15 +0100)]
Move author text, "By X", to the sidebar
Joar Wandborg [Tue, 6 Dec 2011 22:05:47 +0000 (23:05 +0100)]
Bug 681 - Comments from reviewing the new video merge
in mediagoblin.media_types and submodules
- Moved VideoThumbnailer.errors initialization to VideoThumbnailer.__init__
- Cleaned up the image.processing imports
- Removed default ``None`` from get_media_manager(_media_type)
in mediagoblin.views
- Removed media_types import
- Removed sys import, and passing of sys to root.html template