1188 Commits

Author SHA1 Message Date
Aaron Williamson
91e42c467d Merge branch 'mediagoblin-upstream' into bug444_fix_utils_py_redux 2011-10-01 18:09:49 -04:00
Aaron Williamson
152a3bfaa3 Finished splitting util.py into separate files. 2011-10-01 18:05:44 -04:00
Aaron Williamson
03ae172a60 Finished splitting util.py into separate files. 2011-10-01 18:05:17 -04:00
Aaron Williamson
7ce09f6ac4 Merge branch 'mediagoblin-upstream' into bug444_fix_utils_py_redux 2011-10-01 09:32:43 -04:00
Aaron Williamson
ae3bc7fabf Moved common, translation, template, and url code out of util.py and into tools/[file].py 2011-10-01 09:31:42 -04:00
Elrond
bf33272f03 Give debug message in email debug mode
If the server is running in email debug mode (current
default), users have often asked where the mail is. So tell
them in the web browser that their mail is on the console.
2011-09-30 22:27:47 +02:00
Christopher Allan Webber
573aba86b5 Merge remote branch 'remotes/elrond/misc/use_staticdirect' 2011-09-28 17:33:03 -05:00
Christopher Allan Webber
e9b2d7b498 Updating translations 2011-09-25 20:31:00 -05:00
Christopher Allan Webber
31370dbc2c Stripping out whitespace on these translation blocks.
{% trans -%}
  ;o
{%- endtrans %}
2011-09-25 20:26:06 -05:00
Elrond
32d1a69d2f Templates: Use request.staticdirect instead of /mgoblin_static
Any reference to static, shipped content should use
request.staticdirect instead of the default path.

Especially if hosting mediagoblin via fastcgi, the paths
might need changing.
2011-09-14 19:52:47 +02:00
Christopher Allan Webber
9122a9d047 Merge remote branch 'remotes/jwandborg/f587-split_storage_into_submodules' 2011-09-14 04:57:19 -05:00
Joar Wandborg
fd10c71644 Fixed ./bin/gmg. import_export would not find BasicFileStorage, and ./bin/gmg would throw an error no matter what command you tried to run. 2011-09-14 02:08:01 +02:00
Joar Wandborg
a2468d18ca Feature #587 - Split storage.py into submodules
*   Removed storage.py
*   Created submodules for filestorage, cloudfiles, mountstorage
*   Changed test_storage to reflect the changes made in the storage
    module structure
*   Added mediagoblin.storage.filestorage.BasicFileStorage as a
    default for both publicstore and queuestore's `storage_class`
2011-09-12 02:32:03 +02:00
Christopher Allan Webber
8c12e57b9e Extracted, pushed, pulled, compiled translations 2011-09-11 16:20:10 -05:00
Christopher Allan Webber
3d95afeb36 Marking some things on the frontpage for translation. 2011-09-11 16:13:27 -05:00
Christopher Allan Webber
55376ff403 Merge remote branch 'remotes/elrond/idea/use_media_url_for_self' 2011-09-10 17:42:50 -05:00
Christopher Allan Webber
0125e5567b Adding MIT.txt to the 960.gs extlib/ checkout.
Free software developers!  You don't already have 80000 copies of
these license texts in your distro, let's give you 50 more.
2011-09-10 17:39:10 -05:00
Christopher Allan Webber
611542034a Adding Nathan Yergler, another recent contributor, to the AUTHORS list. 2011-09-10 17:33:41 -05:00
Christopher Allan Webber
a7302773f6 Adding Shawn to the contributor list. By the way, it's Shawn *Khan* :) 2011-09-10 17:33:06 -05:00
Christopher Allan Webber
ab613cb3c8 Using Local Fonts instead of Remote Fonts linked to Google.
Thanks to Shawn Kahn for help on / original version of this patch!
2011-09-10 17:27:47 -05:00
Joar Wandborg
33d3de8e2c Refractored gmg_commands.import_export 2011-09-10 10:55:53 -05:00
Elrond
8d7b549bb6 Use media.url_for_self() instead of generating it
Some places used to generate the URL for a media entry on
their own instead of calling media.url_for_self() to do
that. The later handles missing slugs better.
2011-09-09 23:59:32 +02:00
Christopher Allan Webber
f373599bd7 Merge branch 'gullydwarf-cfdv-f357_lost_password_functionality'
Conflicts:
	mediagoblin/auth/routing.py
2011-09-08 08:12:43 -05:00
Christopher Allan Webber
f7ab66707c Renaming request.[GET|POST] as formdata instead of session; that's more accurate. 2011-09-08 08:10:27 -05:00
Christopher Allan Webber
961fe38163 Adding a small docstring 2011-09-07 23:51:41 -05:00
Christopher Allan Webber
4185e644f4 Keys in mongodb should be unicode, here... 2011-09-07 23:48:10 -05:00
Christopher Allan Webber
daf029646e Also nullify verification key after verifying in the email confirmation step 2011-09-07 23:46:41 -05:00
Christopher Allan Webber
a85a21103b If the user hasn't verified their email or account inactive give a special warning 2011-09-07 23:45:14 -05:00
Christopher Allan Webber
73fffbb8b0 Adding additional check that verification key exists, and updating indentation 2011-09-07 23:32:15 -05:00
Christopher Allan Webber
2c9e8184a4 Adjusting indentation a bit 2011-09-07 23:25:46 -05:00
Christopher Allan Webber
d1a6432645 Avoiding using '$or' query modifier since that's newer-mongo only. 2011-09-07 23:23:44 -05:00
Christopher Allan Webber
f03fef4ea8 Updating calls to recall password URLs to respect changed routing 2011-09-07 23:23:26 -05:00
Christopher Allan Webber
2db31581ed user_add_forgot_password_token_and_expires migration should set new fields to None/null 2011-09-07 20:18:17 -05:00
Christopher Allan Webber
34fddf47f0 Resent verification email template and view aren't used anymore. Removing! 2011-09-07 19:42:56 -05:00
Christopher Allan Webber
daa26200c7 Changing the forgot password urls so they all start under /auth/forgot_password/ 2011-09-07 19:40:00 -05:00
Christopher Allan Webber
63bf10f9a6 Adjusting spacing between function arguments 2011-09-07 19:37:25 -05:00
Christopher Allan Webber
b0391ad94b Updating translations 2011-09-05 23:34:20 -05:00
Christopher Allan Webber
273227e399 Merge branch 'i507_beaker_cache' 2011-09-05 23:28:41 -05:00
Christopher Allan Webber
fc21a55c76 Turning on caching for mediagoblin testing after all?
Maybe we'll add a way to toggle this.
2011-09-05 23:28:11 -05:00
Christopher Allan Webber
9a64272e48 Fixing the confirm delete unit test
Now it's updated for the new checkbox-for-confirm code.
2011-09-05 23:20:50 -05:00
Christopher Allan Webber
7624c641cd Updating the confirm delete form: checkboxes shouldn't be required, make translatable 2011-09-05 23:20:08 -05:00
Christopher Allan Webber
284ebca0b2 Caching test... pretty basic. 2011-09-05 22:57:52 -05:00
Christopher Allan Webber
949c7afd37 Merge remote branch 'remotes/jwandborg/f571_closing_storage_objects' 2011-09-05 21:14:22 -05:00
Christopher Allan Webber
e8b517924e A couple of tweaks to the checkbox styling... pretty minor. 2011-09-05 21:03:54 -05:00
Christopher Allan Webber
677f55cc51 A couple more delete UI tweaks
- Adjusting HTML indentation
 - Making the cancel button a link rather than a button (a bit
   missized though it seems... maybe a feature ;))
2011-09-05 21:01:22 -05:00
Shawn Khan
b7f7c13b6d Created a Cancel Button, if you don't want to delete Media. 2011-09-05 20:37:08 -05:00
Shawn Khan
8daef28dc7 Page Redesign to Delete confirmation page 2011-09-05 20:37:08 -05:00
Caleb Forbes Davis V
4bcaf9f32a for readability, and adds unit test for expired token 2011-09-05 18:57:06 -05:00
Christopher Allan Webber
a237735a70 Mark description field's label for translation 2011-09-05 18:19:24 -05:00
Caleb Forbes Davis V
65a8304794 added unit tests for lost password code 2011-09-05 17:33:01 -05:00