aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix #712: Comment counter always uses pluralJef van Schendel2011-12-301-40/+46
|
* Fix #715: On media submit page, "Separate" is misspelledJef van Schendel2011-12-302-2/+2
|
* Forgot to include the newly created JS fileJef van Schendel2011-12-291-0/+19
|
* Isolate JavaScript; add new show_password.js to forgot-password-page as wellJef van Schendel2011-12-293-28/+8
|
* Finished #485 and worked out bugs: password fields always update, added ↵Jef van Schendel2011-12-292-1/+10
| | | | margins, fixed Chrome width bug, wrapped checkbox in label element
* Add a .save method on the sql db objectsElrond2011-12-291-1/+9
| | | | | | | | 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.
* Support .get(fieldname) on sql db objectsElrond2011-12-291-0/+3
| | | | | | 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.
* Fix "bin/gmg migrate" after mongo moveElrond2011-12-281-2/+2
| | | | | | | When moving most stuff from db to db/mongo, "gmg migrate" was left out. Fix it now!
* Show --log-file option in lazyserver help.Elrond2011-12-281-1/+1
|
* SQL Model: Add relationship propertiesElrond2011-12-281-0/+5
| | | | | | 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.
* SQL Model: Forgot MediaEntry.state fieldElrond2011-12-282-1/+2
| | | | | | | | 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?
* Implement _id proxy on sql objects (on User for now)Elrond2011-12-281-0/+14
| | | | | | | | So that the old code can access the primary key still as "._id". Quite simple Python Descriptor thing. Very generic.
* Turn media.get_uploader into a propertyElrond2011-12-277-13/+14
| | | | | | | 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.
* Use media.url_for_self instead of calling urlgen directlyElrond2011-12-272-12/+6
| | | | | | | | | 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!
* Move verification key generation to viewElrond2011-12-272-2/+1
| | | | | | | | 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!
* Translate one stringElrond2011-12-251-1/+5
| | | | | | "There doesn't seem to be any media here yet..." is now translated also here (it's already in the list from another place).
* Replace media.get_uploader()._id by media.uploaderElrond2011-12-242-4/+4
| | | | | | media.get_uploader()._id loads a complete user object without actually needing it, because media.uploader already has the id!
* Improve .one() by using sqlalchemy's .one()Elrond2011-12-241-3/+1
|
* Add search level one() methodElrond2011-12-241-0/+13
| | | | And create a _fix_query_dict which converts '_id' to 'id'.
* Turn MediaComment's author() into get_author propertyElrond2011-12-232-2/+3
| | | | | | | | | 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.
* added translation tags to html5 wwarningKaren Rustad2011-12-231-2/+6
|
* Added a 'you don't have HTML5 so this video will not work' warning using ↵Karen Rustad2011-12-232-0/+13
| | | | just the inherent properties of the <video> tag (and some css for style)
* Note reported bug in workaroundElrond2011-12-211-0/+1
| | | | | So that the workaround can eventually be removed, note the URL for the relevant bug in a comment.
* Workaround for Routes/urlgen bug.Elrond2011-12-211-0/+4
| | | | | | | | | | | | 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.
* Merge remote branch 'remotes/joar/webfinger'Elrond2011-12-206-0/+225
|\ | | | | | | | | | | | | | | | | | | * 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
| * Added references to docstring in mediagoblin.webfingerJoar Wandborg2011-12-202-0/+13
| | | | | | | | and mediagoblin.webfinger.views [references mediagoblin.webfinger]
| * Removed mediagoblin.tools.feed which was accidentally includedJoar Wandborg2011-12-201-527/+0
| |
| * Polishing the webfinger implementationJoar Wandborg2011-12-204-30/+623
| | | | | | | | | | | | | | - 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
| * webfinger fully compliant with webfinger.org! Still *preliminary* solution.Joar Wandborg2011-12-151-1/+1
| |
| * Changed some thngs to be compatible with webfinger.org, still *very preliminary*Joar Wandborg2011-12-152-2/+5
| |
| * Added *very preliminary* support for webfingerJoar Wandborg2011-12-156-0/+143
| |
* | Move db/models.py -> db/mongo/models.pyElrond2011-12-202-1/+1
| | | | | | | | | | To my surprise, there was only ONE reference to models.py. From open.py.
* | Move db/migrations.py -> db/mongo/migrations.pyElrond2011-12-204-3/+3
| | | | | | | | And change references.
* | Move db/util.py -> db/mongo/util.pyElrond2011-12-205-279/+297
| | | | | | | | | | - Change some reference - Provide a wrapper db/util.py
* | Move db/indexes.py to db/mongo/indexes.pyElrond2011-12-202-1/+1
| | | | | | | | And change references (one!).
* | Move db/open.py to db/mongo/open.pyElrond2011-12-203-39/+71
| | | | | | | | | | | | | | | | | | | | | | | | 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.
* | SQL: mongokit like interfaceElrond2011-12-184-2/+54
| | | | | | | | | | | | | | | | 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
* | Show actual comment number. Only shows plural for now (ticket #712)Jef van Schendel2011-12-181-1/+1
| |
* | Simple Mongo -> SQL migration toolElrond2011-12-171-0/+143
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Little sql model updateElrond2011-12-171-1/+2
| | | | | | | | | | | | - Add title to the MediaEntry - Rename fp_verification_expire to fp_token_expire to follow the mongo model.
* | Fixed import_exportJoar Wandborg2011-12-151-5/+5
| | | | | | | | | | - Mongokit instead of pymongo - db.MediaEntry instead of db.media_entry (pymongo style)
* | SQL: Some toys and little fixElrond2011-12-151-1/+12
| | | | | | | | | | | | | | | | 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.
* | Move sql models into db/sql/Elrond2011-12-152-0/+15
| | | | | | | | | | So we can play with the sql models, let's put them in a proper place.
* | Merge remote branch 'remotes/cwebber/sqlalchemy'Elrond2011-12-151-0/+95
|\ \ | | | | | | | | | | | | * remotes/cwebber/sqlalchemy: Beginnings of sqlalchemy models
| * | Beginnings of sqlalchemy modelsChristopher Allan Webber2011-11-171-0/+95
| | |
* | | Fix -dev version and add version number docsWill Kahn-Greene2011-12-151-1/+10
| |/ |/| | | | | Version numbers should adhere to PEP-386.
* | Change "Submit" to "Add" for ticket #466Jef van Schendel2011-12-142-3/+3
| |
* | Remove "X license" placeholder from media pageJef van Schendel2011-12-141-1/+1
| |
* | Change wording for change_fp; improved the button textJef van Schendel2011-12-141-2/+2
| |
* | Merge remote branch 'joar/b681-comments_from_reviewing_video'Elrond2011-12-134-17/+23
|\ \ | | | | | | | | | | | | * joar/b681-comments_from_reviewing_video: Bug 681 - Comments from reviewing the new video merge