Caleb Forbes Davis V [Mon, 27 Jun 2011 18:13:52 +0000 (13:13 -0500)]
adds message queue
Feature #368 - messaging framework
* message levels are debug, info, success, warning, and error
* display mechanism - base.html includes messages.html for now
* fetch_messages and add_message are available to all templates
using jinja2 environment.globals
* messages are displayed and cleared. no persistence
Christopher Allan Webber [Sat, 25 Jun 2011 19:32:31 +0000 (14:32 -0500)]
Reordering the uploaded on/by and description sections of media display template
Christopher Allan Webber [Sat, 25 Jun 2011 18:15:15 +0000 (13:15 -0500)]
Align images in a gallery to the center
Christopher Allan Webber [Sat, 25 Jun 2011 18:10:25 +0000 (13:10 -0500)]
Just adjusting indentation a little bit in the base template.
Christopher Allan Webber [Sat, 25 Jun 2011 18:08:04 +0000 (13:08 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/is330'
Conflicts:
mediagoblin/templates/mediagoblin/user_pages/gallery.html
Christopher Allan Webber [Sat, 25 Jun 2011 17:55:42 +0000 (12:55 -0500)]
Make the width of these fields 100% rather than providing a specific pixel width.
Christopher Allan Webber [Sat, 25 Jun 2011 05:28:03 +0000 (00:28 -0500)]
Put the thumbnail on the edit details part on the top and center
Christopher Allan Webber [Sat, 25 Jun 2011 04:53:31 +0000 (23:53 -0500)]
Setting height for media thumbnail to also 200px
Not sure why height wasn't at 200px but anyway not having at 200px
means some images would hit overlap.
Christopher Allan Webber [Sat, 25 Jun 2011 04:49:37 +0000 (23:49 -0500)]
Adjust the width of the fields on the form submission
Did several things, including:
- Call the individual form field rendering macros instead of the auto
whole-form renderer so we get better control over the TextArea
- Use the textarea specific form field rendering macro
- Adds textarea styling to the css
- Sets the input, textarea styling to be 460 px wide (the width of
the form section, not including padding)
Christopher Allan Webber [Sat, 25 Jun 2011 04:46:11 +0000 (23:46 -0500)]
Separates out the field rendering part from the whole form rendering macro
Also adds a textarea-specific version that renders rows and cols as
part of the input.
Jef van Schendel [Fri, 24 Jun 2011 19:03:05 +0000 (21:03 +0200)]
Implement basic footer
Jef van Schendel [Thu, 23 Jun 2011 15:39:13 +0000 (17:39 +0200)]
Remove excess grids, change CSS to center forms
Jef van Schendel [Thu, 23 Jun 2011 14:47:27 +0000 (16:47 +0200)]
Add <br /> for correct text layout
Jef van Schendel [Thu, 23 Jun 2011 14:40:33 +0000 (16:40 +0200)]
Submit form should not have edit_box class
Jef van Schendel [Thu, 23 Jun 2011 14:38:55 +0000 (16:38 +0200)]
Make several small changes to wording and top bar links
Christopher Allan Webber [Thu, 23 Jun 2011 03:21:08 +0000 (22:21 -0500)]
Merge remote branch 'remotes/schendje/960-grid-system'
Christopher Allan Webber [Thu, 23 Jun 2011 03:17:58 +0000 (22:17 -0500)]
Slightly clearer message about email marked as verified w/ adduser gmg command
Christopher Allan Webber [Thu, 23 Jun 2011 03:16:50 +0000 (22:16 -0500)]
Setting status to active when adding users with ./bin/gmg adduser
Christopher Allan Webber [Thu, 23 Jun 2011 03:16:37 +0000 (22:16 -0500)]
Making arguments positional and removing the "usage" functions
All these arguments were required and might as well be positional
thusly. If you don't provide all required positional arguments,
argparser will correct you and request usage.
Christopher Allan Webber [Thu, 23 Jun 2011 03:09:11 +0000 (22:09 -0500)]
No need to describe usage of subcommands, gmg subcommand --help does that
Alejandro Villanueva [Wed, 22 Jun 2011 16:51:31 +0000 (11:51 -0500)]
Adding new function to gmg_commands, adduser,makeadmin and changepw issue 373
Jef van Schendel [Thu, 23 Jun 2011 00:09:00 +0000 (02:09 +0200)]
Switch css over to 960.gs. If I did everything right, things should look exactly the same.
Christopher Allan Webber [Wed, 22 Jun 2011 18:57:34 +0000 (13:57 -0500)]
Check on media['uploader']'s id rather than the username
This skips making an extra query to retrieve the uploader object and
also checks on the canonical ID, which is probably good (even if
indexing should ensure uniqueness there).
Christopher Allan Webber [Wed, 22 Jun 2011 18:54:14 +0000 (13:54 -0500)]
Merge remote branch 'remotes/gullydwarf-cfdv/is388_only_media_owner_edits'
Christopher Allan Webber [Wed, 22 Jun 2011 17:38:08 +0000 (12:38 -0500)]
Two not three ways to contribute now, reflecting that in docs :)
Caleb Forbes Davis V [Wed, 22 Jun 2011 17:13:29 +0000 (12:13 -0500)]
adds conditional for display of media edit link
Jef van Schendel [Wed, 22 Jun 2011 15:48:20 +0000 (17:48 +0200)]
Add updates background images
Jef van Schendel [Wed, 22 Jun 2011 15:02:28 +0000 (17:02 +0200)]
Several small UI changes to edit profile page: moved header, changed form wording, changed css class
Jef van Schendel [Wed, 22 Jun 2011 15:01:20 +0000 (17:01 +0200)]
Merge remote-tracking branch 'gitorious/master'
Christopher Allan Webber [Wed, 22 Jun 2011 14:52:13 +0000 (09:52 -0500)]
Merge remote branch 'remotes/elrond/idea/invalidid'
Jef van Schendel [Wed, 22 Jun 2011 13:32:06 +0000 (15:32 +0200)]
Merge remote-tracking branch 'gitorious/master'
Christopher Allan Webber [Wed, 22 Jun 2011 04:26:45 +0000 (23:26 -0500)]
I don't think we need the username to be part of the profile editing URL
Christopher Allan Webber [Wed, 22 Jun 2011 04:26:18 +0000 (23:26 -0500)]
Adding an extra space between function definitions
Christopher Allan Webber [Wed, 22 Jun 2011 04:25:15 +0000 (23:25 -0500)]
Indenting some sections between if / else blocks in root.html
Christopher Allan Webber [Wed, 22 Jun 2011 04:22:16 +0000 (23:22 -0500)]
Merge remote branch 'refs/remotes/gullydwarf-cfdv/is315'
Christopher Allan Webber [Tue, 21 Jun 2011 22:02:49 +0000 (17:02 -0500)]
Extra checks so that we don't even RUN tests unless the right celery environ set
Christopher Allan Webber [Tue, 21 Jun 2011 21:06:09 +0000 (16:06 -0500)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber [Tue, 21 Jun 2011 21:04:44 +0000 (16:04 -0500)]
Make sure we *ONLY* ever kill the test database, EVER.
Jef van Schendel [Tue, 21 Jun 2011 17:13:07 +0000 (19:13 +0200)]
Merge remote-tracking branch 'gitorious/master'
Will Kahn-Greene [Wed, 15 Jun 2011 02:06:01 +0000 (22:06 -0400)]
333. Adds explanation of command lines; tweaks format-patch line
* Adds explanation of command lines and their arguments (gullydwarf's
suggestion).
* Switched the ``git format-patch ...`` line from using -o patches to
using --stdout. This creates a single patch file and is (probably)
easier to deal with.
* Fixed a typo.
* Adds toc to top of mediagoblin chapter
Christopher Allan Webber [Tue, 21 Jun 2011 13:20:05 +0000 (08:20 -0500)]
Also fix clean_html so that it doesn't barf on an empty string.
Jef van Schendel [Tue, 21 Jun 2011 09:22:31 +0000 (11:22 +0200)]
Merge remote-tracking branch 'gitorious/master'
cfdv [Tue, 21 Jun 2011 03:47:43 +0000 (22:47 -0500)]
assigns migration steps to User database objects
adds the migration_handler to the User db class, connecting the
migration steps in ../db/migrations.py to the migration code in
gmg_commands
Christopher Allan Webber [Tue, 21 Jun 2011 02:02:46 +0000 (21:02 -0500)]
Only migrate to description_html if description also exists.
Christopher Allan Webber [Tue, 21 Jun 2011 02:01:05 +0000 (21:01 -0500)]
Fix cleaned_markdown_conversion so that it doesn't bork on empty strings
Basically, clean_html would throw an error on '', so we just return ''
"if not text"
cfdv [Tue, 21 Jun 2011 00:28:02 +0000 (19:28 -0500)]
removes unecessary dependence on existence of username for User migration01, + fix whitespace issues
cfdv [Mon, 20 Jun 2011 18:07:15 +0000 (13:07 -0500)]
adds accommmodations for migration of fields in User: bio and url
cfdv [Mon, 20 Jun 2011 17:50:44 +0000 (12:50 -0500)]
Merge remote-tracking branch 'origin/master' into is315
Jef van Schendel [Mon, 20 Jun 2011 14:33:14 +0000 (16:33 +0200)]
Merge remote-tracking branch 'gitorious/master'
Christopher Allan Webber [Mon, 20 Jun 2011 13:57:58 +0000 (08:57 -0500)]
Also moving the test_server.ini to test_paste.ini to avoid ambiguity.
Christopher Allan Webber [Mon, 20 Jun 2011 13:55:58 +0000 (08:55 -0500)]
Moving server.ini->paste.ini because willkg points out server.ini is ambiguous
Updating the file, updating lazyserver.sh, updating docs.
Christopher Allan Webber [Mon, 20 Jun 2011 01:53:38 +0000 (20:53 -0500)]
Updated git documentation to have more useful branch names.
I haven't discussed this with Will yet... if he gets unhappy we can
roll back this documentation change :)
Christopher Allan Webber [Mon, 20 Jun 2011 01:42:48 +0000 (20:42 -0500)]
Provide a migration to add description_html to MediaEntries that don't have it
Christopher Allan Webber [Mon, 20 Jun 2011 01:41:40 +0000 (20:41 -0500)]
Adds util.cleaned_markdown_conversion() and uses it in the submission process
This simplifies the markdown processing & html cleaning of descritions
and etc by providing a wrapper function that we can use in multiple
locations.
Christopher Allan Webber [Mon, 20 Jun 2011 01:00:35 +0000 (20:00 -0500)]
Merge remote branch 'remotes/jwandborg/issue_363'
Conflicts:
setup.py
Christopher Allan Webber [Mon, 20 Jun 2011 00:56:25 +0000 (19:56 -0500)]
Merge remote branch 'remotes/cmoylan/test_auth_views_364'
cfdv [Sun, 19 Jun 2011 22:39:32 +0000 (17:39 -0500)]
Merge branch 'is330', remote-tracking branch 'origin/master' into is330
cfdv [Sun, 19 Jun 2011 22:20:23 +0000 (17:20 -0500)]
Merge remote-tracking branch 'origin/master' into is315
Elrond [Sun, 19 Jun 2011 22:09:40 +0000 (00:09 +0200)]
Move InvalidId to db.util
Instead of import InvalidId from the low level bson module,
first import it in our db.util wrapper and second import it
from pymongo.errors.
Christopher Allan Webber [Sun, 19 Jun 2011 21:52:27 +0000 (16:52 -0500)]
Making ./runtests.sh the official way to run the tests.
Christopher Allan Webber [Sun, 19 Jun 2011 21:51:02 +0000 (16:51 -0500)]
./runtests.sh: run unit tests without having to remember the long command.
Christopher Allan Webber [Sun, 19 Jun 2011 21:43:23 +0000 (16:43 -0500)]
Need to run nosetests with CELERY_CONFIG_MODULE set to from_tests again.
Basically, if we don't do this celery sets itself up before it should
and improperly. :\
Christopher Allan Webber [Sun, 19 Jun 2011 21:24:31 +0000 (16:24 -0500)]
Documenting the setup_globals function.
Christopher Allan Webber [Sun, 19 Jun 2011 21:23:17 +0000 (16:23 -0500)]
Document our new global objects added during the configobj branch
Christopher Allan Webber [Sun, 19 Jun 2011 21:22:41 +0000 (16:22 -0500)]
Merge remote branch 'remotes/elrond/idea/globals_check'
Conflicts:
mediagoblin/tests/test_globals.py
Christopher Allan Webber [Sun, 19 Jun 2011 21:03:13 +0000 (16:03 -0500)]
Reset the globals parameters while testing parameters
(This way we can be sure that the database is torn down if necessary
but this was the only test that passed last.)
Christopher Allan Webber [Sun, 19 Jun 2011 20:35:19 +0000 (15:35 -0500)]
Re-commenting-out lxml from setup.py
Clarifying that this is something to install from the package manager
and not via python setuptools itself.
Christopher Allan Webber [Sun, 19 Jun 2011 19:03:08 +0000 (14:03 -0500)]
Updated hacking howto to reflect our new, easier to run lazyserver.sh command.
Christopher Allan Webber [Sun, 19 Jun 2011 18:38:33 +0000 (13:38 -0500)]
./lazyserver.sh: launch a server in the most basic way possible
Looks for paster either in buildout or in virtualenv / on the path,
wherever it seems to be.
Christopher Allan Webber [Sun, 19 Jun 2011 18:00:49 +0000 (13:00 -0500)]
Actually we need pkg_resources again in test_celery_setup :)
This got removed in master at the same time that it got used in the
configobj branch...
Christopher Allan Webber [Sun, 19 Jun 2011 17:59:19 +0000 (12:59 -0500)]
Merge branch 'configobj'
Chris Moylan [Sun, 19 Jun 2011 17:28:53 +0000 (12:28 -0500)]
added test coverage for redirecting after login with the next param
Christopher Allan Webber [Sun, 19 Jun 2011 16:50:05 +0000 (11:50 -0500)]
Adjusting hackinghowto docs to reflect change in server/tests commands
Christopher Allan Webber [Sun, 19 Jun 2011 16:41:48 +0000 (11:41 -0500)]
Removing a couple of unused imports from util.py
Christopher Allan Webber [Sun, 19 Jun 2011 16:39:35 +0000 (11:39 -0500)]
Removing "paste config" phrasing where we're no longer using paste's config
Christopher Allan Webber [Sun, 19 Jun 2011 16:36:52 +0000 (11:36 -0500)]
renaming storage_system_from_paste_config()->storage_system_from_config()
As Elrond points out, this name doesn't make sense anymore since this
isn't based on the paste config. Thanks Elrond!
Christopher Allan Webber [Sun, 19 Jun 2011 16:10:45 +0000 (11:10 -0500)]
util.read_config_file() no longer needed; removing.
Chris Moylan [Sun, 19 Jun 2011 05:22:47 +0000 (00:22 -0500)]
Added tests for all sorts of login form abuse.
Added tests for log out
cfdv [Sun, 19 Jun 2011 03:24:32 +0000 (22:24 -0500)]
enables primitive display of profile data on user page
cfdv [Sun, 19 Jun 2011 02:30:56 +0000 (21:30 -0500)]
enables entering user details including website url and bio
fixes usage of objects. still need to display the data on user page
Christopher Allan Webber [Sun, 19 Jun 2011 01:15:46 +0000 (20:15 -0500)]
Preparing celery unit tests for new setup.
Instead of the previous passing in of dictionaries, we're actually
checking some example config files.
Christopher Allan Webber [Sun, 19 Jun 2011 01:14:51 +0000 (20:14 -0500)]
./bin/gmg commands upgraded to work with the new setup.
Christopher Allan Webber [Sun, 19 Jun 2011 01:14:33 +0000 (20:14 -0500)]
Nosetests should now be able to run using the new configobj / app init setup
Lots of changes:
- CELERY_CONFIG_FILE does not need to be set to the from_tests module
to run tests anymore, in fact it *should not be set at all* and is
specifically forbidden.
- moved around the configuration to the new 2-file format
- and generally adjusting the code appropriately.
Christopher Allan Webber [Sun, 19 Jun 2011 01:02:59 +0000 (20:02 -0500)]
Only kill the database if it's really set up.
Christopher Allan Webber [Sun, 19 Jun 2011 00:00:01 +0000 (19:00 -0500)]
It's a good idea for us to pass the application itself into mg_globals :)
Christopher Allan Webber [Sat, 18 Jun 2011 23:59:42 +0000 (18:59 -0500)]
Updating celery_setup.from_celery to use new config loading / app init
- The code for this is significantly simpler now. The app sets up
everything but celery, and from_celery finishes the job.
- There's no more specifying the mediagoblin section in the file,
which doesn't make sense anymore and was already confusing.
Jef van Schendel [Sat, 18 Jun 2011 23:44:26 +0000 (01:44 +0200)]
Merge remote-tracking branch 'gitorious/master'
Christopher Allan Webber [Sat, 18 Jun 2011 23:31:56 +0000 (18:31 -0500)]
Removing option to set celery config section.
There's no real reason to support setting the celery config section;
so we'll just make it always ['celery'].
Christopher Allan Webber [Sat, 18 Jun 2011 23:30:14 +0000 (18:30 -0500)]
Removing type conversions from setup_celery_from_config.
These simply aren't needed any more, not now that the config validator
stuff does type conversion for us.
Also fixed the docstring to explain force_celery_always_eager.
Christopher Allan Webber [Sat, 18 Jun 2011 23:04:14 +0000 (18:04 -0500)]
Erk! Forgot to include the new mediagoblin.ini.
Christopher Allan Webber [Sat, 18 Jun 2011 22:59:38 +0000 (17:59 -0500)]
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
Christopher Allan Webber [Sat, 18 Jun 2011 21:52:40 +0000 (16:52 -0500)]
Tests for mediagoblin.config functions
Tests for:
- read_mediagoblin_config()
- generate_validation_report()
Christopher Allan Webber [Sat, 18 Jun 2011 21:51:35 +0000 (16:51 -0500)]
CONFIG_SPEC_PATH should be config_spec here, fixing.
cfdv [Sat, 18 Jun 2011 21:42:22 +0000 (16:42 -0500)]
baby step towards enabling profile edits
adds
* url and bio fields to database
* form for editing the user profile
* route to the edit profile controller
* view for the profile editing page
* template for the profile editing page
* link to edit profile in the welcome page
still needs
* thorough inspection to see if it makes sense
* tests
* ?
Christopher Allan Webber [Sat, 18 Jun 2011 20:29:16 +0000 (15:29 -0500)]
Removing unused pkg_resources import from test_celery_setup
Christopher Allan Webber [Sat, 18 Jun 2011 20:18:25 +0000 (15:18 -0500)]
Make REPORT_HEADER a unicode string also. Unicode everywhere, ideally!
Christopher Allan Webber [Sat, 18 Jun 2011 20:01:32 +0000 (15:01 -0500)]
Validation error reporting functionality.
Changed a few things so we can report errors to users properly in the
config loading system.
- We now return from read_mediagoblin_config both a loaded config and
the validation results
- We now have a helper function generate_validation_report that can
generate a proper validation report saying if there are errors in a
way that's useful to users.
- Moved conf->config in the read_mediagoblin_config function, which
looks nicer IMO.
cfdv [Sat, 18 Jun 2011 20:00:05 +0000 (15:00 -0500)]
adds user bio and website url fields to the database
Christopher Allan Webber [Sat, 18 Jun 2011 19:08:58 +0000 (14:08 -0500)]
Let's specifically import string_list()s in the config_spec.
Christopher Allan Webber [Sat, 18 Jun 2011 16:10:46 +0000 (11:10 -0500)]
Merge branch 'master' into configobj
Conflicts:
setup.py