31 Commits

Author SHA1 Message Date
Christopher Allan Webber
23caf305f2 Allow administrators to disable keeping the original. That's the new default! 2011-12-12 08:10:10 -06:00
Elrond
6603b30041 Merge remote branch 'remotes/manolinux/671_spaces_in_tag_list_edit'
* remotes/manolinux/671_spaces_in_tag_list_edit:
  * Feature #678: Drop custom delimiters in tags   * Eliminate the definition of the tag delimiter for tests.   * Remove a test that was related to custom tags delimiter. * Bug #671: Tags list on Edit page is not seperated by spaces and hard to read   * Modify a test to include this space.
  * Bug #671: Tags list on Edit page is not seperated by spaces and hard to read : Make 'media_tags_as_string' function put a space after each comma. * Feature #678: Drop custom delimiters in tags : I declare a constant in the begining of text.py file.
2011-12-03 22:11:54 +01:00
Manuel Urbano Santos
3038ba87e4 * Bug #671: Tags list on Edit page is not seperated by spaces and hard to read : Make 'media_tags_as_string' function put a space after each comma.
* Feature #678: Drop custom delimiters in tags : I declare a constant in the begining of text.py file.
2011-11-27 13:49:47 +01:00
Christopher Allan Webber
f47a7a8c92 Remove old enable_video config option 2011-11-25 11:42:03 -06:00
Christopher Allan Webber
cfa96da734 Load multiple media types based on the media_types section of the config file 2011-11-25 11:41:24 -06:00
Joar Wandborg
8aeb673877 Video support is disabled by default, set enable_video to true to enable 2011-11-22 00:09:41 +01:00
Christopher Allan Webber
5bb37b9480 Merge remote branch 'remotes/inconexo/613_custom_title' 2011-11-19 14:04:56 -06:00
Christopher Allan Webber
7c378f2cd5 Allow user to set whether comments are ascending or descending 2011-11-19 14:01:38 -06:00
Pablo J. Urbano Santos
3c0411f51f Allow instance owners to customize html titles of page:
Added html_title config option.
	Made base.html template use html_title option as page title.
2011-11-19 17:07:41 +01:00
Elrond
2dc8d24932 Some mostly cosmetic changes to CSRF
* remove max_age - A session cookie is better, because it's
  a session thing, really.
* Call the cookie mediagoblin_csrftoken, much clearer.
* Use the SCRIPT_NAME for the path of the cookie, so that
  the cookie is sent back to the right place only.
  Alternatively the path= parameter could be removed, so
  that it defaults to '/'.
* call the randomness function only once, instead of twice.
  64 bits should be enough. If really more bits are needed,
  increase the number.
* Just give the number as cookie. No point in md5 and
  hexdigest in my view (those functions just make another
  representation).
* getrandbits gets a bit count directly, simpler API
2011-10-14 21:46:17 +02:00
Nathan Yergler
9202e5a1e1 #361: Removing additional secret key, per CW's request. 2011-10-01 14:24:49 -07:00
Nathan Yergler
6bfbe02426 Merge remote-tracking branch 'refs/remotes/upstream/master' into 569-application-middleware
Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
2011-10-01 12:08:58 -07: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
273227e399 Merge branch 'i507_beaker_cache' 2011-09-05 23:28:41 -05:00
Nathan Yergler
f1226c98c4 Issue 361 Initial implementation of CSRF protection middleware 2011-09-04 18:15:52 -07:00
Christopher Allan Webber
d56de0c2db Merge remote branch 'remotes/jwandborg/configure_smtp' 2011-08-27 12:00:54 -05:00
Joar Wandborg
d71170ad0a Feature #489 - SMTP configuration options - Acts on feedback from cwebber.
http://bugs.foocorp.net/issues/489#note-2
2011-08-25 19:38:13 +02:00
Christopher Allan Webber
0533f117a9 Basic beaker caching functionality added to the application. 2011-08-23 23:22:17 -05:00
Christopher Allan Webber
894fa564e7 Merge branch 'master' into jwandborg-f482_media_attachments
Conflicts:
	mediagoblin/config_spec.ini
	mediagoblin/edit/forms.py
	mediagoblin/edit/views.py
	mediagoblin/submit/views.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
2011-08-22 21:48:45 -05:00
Elrond
ed7970696e Storage Config: Use own section
Instead of configuring storage X by parameters in the main
section "X_class = backend" and "X_param = value", use a
new section in the config: "[storage:X]" and use "class =
backend" and "param = value" there.

This is the beginning, it includes a try at being backward
compatible. But that try isn't really fully useful anyway.
2011-08-09 13:13:04 +02:00
Joar Wandborg
47364ead6b Added SMTP configuration options 2011-08-07 01:22:31 +02:00
Joar Wandborg
2c4374938f Feature #482 - Media attachments 2011-08-05 22:08:29 +02:00
Christopher Allan Webber
1b89b817e5 Removing option to make tags lowercase
...that's basically handled by the slugification
2011-07-30 21:54:18 -05:00
Christopher Allan Webber
3cdf366acf Merge branch 'remotes/gullydwarf-cfdv/f360_tagging' (early part) into mergetags
Conflicts:
	mediagoblin/config_spec.ini
	mediagoblin/edit/views.py
	mediagoblin/util.py
2011-07-30 13:09:01 -05:00
Caleb Forbes Davis V
10d7496da2 use config_spec.ini to store tag parsing directives 2011-07-25 23:46:36 -05:00
Elrond
39c6b2bdc6 Move db_name default into config_spec.ini
The default name of the database ("mediagoblin") was coded
in db/open.py and init/celery/__init__.py.
Instead use the new config system to have this as the
default for the "db_name" config option.
2011-07-11 23:25:15 +02:00
Rasmus Larsson
13677ef97a Added configuration variable to toggle registrations, if disabled the registration page redirects to index and no link to register is shown 2011-07-09 15:12:00 +02:00
Christopher Allan Webber
8abeaf2fb6 Preparing celery unit tests for new setup.
Instead of the previous passing in of dictionaries, we're actually
checking some example config files.
2011-06-18 20:15:46 -05:00
Christopher Allan Webber
3f5cf663c0 Move entire app structure over to using the new config system.
This is a huge change!  This means several things.

 - From the python point of view, launching the application is a heck
   of a lot cleaner.  You just need to pass in the config file path to
   MediaGoblinApp's __init__() and whether or not this funtion should
   setup celery and you're good.
 - There are now two separate config files, separating the server
   setup from the application setup.
   - server.ini: the paste deploy config file, which configures the
     applications and server setup but *NOT* the mediagoblin application
     itself.
   - mediagoblin.ini: where you configure mediagoblin (and possibly celery)
 - Launching the application is now different.  Instead of:
     ./bin/paster serve mediagoblin.ini --reload
   We launch like:
     ./bin/paster serve server.ini --reload
2011-06-18 17:59:38 -05:00
Christopher Allan Webber
efc8f1a0d0 Let's specifically import string_list()s in the config_spec. 2011-06-18 14:08:58 -05:00
Christopher Allan Webber
0fcfff5a3a Basic config "requirements" file.
Not used yet, but this will be used by ConfigObj to transform values,
set defaults, etc.
2011-06-15 21:17:55 -05:00