mediagoblin.git
12 years agoFixed #724 and added extra infos to the atom feed (author uri and links to the html...
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)

12 years agoCommitting extracted and compiled translations
Christopher Allan Webber [Sat, 7 Jan 2012 19:48:12 +0000 (13:48 -0600)]
Committing extracted and compiled translations

12 years agoCommitting present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Sat, 7 Jan 2012 19:47:33 +0000 (13:47 -0600)]
Committing present MediaGoblin translations before pushing extracted messages

12 years agoIncrease docs sidebar width
Jef van Schendel [Fri, 6 Jan 2012 23:04:38 +0000 (00:04 +0100)]
Increase docs sidebar width

12 years agoNew docs logo, small css changes
Jef van Schendel [Fri, 6 Jan 2012 22:58:43 +0000 (23:58 +0100)]
New docs logo, small css changes

12 years agoFirst push with new style (includes css file, logo image, fonts)
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)

12 years agoFix div breaking in user.html; add media query bits
Jef van Schendel [Fri, 6 Jan 2012 12:44:00 +0000 (13:44 +0100)]
Fix div breaking in user.html; add media query bits

12 years agoResize image below 660px width
Jef van Schendel [Fri, 6 Jan 2012 12:34:25 +0000 (13:34 +0100)]
Resize image below 660px width

12 years ago* Rename mediagoblin_header, mediagoblin_body, mediagoblin_footer, mediagoblin_header...
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)

12 years agoAdd closing bracket so the whole thing doesn't break down
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

12 years agoRemove last 960.gs leftover; fix classes for edit forms
Jef van Schendel [Thu, 5 Jan 2012 20:52:28 +0000 (21:52 +0100)]
Remove last 960.gs leftover; fix classes for edit forms

12 years agoFix merge conflicts
Jef van Schendel [Thu, 5 Jan 2012 20:42:56 +0000 (21:42 +0100)]
Fix merge conflicts

12 years agoSeveral changes for mobile layout
Jef van Schendel [Thu, 5 Jan 2012 20:36:24 +0000 (21:36 +0100)]
Several changes for mobile layout

12 years agoAlways show 'Change account settings' link
Jef van Schendel [Thu, 5 Jan 2012 14:58:03 +0000 (15:58 +0100)]
Always show 'Change account settings' link

12 years agoFix Unit Tests for new password changing
Elrond [Thu, 5 Jan 2012 13:54:03 +0000 (14:54 +0100)]
Fix Unit Tests for new password changing

12 years agoMake show-password-js work for change password too
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.

12 years agoFix more StrictUndefined issues
Elrond [Thu, 5 Jan 2012 13:46:27 +0000 (14:46 +0100)]
Fix more StrictUndefined issues

12 years agoAdd change-account-settings link to user.html
Jef van Schendel [Wed, 4 Jan 2012 23:18:29 +0000 (00:18 +0100)]
Add change-account-settings link to user.html

12 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Jef van Schendel [Wed, 4 Jan 2012 23:17:51 +0000 (00:17 +0100)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

12 years agoCreate edit_account.html
Jef van Schendel [Wed, 4 Jan 2012 23:17:45 +0000 (00:17 +0100)]
Create edit_account.html

12 years agof691: Use StrictUndefined for templates and fix some issues
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.

12 years agoImport MigrationManager from mongo in mongo backend.
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.

12 years agoAdd Markdown for submit page, edit page, profile edit page; thus fixing ticket #690
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

12 years agoDot-Notation for MediaEntry.queued_media_file
Elrond [Tue, 13 Dec 2011 10:18:39 +0000 (11:18 +0100)]
Dot-Notation for MediaEntry.queued_media_file

12 years agoDot-Notation for MediaEntry.state
Elrond [Tue, 13 Dec 2011 09:49:51 +0000 (10:49 +0100)]
Dot-Notation for MediaEntry.state

12 years agoDot-Notation for MediaEntry.media_files
Elrond [Wed, 4 Jan 2012 10:57:08 +0000 (11:57 +0100)]
Dot-Notation for MediaEntry.media_files

12 years agosql convert: Use more library functions
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.

12 years agoSeperate jQuery bit that was still in media.html
Jef van Schendel [Sun, 1 Jan 2012 21:58:32 +0000 (22:58 +0100)]
Seperate jQuery bit that was still in media.html

12 years agoFix unit tests for new forget password flow
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.

12 years agoRemove fp_changed_success.html, use log in page + notification message instead
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

12 years agoRemove fp_email_sent.html and refs to it
Jef van Schendel [Sun, 1 Jan 2012 18:00:56 +0000 (19:00 +0100)]
Remove fp_email_sent.html and refs to it

12 years agoFactor out check_db_migrations_current
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.

12 years agoForgot this one. Also disable horizontal resize for the bio field
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

12 years agoRemove border-bottom from media_specs
Jef van Schendel [Sun, 1 Jan 2012 17:12:18 +0000 (18:12 +0100)]
Remove border-bottom from media_specs

12 years agoDisable horizontal resize for text areas.
Jef van Schendel [Sun, 1 Jan 2012 17:11:39 +0000 (18:11 +0100)]
Disable horizontal resize for text areas.

12 years agoFixed submission error handling and broken tests
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.

12 years agoMerge remote branch 'remotes/joar/tests'
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

12 years agoASCII media type support & fix a bug in file submission error handling
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.

12 years agoChange forgotten password process: different redirect, added/changed messages
Jef van Schendel [Fri, 30 Dec 2011 20:29:15 +0000 (21:29 +0100)]
Change forgotten password process: different redirect, added/changed messages

12 years agoFix #712: Comment counter always uses plural
Jef van Schendel [Fri, 30 Dec 2011 19:17:59 +0000 (20:17 +0100)]
Fix #712: Comment counter always uses plural

12 years agoFix #715: On media submit page, "Separate" is misspelled
Jef van Schendel [Fri, 30 Dec 2011 18:45:00 +0000 (19:45 +0100)]
Fix #715: On media submit page, "Separate" is misspelled

12 years agoFixed broken confirm_password test
Joar Wandborg [Fri, 30 Dec 2011 18:11:47 +0000 (19:11 +0100)]
Fixed broken confirm_password test

12 years agoRandom changes that break stuff and eat piglets
Jef van Schendel [Fri, 30 Dec 2011 17:01:28 +0000 (18:01 +0100)]
Random changes that break stuff and eat piglets

12 years agoLots of little fixes and removal of all 960.gs classes:
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

12 years agoForgot to include the newly created JS file
Jef van Schendel [Thu, 29 Dec 2011 21:56:42 +0000 (22:56 +0100)]
Forgot to include the newly created JS file

12 years agoIsolate JavaScript; add new show_password.js to forgot-password-page as well
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

12 years agoFinished #485 and worked out bugs: password fields always update, added margins,...
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

12 years agoAdd a .save method on the sql db objects
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.

12 years agoSupport .get(fieldname) on sql db objects
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.

12 years agoFix "bin/gmg migrate" after mongo move
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!

12 years agoShow --log-file option in lazyserver help.
Elrond [Wed, 28 Dec 2011 22:27:46 +0000 (23:27 +0100)]
Show --log-file option in lazyserver help.

12 years agoSQL Model: Add relationship properties
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.

12 years agoSQL Model: Forgot MediaEntry.state field
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?

12 years agoImplement _id proxy on sql objects (on User for now)
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.

12 years agoTurn media.get_uploader into a property
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.

12 years agoUse media.url_for_self instead of calling urlgen directly
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!

12 years agoMove verification key generation to view
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!

12 years agoTranslate one string
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).

12 years agoReplace media.get_uploader()._id by media.uploader
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!

12 years agoImprove .one() by using sqlalchemy's .one()
Elrond [Sat, 24 Dec 2011 17:19:40 +0000 (18:19 +0100)]
Improve .one() by using sqlalchemy's .one()

12 years agoAdd search level one() method
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'.

12 years agoTurn MediaComment's author() into get_author property
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.

12 years agoadded translation tags to html5 wwarning
Karen Rustad [Thu, 22 Dec 2011 23:45:20 +0000 (15:45 -0800)]
added translation tags to html5 wwarning

12 years agoAdded a 'you don't have HTML5 so this video will not work' warning using just the...
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)

12 years agoNote reported bug in workaround
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.

12 years agoWorkaround for Routes/urlgen bug.
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.

12 years agoMerge remote branch 'remotes/joar/webfinger'
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

12 years agoAdded references to docstring in mediagoblin.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]

12 years agoRemoved mediagoblin.tools.feed which was accidentally included
Joar Wandborg [Tue, 20 Dec 2011 21:13:43 +0000 (22:13 +0100)]
Removed mediagoblin.tools.feed which was accidentally included

12 years agoPolishing the webfinger implementation
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

12 years agoMove db/models.py -> db/mongo/models.py
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.

12 years agoMove db/migrations.py -> db/mongo/migrations.py
Elrond [Tue, 20 Dec 2011 19:33:33 +0000 (20:33 +0100)]
Move db/migrations.py -> db/mongo/migrations.py

And change references.

12 years agoMove db/util.py -> db/mongo/util.py
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

12 years agoMove db/indexes.py to db/mongo/indexes.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!).

12 years agoMove db/open.py to db/mongo/open.py
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.

12 years agoSQL: mongokit like interface
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

12 years agoChange widths to percentages for small devices
Jef van Schendel [Sun, 18 Dec 2011 01:07:49 +0000 (02:07 +0100)]
Change widths to percentages for small devices

12 years agoAdd styles to make media.html not fall apart entirely
Jef van Schendel [Sun, 18 Dec 2011 00:54:58 +0000 (01:54 +0100)]
Add styles to make media.html not fall apart entirely

12 years agoMove reset.css to extlib and symlink it
Jef van Schendel [Sun, 18 Dec 2011 00:41:01 +0000 (01:41 +0100)]
Move reset.css to extlib and symlink it

12 years agoRemove first 960.gs classes
Jef van Schendel [Sun, 18 Dec 2011 00:37:57 +0000 (01:37 +0100)]
Remove first 960.gs classes

12 years agoMedia query for everything(?) below 960px wide
Jef van Schendel [Sun, 18 Dec 2011 00:32:13 +0000 (01:32 +0100)]
Media query for everything(?) below 960px wide

12 years agoRemove 960.gs stylesheets, add Eric Meyer's reset.css
Jef van Schendel [Sun, 18 Dec 2011 00:31:06 +0000 (01:31 +0100)]
Remove 960.gs stylesheets, add Eric Meyer's reset.css

12 years agoFirst test lines for responsive design
Jef van Schendel [Sun, 18 Dec 2011 00:04:41 +0000 (01:04 +0100)]
First test lines for responsive design

12 years agoShow actual comment number. Only shows plural for now (ticket #712)
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)

12 years agoSimple Mongo -> SQL migration tool
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

12 years agoLittle sql model update
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.

12 years agoFixed import_export
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)

12 years agoSQL: Some toys and little fix
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.

12 years agoMove sql models into db/sql/
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.

12 years agoMerge remote branch 'remotes/cwebber/sqlalchemy'
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

12 years agowebfinger fully compliant with webfinger.org! Still *preliminary* solution.
Joar Wandborg [Thu, 15 Dec 2011 18:35:53 +0000 (19:35 +0100)]
webfinger fully compliant with webfinger.org! Still *preliminary* solution.

12 years agoFix -dev version and add version number docs
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.

12 years agoChanged some thngs to be compatible with webfinger.org, still *very preliminary*
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*

12 years agoAdded *very preliminary* support for webfinger
Joar Wandborg [Wed, 14 Dec 2011 23:46:10 +0000 (00:46 +0100)]
Added *very preliminary* support for webfinger

12 years agoChange "Submit" to "Add" for ticket #466
Jef van Schendel [Wed, 14 Dec 2011 15:42:40 +0000 (16:42 +0100)]
Change "Submit" to "Add" for ticket #466

12 years agoRemove "X license" placeholder from media page
Jef van Schendel [Wed, 14 Dec 2011 15:36:29 +0000 (16:36 +0100)]
Remove "X license" placeholder from media page

12 years agoChange wording for change_fp; improved the button text
Jef van Schendel [Wed, 14 Dec 2011 15:18:26 +0000 (16:18 +0100)]
Change wording for change_fp; improved the button text

12 years agoMerge remote branch 'joar/b681-comments_from_reviewing_video'
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

12 years agoMerge jQuery branch, resolve conflicts
Jef van Schendel [Tue, 13 Dec 2011 14:15:57 +0000 (15:15 +0100)]
Merge jQuery branch, resolve conflicts

12 years agoMerge branch 'sql/dot-notation'
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