aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Celery wasn't really being properly connected during tests.Christopher Allan Webber2011-06-265-21/+19
| | | | | | | | | | | | | | | Lots of fixes to do this. - setup_celery_from_config no longer responsible for checking 'celery_setup_elsewhere'; that's the app's job. (This was a problem because more than the app was relying on using this function) - Allow us to specifically set the config file we're setting up celery from with setup_self - Set up celery_always_eager. This is something we strongly want while doing tests. - Instead of setting up the app in the get_test_app method, let's set that up simply by importing from_tests, which should itself up via from_celery being the environment variable being set.
* Put the thumbnail on the edit details part on the top and centerChristopher Allan Webber2011-06-251-2/+4
|
* Setting height for media thumbnail to also 200pxChristopher Allan Webber2011-06-241-1/+1
| | | | | Not sure why height wasn't at 200px but anyway not having at 200px means some images would hit overlap.
* Adjust the width of the fields on the form submissionChristopher Allan Webber2011-06-242-3/+5
| | | | | | | | | | | 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)
* Separates out the field rendering part from the whole form rendering macroChristopher Allan Webber2011-06-241-14/+38
| | | | | Also adds a textarea-specific version that renders rows and cols as part of the input.
* Implement basic footerJef van Schendel2011-06-242-1/+39
|
* Remove excess grids, change CSS to center formsJef van Schendel2011-06-236-10/+5
|
* Add <br /> for correct text layoutJef van Schendel2011-06-231-1/+1
|
* Submit form should not have edit_box classJef van Schendel2011-06-231-1/+1
|
* Make several small changes to wording and top bar linksJef van Schendel2011-06-233-7/+9
|
* Merge remote branch 'remotes/schendje/960-grid-system'Christopher Allan Webber2011-06-2211-45/+401
|\
| * Switch css over to 960.gs. If I did everything right, things should look ↵Jef van Schendel2011-06-2311-45/+401
| | | | | | | | exactly the same.
* | Slightly clearer message about email marked as verified w/ adduser gmg commandChristopher Allan Webber2011-06-221-1/+1
| |
* | Setting status to active when adding users with ./bin/gmg adduserChristopher Allan Webber2011-06-221-0/+1
| |
* | Making arguments positional and removing the "usage" functionsChristopher Allan Webber2011-06-221-76/+41
| | | | | | | | | | | | 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.
* | No need to describe usage of subcommands, gmg subcommand --help does thatChristopher Allan Webber2011-06-221-3/+3
| |
* | Adding new function to gmg_commands, adduser,makeadmin and changepw issue 373Alejandro Villanueva2011-06-222-0/+141
|/
* Check on media['uploader']'s id rather than the usernameChristopher Allan Webber2011-06-221-1/+1
| | | | | | 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).
* Merge remote branch 'remotes/gullydwarf-cfdv/is388_only_media_owner_edits'Christopher Allan Webber2011-06-221-4/+6
|\
| * adds conditional for display of media edit linkCaleb Forbes Davis V2011-06-221-4/+6
| |
* | Two not three ways to contribute now, reflecting that in docs :)Christopher Allan Webber2011-06-221-1/+1
| |
* | Add updates background imagesJef van Schendel2011-06-222-0/+0
|/
* Several small UI changes to edit profile page: moved header, changed form ↵Jef van Schendel2011-06-222-5/+5
| | | | wording, changed css class
* Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-222-2/+2
|\
| * Merge remote branch 'remotes/elrond/idea/invalidid'Christopher Allan Webber2011-06-222-2/+2
| |\
| | * Move InvalidId to db.utilElrond2011-06-202-2/+2
| | | | | | | | | | | | | | | | | | 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.
* | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-2212-31/+161
|\| |
| * | I don't think we need the username to be part of the profile editing URLChristopher Allan Webber2011-06-212-4/+2
| | |
| * | Adding an extra space between function definitionsChristopher Allan Webber2011-06-211-0/+1
| | |
| * | Indenting some sections between if / else blocks in root.htmlChristopher Allan Webber2011-06-211-16/+14
| | |
| * | Merge remote branch 'refs/remotes/gullydwarf-cfdv/is315'Christopher Allan Webber2011-06-2110-4/+129
| |\ \
| | * | assigns migration steps to User database objectscfdv2011-06-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | adds the migration_handler to the User db class, connecting the migration steps in ../db/migrations.py to the migration code in gmg_commands
| | * | removes unecessary dependence on existence of username for User migration01, ↵cfdv2011-06-201-6/+5
| | | | | | | | | | | | | | | | + fix whitespace issues
| | * | adds accommmodations for migration of fields in User: bio and urlcfdv2011-06-201-2/+18
| | | |
| | * | Merge remote-tracking branch 'origin/master' into is315cfdv2011-06-2015-34/+160
| | |\ \
| | * \ \ Merge remote-tracking branch 'origin/master' into is315cfdv2011-06-1932-362/+710
| | |\ \ \ | | | | |/ | | | |/|
| | * | | enables primitive display of profile data on user pagecfdv2011-06-182-0/+37
| | | | |
| | * | | enables entering user details including website url and biocfdv2011-06-184-7/+9
| | | | | | | | | | | | | | | | | | | | fixes usage of objects. still need to display the data on user page
| | * | | baby step towards enabling profile editscfdv2011-06-186-2/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 * ?
| | * | | adds user bio and website url fields to the databasecfdv2011-06-181-0/+2
| | | | |
| | * | | adds global link to user's home page in the base.html templatecfdv2011-06-171-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #315 (add bio and website to user page) * enable profile edits * provide place in user's home page for details to appear
| * | | | Extra checks so that we don't even RUN tests unless the right celery environ setChristopher Allan Webber2011-06-212-7/+15
| | | | |
| * | | | Merge branch 'master' of gitorious.org:mediagoblin/mediagoblinChristopher Allan Webber2011-06-212-7/+29
| |\ \ \ \
| * | | | | Make sure we *ONLY* ever kill the test database, EVER.Christopher Allan Webber2011-06-212-9/+9
| | | | | |
* | | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-213-7/+33
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | 333. Adds explanation of command lines; tweaks format-patch lineWill Kahn-Greene2011-06-212-7/+29
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * | | | Also fix clean_html so that it doesn't barf on an empty string.Christopher Allan Webber2011-06-211-0/+4
| | | | |
* | | | | Merge remote-tracking branch 'gitorious/master'Jef van Schendel2011-06-212-1/+7
|\| | | |
| * | | | Only migrate to description_html if description also exists.Christopher Allan Webber2011-06-201-1/+2
| | | | |
| * | | | Fix cleaned_markdown_conversion so that it doesn't bork on empty stringsChristopher Allan Webber2011-06-201-0/+5
| | |_|/ | |/| | | | | | | | | | | | | | Basically, clean_html would throw an error on '', so we just return '' "if not text"