mediagoblin.git - MediaGoblin is a free software media publishing platform that anyone can run, with Plyr player for default, search and without nodejs

	Commit message (Collapse)	Author	Age	Files	Lines
*	Switch css over to 960.gs. If I did everything right, things should look ↵	Jef van Schendel	2011-06-23	11	-45/+401
\| \| \| \|	exactly the same.
*	Check on media['uploader']'s id rather than the username	Christopher Allan Webber	2011-06-22	1	-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 Webber	2011-06-22	1	-4/+6
\|\
\| *	adds conditional for display of media edit link	Caleb Forbes Davis V	2011-06-22	1	-4/+6
\| \|
* \|	Add updates background images	Jef van Schendel	2011-06-22	2	-0/+0
\|/
*	Several small UI changes to edit profile page: moved header, changed form ↵	Jef van Schendel	2011-06-22	2	-5/+5
\| \| \| \|	wording, changed css class
*	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-22	2	-2/+2
\|\
\| *	Merge remote branch 'remotes/elrond/idea/invalidid'	Christopher Allan Webber	2011-06-22	2	-2/+2
\| \|\
\| \| *	Move InvalidId to db.util	Elrond	2011-06-20	2	-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 Schendel	2011-06-22	12	-31/+161
\|\\| \|
\| * \|	I don't think we need the username to be part of the profile editing URL	Christopher Allan Webber	2011-06-21	2	-4/+2
\| \| \|
\| * \|	Adding an extra space between function definitions	Christopher Allan Webber	2011-06-21	1	-0/+1
\| \| \|
\| * \|	Indenting some sections between if / else blocks in root.html	Christopher Allan Webber	2011-06-21	1	-16/+14
\| \| \|
\| * \|	Merge remote branch 'refs/remotes/gullydwarf-cfdv/is315'	Christopher Allan Webber	2011-06-21	10	-4/+129
\| \|\ \
\| \| * \|	assigns migration steps to User database objects	cfdv	2011-06-20	1	-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, ↵	cfdv	2011-06-20	1	-6/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	+ fix whitespace issues
\| \| * \|	adds accommmodations for migration of fields in User: bio and url	cfdv	2011-06-20	1	-2/+18
\| \| \| \|
\| \| * \|	Merge remote-tracking branch 'origin/master' into is315	cfdv	2011-06-20	10	-17/+142
\| \| \|\ \
\| \| * \ \	Merge remote-tracking branch 'origin/master' into is315	cfdv	2011-06-19	26	-312/+588
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	enables primitive display of profile data on user page	cfdv	2011-06-18	2	-0/+37
\| \| \| \| \|
\| \| * \| \|	enables entering user details including website url and bio	cfdv	2011-06-18	4	-7/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	fixes usage of objects. still need to display the data on user page
\| \| * \| \|	baby step towards enabling profile edits	cfdv	2011-06-18	6	-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 database	cfdv	2011-06-18	1	-0/+2
\| \| \| \| \|
\| \| * \| \|	adds global link to user's home page in the base.html template	cfdv	2011-06-17	1	-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 set	Christopher Allan Webber	2011-06-21	2	-7/+15
\| \| \| \| \|
\| * \| \| \|	Make sure we ONLY ever kill the test database, EVER.	Christopher Allan Webber	2011-06-21	2	-9/+9
\| \| \| \| \|
* \| \| \| \|	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-21	1	-0/+4
\|\\| \| \| \|
\| * \| \| \|	Also fix clean_html so that it doesn't barf on an empty string.	Christopher Allan Webber	2011-06-21	1	-0/+4
\| \| \| \| \|
* \| \| \| \|	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-21	2	-1/+7
\|\\| \| \| \|
\| * \| \| \|	Only migrate to description_html if description also exists.	Christopher Allan Webber	2011-06-20	1	-1/+2
\| \| \| \| \|
\| * \| \| \|	Fix cleaned_markdown_conversion so that it doesn't bork on empty strings	Christopher Allan Webber	2011-06-20	1	-0/+5
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|	Basically, clean_html would throw an error on '', so we just return '' "if not text"
* \| \| \|	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-20	33	-328/+731
\|\\| \| \|
\| * \| \|	Also moving the test_server.ini to test_paste.ini to avoid ambiguity.	Christopher Allan Webber	2011-06-20	2	-1/+1
\| \| \| \|
\| * \| \|	Provide a migration to add description_html to MediaEntries that don't have it	Christopher Allan Webber	2011-06-19	1	-0/+16
\| \| \| \|
\| * \| \|	Adds util.cleaned_markdown_conversion() and uses it in the submission process	Christopher Allan Webber	2011-06-19	2	-10/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This simplifies the markdown processing & html cleaning of descritions and etc by providing a wrapper function that we can use in multiple locations.
\| * \| \|	Merge remote branch 'remotes/jwandborg/issue_363'	Christopher Allan Webber	2011-06-19	6	-9/+29
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: setup.py
\| \| * \| \|	Made changes according to http://bugs.foocorp.net/issues/363#note-5	Joar Wandborg	2011-06-15	2	-8/+12
\| \| \| \| \|
\| \| * \| \|	Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin	Joar Wandborg	2011-06-15	18	-119/+188
\| \| \|\ \ \
\| \| * \ \ \	Merge branch 'master' of http://git.gitorious.org/mediagoblin/mediagoblin	Joar Wandborg	2011-06-12	7	-17/+348
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Added Markdown rendering for `media_entry`	Joar Wandborg	2011-06-12	6	-7/+23
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote branch 'remotes/cmoylan/test_auth_views_364'	Christopher Allan Webber	2011-06-19	1	-6/+86
\| \|\ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| \| * \| \| \| \|	added test coverage for redirecting after login with the next param	Chris Moylan	2011-06-19	1	-2/+12
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Added tests for all sorts of login form abuse.	Chris Moylan	2011-06-19	1	-6/+76
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added tests for log out
\| * \| \| \| \| \|	Need to run nosetests with CELERY_CONFIG_MODULE set to from_tests again.	Christopher Allan Webber	2011-06-19	3	-8/+40
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Basically, if we don't do this celery sets itself up before it should and improperly. :\
\| * \| \| \| \| \|	Documenting the setup_globals function.	Christopher Allan Webber	2011-06-19	1	-0/+6
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Document our new global objects added during the configobj branch	Christopher Allan Webber	2011-06-19	1	-0/+8
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote branch 'remotes/elrond/idea/globals_check'	Christopher Allan Webber	2011-06-19	2	-0/+18
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mediagoblin/tests/test_globals.py
\| \| * \| \| \| \| \|	Let setup_globals check for known globals	Elrond	2011-06-12	2	-0/+18
\| \| \| \|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	To avoid typos in calling setup_globals(), only allow globals, which are already known to the system. Plugins should have their own globals.
\| * \| \| \| \| \|	Reset the globals parameters while testing parameters	Christopher Allan Webber	2011-06-19	1	-11/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(This way we can be sure that the database is torn down if necessary but this was the only test that passed last.)
\| * \| \| \| \| \|	Actually we need pkg_resources again in test_celery_setup :)	Christopher Allan Webber	2011-06-19	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This got removed in master at the same time that it got used in the configobj branch...