1686 Commits

Author SHA1 Message Date
Elrond
d44140a212 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
2011-12-12 18:53:03 +01:00
Will Kahn-Greene
6ae878e730 Changer version to -dev 2011-12-12 11:52:24 -05:00
Will Kahn-Greene
449f58e446 Update version numbers 2011-12-12 11:41:29 -05:00
Will Kahn-Greene
a46f645e7f Fix doc footer
This has the correct copyright statement.
2011-12-12 11:12:59 -05:00
Will Kahn-Greene
e91a4dcb73 Tweak rest formatting 2011-12-12 10:48:24 -05:00
Christopher Allan Webber
57875c83c2 Updated translations 2011-12-12 09:45:53 -06:00
Christopher Allan Webber
9bc2fc6c6a Added the "Media types" chapter 2011-12-12 09:44:48 -06:00
Will Kahn-Greene
076bf0cf28 Doc updates
* fixed some language
* fixed some consistency issues
* fixed some 80-line-width issues
* fixed some typos and markup problems
2011-12-12 10:20:05 -05:00
Will Kahn-Greene
78dc055e22 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.
2011-12-12 10:17:03 -05:00
Will Kahn-Greene
5b9ef3d58f Update README
* tweaked some language
* fixed some statements that aren't correct anymore
2011-12-12 09:53:41 -05:00
Will Kahn-Greene
528c8b8fab 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.
2011-12-12 09:46:23 -05:00
Christopher Allan Webber
c36c378273 Removed extraneous whitespace from video.html 2011-12-12 08:15:16 -06:00
Christopher Allan Webber
438dd8cd8f Add a note on how to up the upload size limit 2011-12-12 08:13:46 -06:00
Christopher Allan Webber
23caf305f2 Allow administrators to disable keeping the original. That's the new default! 2011-12-12 08:10:10 -06:00
Christopher Allan Webber
ed1840ee64 Mark "newer/older" buttons for translation 2011-12-12 07:35:47 -06:00
Jef van Schendel
b27067371d Style changes for media_uploader (now media_specs); removed margins from button_action buttons 2011-12-10 21:03:18 +01:00
Jef van Schendel
4ad9ac5ae0 Remove pagination images and replace them with unicode characters 2011-12-10 19:58:02 +01:00
Jef van Schendel
de73724066 Change wording in tags.html 2011-12-09 23:47:11 +01:00
Jef van Schendel
8f25d91b1e Open Markdown link in new windows; I know _blank is sometimes frowned upon but it may be useful here 2011-12-09 22:48:20 +01:00
Jef van Schendel
9c6d8d77fb Only apply textarea style to comment box 2011-12-09 22:45:26 +01:00
Jef van Schendel
75a12d632d Lots of changes to media page; rearranged things, added new styles, added jquery bits, gave the comment section a refresh 2011-12-09 22:37:20 +01:00
Jef van Schendel
3f45d9fbe8 Move author text, "By X", to the sidebar 2011-12-07 22:15:48 +01:00
Joar Wandborg
4535f7597f 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
2011-12-06 23:05:47 +01:00
Elrond
ddc1cae9ea Dot-Notation for MediaEntry.media_data 2011-12-05 21:08:58 +01:00
Elrond
f4ee839939 Dot-Notation for MediaEntry.media_type 2011-12-05 21:08:58 +01:00
Elrond
1d93996604 Dot-Notation for MediaEntry.description(_html) 2011-12-05 21:08:58 +01:00
Elrond
5da0bf901b Dot-Notation for MediaEntry.slug 2011-12-05 21:08:58 +01:00
Elrond
ec82fbd85c Dot-Notation for MediaEntry.title 2011-12-05 21:08:58 +01:00
Elrond
1ceb4fc868 Dot-Notation for MediaEntry.uploader 2011-12-05 21:08:58 +01:00
Elrond
0547843020 Dot-Notation for MediaEntry.created 2011-12-05 21:08:58 +01:00
Elrond
4ec5717a17 Dot-Notation: tests/test_edit.py
convert tests/test_edit.py over to Dot-Notation. It only
accesses the User object.
2011-12-05 21:08:58 +01:00
Elrond
2d540fed8b Dot-Notation for Users.fp_token_expire 2011-12-05 21:08:58 +01:00
Elrond
dc39e4555c Dot-Notation for Users.fp_verification_key 2011-12-05 21:08:58 +01:00
Elrond
4b77f86ab4 Dot-Notation for Users.bio and .bio_html 2011-12-05 21:08:58 +01:00
Elrond
a24e5133ed Dot-Notation for Users.url 2011-12-05 21:08:58 +01:00
Elrond
bec591d85b Dot-Notation for Users.is_admin 2011-12-05 21:08:57 +01:00
Elrond
00bb95502e Dot-Notation for Users.verification_key 2011-12-05 21:08:57 +01:00
Elrond
7a3d00ec21 Dot-Notation for Users.status 2011-12-05 21:08:57 +01:00
Elrond
4facc7a0a2 Dot-Notation for Users.email_verified 2011-12-05 21:08:57 +01:00
Elrond
9047b254f3 Dot-Notation for Users.pw_hash 2011-12-05 21:08:57 +01:00
Elrond
809cbfc5ab Dot-Notation for Users.email 2011-12-05 21:08:57 +01:00
Elrond
5a4e3ff1e2 Dot-Notation for Users.username 2011-12-05 21:08:57 +01:00
Christopher Allan Webber
5b5b67cd5c Update comment URLs to use the media slug. 2011-12-05 08:37:20 -06:00
Christopher Allan Webber
bcc9ee3205 Update the delete item to use the _id after all... it's the safest way.
See http://bugs.foocorp.net/issues/695
2011-12-05 08:35:42 -06:00
Christopher Allan Webber
38f102515a Cloudfiles not actually a dependency, removing from setup.py
If users want cloudfiles, they can always ./bin/easy_install it.
2011-12-04 23:58:58 -06:00
Christopher Allan Webber
04b0b7a124 Merge remote-tracking branch 'remotes/lorochka85/bug852_use_media_slug_instead_of_id'
Conflicts:
	mediagoblin/decorators.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
	mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
2011-12-04 23:14:08 -06:00
tycho garen
a085dda5d2 DOCS:: #675 revision to deployment and production documents 2011-12-04 17:09:39 -05:00
Christopher Allan Webber
4752fdcf06 Filled in reason #3 to submit separate out celery. 2011-12-04 15:27:00 -06:00
Christopher Allan Webber
2ef0679790 Fix button word-wrapping issue 2011-12-04 14:39:42 -06:00
Christopher Allan Webber
83b581e425 Merge remote-tracking branch 'tychoish/master' 2011-12-04 13:59:13 -06:00