45 Commits

Author SHA1 Message Date
Sebastian Spaeth
7b2f3d2a9e Finalize merging of the blog branch by Aditi (Gsoc 2013)
Comment out the blog plugin by default. Remove the blog README.md in
the root directory.
2013-12-12 16:38:35 +01:00
Sebastian Spaeth
a42dda21f9 Merge branch 'master' into upstream-master
Conflicts:
	mediagoblin/templates/mediagoblin/base.html
	mediagoblin/templates/mediagoblin/user_pages/user.html
2013-12-12 16:24:34 +01:00
Christopher Allan Webber
732ebe0cad Turning off the Terms of Service feature by default
This commit sponsored by Jessica Coates.  Thank you!
2013-12-03 11:51:46 -06:00
Christopher Allan Webber
e5c4f678ec Provide an easy option to turn off the terms of service 2013-11-30 14:25:29 -06:00
tilly-Q
6483b37060 At this point, I am very close to done with this code! I made one big change at
paroneayea's request, which was to make to possible to turn off user's ability
to file reports through a mediagoblin.ini setting. Aside from this, I had to
make it possible for the Moderation User Panel to display more than 10 users.
And aside from that, I just had to fix some errors which cropped up with my
most recent additions. I also fixed some tests that were broken because I had
changed the checks for whether or not a user is active. Nearing the end!

===============================================================================
    Made it possible to turn off reports through a mediagoblin.ini setting
===============================================================================
--\ mediagoblin.ini
--\ mediagoblin/config_spec.ini
--\ mediagoblin/decorators.py
--\ mediagoblin/moderation/views.py
--\ mediagoblin/templates/mediagoblin/user_pages/media.html
--\ mediagoblin/user_pages/views.py

===============================================================================
    Made User Panel capable of showing more than 1 page of users
===============================================================================
--\ mediagoblin/moderation/forms.py
--\ mediagoblin/moderation/views.py
--\ mediagoblin/templates/mediagoblin/moderation/user_panel.html

===============================================================================
        Fixed Broken Tests
===============================================================================
--\ mediagoblin/tests/test_notifications.py
--\ mediagoblin/tests/test_openid.py
--\ mediagoblin/tests/test_persona.py
--\ mediagoblin/tests/test_reporting.py

===============================================================================
        Fixed errors in code
===============================================================================
--\ mediagoblin/db/migrations.py
--| Set nullable to True for MediaReports' and CommentReports' content foreign
  |keys

--\ mediagoblin/db/models.py
--| Got rid of cascading rules for MediaReports' and CommentReports' content
  |foreign keys. This makes it possible for the Reports to continue to exist
  |after the content is deleted.

--\ mediagoblin/moderation/tools.py
--| Fixed formatting of Report Resolution Methods
--| Took out pieces of code used in debugging

--\ mediagoblin/templates/mediagoblin/base.html
--\ mediagoblin/templates/mediagoblin/moderation/report.html
--| Made reports details page able to tell what is a deleted archived report.

--\ mediagoblin/templates/mediagoblin/moderation/report_panel.html
--\ mediagoblin/templates/mediagoblin/utils/report.html
2013-09-23 13:20:18 -04:00
Aditi
03e2a0f806 Add blog media_type plugin to plugin section. 2013-07-19 16:58:35 +05:30
Christopher Allan Webber
5305fee13b Merge branch 'rodney757-media_plugins'
Conflicts:
	mediagoblin.ini
	mediagoblin/tests/test_mgoblin_app.ini
2013-07-12 16:24:36 -05:00
Rodney Ewing
7bfb3ae829 Patch by pythonsnake. Make mediagoblin.ini comments more helpful. 2013-07-12 09:32:50 -07:00
Rodney Ewing
e699197258 fixed some typos and enabled media_type plugins in tests 2013-07-02 08:06:39 -07:00
Rodney Ewing
58a947578c modified gmg to use plugin media_types and converted image media_type to new plugin style 2013-07-02 07:21:44 -07:00
Rodney Ewing
af4414a85f Merge remote-tracking branch 'upstream/master' into auth
Conflicts:
	mediagoblin/app.py
	mediagoblin/auth/forms.py
	mediagoblin/auth/tools.py
	mediagoblin/db/migrations.py
	mediagoblin/db/models.py
	mediagoblin/edit/views.py
	mediagoblin/plugins/basic_auth/tools.py
	mediagoblin/tests/test_edit.py
2013-06-25 13:37:21 -07:00
Rodney Ewing
54ef2c408b moved authentication_disabled to config_spec 2013-06-15 12:32:20 -07:00
Rodney Ewing
5101c469d7 changed no_auth to authentication_disabled in config 2013-06-11 14:30:38 -07:00
Christopher Allan Webber
c139d49d83 ./bin/gmg dbupdate, not ./bin/dbupdate
Thanks to Tsyesica for catching this :)
2013-06-06 17:56:00 -05:00
Rodney Ewing
d93cd2684b made basic_auth a default plugin 2013-05-24 16:52:49 -07:00
Rodney Ewing
744f1c83b9 add a check for authentication plugin on startup and respond according to no_auth config option. allows instance to be run w/o authentication 2013-05-24 16:52:48 -07:00
Rodney Ewing
ebbc8fe069 reset mediagoblin.ini 2013-05-24 16:51:27 -07:00
Rodney Ewing
ee355966c8 basic_auth v0 plugin working 2013-05-24 16:51:27 -07:00
Christopher Allan Webber
8145547437 Making the uncomment-able db string match the one that we use in the install docs
This commit sponsored by Denise Merkel.  Thanks, Mom!  Happy Mother's Day!
2013-05-12 11:46:38 -05:00
Christopher Allan Webber
fcfcd1f8a3 Merge remote-tracking branch 'refs/remotes/merge-requests/47' 2013-05-10 11:23:36 -05:00
Christopher Allan Webber
76b399a3ef Changing the order so that config_spec.ini is mentioned after mediagoblin_local.ini
This commit sponsored by Matteo Settenvini.  Thanks!
2013-02-24 13:53:15 -06:00
pythonsnake
dc000b70ff Mention mediagoblin/config_spec.ini 2013-02-13 16:56:24 +01:00
Christopher Allan Webber
e9c3384b84 Removing unused geolocation_map_visible variable and turning geolocation on in default config 2013-01-30 13:22:18 -06:00
Mike Linksvayer
1d0148aef1 Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Conflicts:
	docs/source/siteadmin/media-types.rst
2012-12-20 12:50:43 -08:00
Christopher Allan Webber
f891d5fe50 geolocation now on by default 2012-11-26 11:57:33 -06:00
Sebastian Spaeth
ee97ac6c2f Add geolocation_visible setting to mediagoblin.ini
Place the geolocation_visible setting (defaults to false) in
mediagoblin.ini to make it more discoverable (I needed to check
the source to find out how to enable it). I'd vote for a default
of true, we should come with some batteries included IMHO..

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
2012-11-16 12:59:25 +01:00
Mike Linksvayer
200433dc38 mention dependencies, dbupdate, refer to docs
http://issues.mediagoblin.org/ticket/470
2012-10-12 15:05:29 -07:00
Christopher Allan Webber
c15017240a Using Aleksejrs' improved text for the theming config description 2012-08-21 09:01:05 -05:00
Christopher Allan Webber
a53aa60500 Reminding people they need to run gmg assetlink and that there's a default theme 2012-08-21 08:40:47 -05:00
Christopher Allan Webber
0d896a8d2a Give a small amount of info on how to set the theme. 2012-08-21 08:36:55 -05:00
Christopher Allan Webber
2a9f519b29 Uncomment plugins section in mediagoblin.ini 2012-08-19 12:00:47 -05:00
Will Kahn-Greene
29b6f91740 401. Plugin infrastructure
* implements installing, loading and setup for plugins
* codifies configuration
* has a sample plugin
* docs
* tests
2012-05-13 00:00:08 -04:00
Elrond
a45631e3f3 Start having useful defaults for SQL
Mostly this means: Havintg a config_spec.ini that has a
local (relative to mediagoblin.ini) sqlite db with the name
"mediagoblin.db".

Also:
- Add to .gitignore
- Add a notice to mediagoblin.ini about the db
2012-02-18 19:34:11 +01: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
Elrond
daed11b812 640: Configuration files should mention their _local versions
Thanks go to Aleksej Serdjukov for bringing this up and
providing the patch in the bug!
2011-11-12 14:28:55 +01: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
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
8d808c1fa1 Erk! Forgot to include the new mediagoblin.ini. 2011-06-18 18:04:14 -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
29f3fb7052 Added an email debug mode which, by default, is enabled 2011-05-07 22:45:06 -05:00
Joar Wandborg
8a6a81bcaa Updated default sender address
Signed-off-by: Joar Wandborg <git@wandborg.com>
2011-05-08 02:03:11 +02:00
Joar Wandborg
4c093e85c7 Made changes according to http://bugs.foocorp.net/issues/271#note-7
Signed-off-by: Joar Wandborg <git@wandborg.com>
2011-05-08 00:55:57 +02:00
Christopher Allan Webber
54e219fed1 Makes most sense for [server:main] to be at bottom 2011-04-17 16:45:36 -05:00
Christopher Allan Webber
582c4d5fb2 Add the staticdirector stuff to the mediagoblin wsgi app. 2011-04-17 16:30:51 -05:00
Christopher Allan Webber
3a69a5dcd6 Base MediaGoblin paste deploy config file.
Should do what's necessary, work out of the box, be deployable.
2011-04-17 12:44:39 -05:00