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
*	Merge branch 'master' into test_submission_views_365	Chris Moylan	2011-06-22	22	-68/+224
\|\
\| *	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
\| \|\\| \| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-20	33	-328/+731
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| * \| \| \| \|	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-19	1	-2/+0
\| \|\ \ \ \ \
\| * \ \ \ \ \	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-17	5	-5/+116
\| \|\ \ \ \ \ \ \| \| \| \|_\|_\|/ / \| \| \|/\| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-15	20	-61/+461
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-08	1	-4/+4
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	Added cancel button, capitalised button labels	Jef van Schendel	2011-06-07	3	-3/+4
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Changed edit page: new background image, image is included in form, submit ↵	Jef van Schendel	2011-06-07	2	-5/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	button text changed, title text changed, created new css class for edit forms
\| * \| \| \| \| \| \| \|	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-07	1	-9/+1
\| \|\ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-06	2	-1/+38
\| \|\ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-06	20	-153/+623
\| \|\ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-04	10	-2/+203
\| \|\ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-03	3	-48/+40
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Added lines background to forms	Jef van Schendel	2011-06-02	1	-2/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Right-aligned input buttons, added gradient	Jef van Schendel	2011-06-02	1	-13/+22
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-06-02	5	-7/+135
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \
\| * \ \ \ \ \ \ \ \ \ \ \ \ \	Merge remote-tracking branch 'gitorious/master'	Jef van Schendel	2011-05-31	1	-6/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Improved object_gallery.html spacing	Jef van Schendel	2011-05-31	2	-10/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	began work on submission test. nothing to see here	Chris Moylan	2011-06-21	1	-0/+45
\| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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"
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Also moving the test_server.ini to test_paste.ini to avoid ambiguity.	Christopher Allan Webber	2011-06-20	2	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|