This website requires JavaScript.
75ce65cf59
mocked out submission spec
Chris Moylan
2011-06-30 00:13:47 -05:00
c86109dd91
Merge branch 'master' into test_submission_views_365
Chris Moylan
2011-06-29 23:45:05 -05:00
52359e9103
Excitedly send a user a message that their comment was posted.
Christopher Allan Webber
2011-06-29 20:51:17 -05:00
95e6da024d
Use the cleaned_markdown_conversion method instead of doing that manually
Christopher Allan Webber
2011-06-29 20:41:52 -05:00
216cd9c85c
Merge remote branch 'remotes/jwandborg/feature_362-simple_comments'
Christopher Allan Webber
2011-06-29 20:27:48 -05:00
47f524f67d
Merge branch 'feature_362-simple_comments'
Joar Wandborg
2011-06-29 16:12:33 +02:00
741d5a375d
Put messages.html in grid_12, above content
Jef van Schendel
2011-06-29 14:05:28 +02:00
d022d9f93f
Merge remote-tracking branch 'gitorious/master'
Jef van Schendel
2011-06-29 13:53:17 +02:00
4ce57ac85d
Merge branch 'master' into test_submission_views_365
Chris Moylan
2011-06-28 23:05:03 -05:00
b0d835fcd0
Making the messages conform to the 960.gx widths
Christopher Allan Webber
2011-06-28 20:56:06 -05:00
604ed842b3
Styling for the messaging list items. A rainbow of messages!
Christopher Allan Webber
2011-06-28 20:54:40 -05:00
86e3e90080
Merge remote branch 'remotes/gullydwarf-cfdv/f368_msg_framework'
Christopher Allan Webber
2011-06-28 20:09:35 -05:00
074ac832c3
Issue #362 - Added new wtforms.Form; MediaCommentForm()
Joar Wandborg
2011-06-29 01:35:43 +02:00
9074ee7c1d
Issue #362 - Updated mediagoblin.user_pages.views to handle new "Simple comments" feature
Joar Wandborg
2011-06-29 01:29:39 +02:00
aa7d1a2fb6
Issue #362 - Updated media.html with things necessary for the simple comment feature
Joar Wandborg
2011-06-29 01:21:46 +02:00
7bd8197f32
Issue #362 - Updated the MediaComment model
Joar Wandborg
2011-06-29 01:16:51 +02:00
6a585e4c52
Issue #362 - Added a route to MediaComment POST handler
Joar Wandborg
2011-06-29 01:14:52 +02:00
a4e4d77548
Merge remote-tracking branch 'gitorious/master'
Jef van Schendel
2011-06-28 13:50:05 +02:00
9f094beaaf
adds message queue unit testing
Caleb Forbes Davis V
2011-06-28 02:35:44 -05:00
a8923a7da3
removes messages.add_message from the global template context
Caleb Forbes Davis V
2011-06-27 23:49:57 -05:00
2527754202
Documenging index utils and adjusting how remove_deprecated_indexes gets arguments
Christopher Allan Webber
2011-06-27 20:48:35 -05:00
1f7749995d
Documentation updates to indexes.py's docstring
Christopher Allan Webber
2011-06-27 20:40:31 -05:00
8db03585a2
Updating migrate.py to actually run the indexing commands
Christopher Allan Webber
2011-06-27 20:05:01 -05:00
b1db6f20dd
Adding our current indexes and removing the index that was in models.py
Christopher Allan Webber
2011-06-27 16:56:41 -05:00
0f3167c9f0
Tools to add / remove indexes from collections
Christopher Allan Webber
2011-06-27 16:56:12 -05:00
c11f21ab3c
Issue 362 - Add simple comments
Joar Wandborg
2011-06-27 23:39:40 +02:00
664682aaf6
Tiny changes
Jef van Schendel
2011-06-27 22:41:58 +02:00
a54e5be78e
Implement sidebar on media page
Jef van Schendel
2011-06-27 22:39:05 +02:00
2264670357
adds message queue
Caleb Forbes Davis V
2011-06-27 13:13:52 -05:00
ca5d2c51b6
Store the collection information in the ACTIVE_INDEXES keys
Christopher Allan Webber
2011-06-26 21:51:38 -05:00
3cd6ea5b17
A base set of indexes for us to use with our new indexing tool.
Christopher Allan Webber
2011-06-26 21:10:16 -05:00
da0683b48c
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber
2011-06-26 15:22:01 -05:00
9ea5c28b7a
Celery wasn't really being properly connected during tests.
Christopher Allan Webber
2011-06-26 14:45:19 -05:00
e1d9e1d139
Reordering the uploaded on/by and description sections of media display template
Christopher Allan Webber
2011-06-25 14:32:31 -05:00
d4a7a03ce7
Align images in a gallery to the center
Christopher Allan Webber
2011-06-25 13:15:15 -05:00
fcb3166270
Just adjusting indentation a little bit in the base template.
Christopher Allan Webber
2011-06-25 13:10:25 -05:00
4765a52b1f
Merge remote branch 'remotes/gullydwarf-cfdv/is330'
Christopher Allan Webber
2011-06-25 13:08:04 -05:00
f7b7511b7b
Make the width of these fields 100% rather than providing a specific pixel width.
Christopher Allan Webber
2011-06-25 12:55:42 -05:00
426685e088
Put the thumbnail on the edit details part on the top and center
Christopher Allan Webber
2011-06-25 00:28:03 -05:00
39c76f30f0
Setting height for media thumbnail to also 200px
Christopher Allan Webber
2011-06-24 23:53:31 -05:00
353f927e9f
Adjust the width of the fields on the form submission
Christopher Allan Webber
2011-06-24 23:49:37 -05:00
528f9acd23
Separates out the field rendering part from the whole form rendering macro
Christopher Allan Webber
2011-06-24 23:46:11 -05:00
9f661642ef
Implement basic footer
Jef van Schendel
2011-06-24 21:03:05 +02:00
0a78be3e08
removed the @setup_fresh_app decorator because it was messing \ with my fixtures.
Chris Moylan
2011-06-23 23:02:36 -05:00
b6ae3aa616
Merge branch 'master' into test_submission_views_365
Chris Moylan
2011-06-23 21:55:22 -05:00
c397b962de
Remove excess grids, change CSS to center forms
Jef van Schendel
2011-06-23 17:39:13 +02:00
dd0d7f24bc
Add <br /> for correct text layout
Jef van Schendel
2011-06-23 16:47:27 +02:00
454835832c
Submit form should not have edit_box class
Jef van Schendel
2011-06-23 16:40:33 +02:00
b9bce89f6f
Make several small changes to wording and top bar links
Jef van Schendel
2011-06-23 16:38:55 +02:00
d94b84b437
Merge remote branch 'remotes/schendje/960-grid-system'
Christopher Allan Webber
2011-06-22 22:21:08 -05:00
64201d12c3
Slightly clearer message about email marked as verified w/ adduser gmg command
Christopher Allan Webber
2011-06-22 22:17:58 -05:00
a3fae1bd07
Setting status to active when adding users with ./bin/gmg adduser
Christopher Allan Webber
2011-06-22 22:16:50 -05:00
8781ddb541
Making arguments positional and removing the "usage" functions
Christopher Allan Webber
2011-06-22 22:16:37 -05:00
7f4b44710b
No need to describe usage of subcommands, gmg subcommand --help does that
Christopher Allan Webber
2011-06-22 22:09:11 -05:00
96108ea285
Adding new function to gmg_commands, adduser,makeadmin and changepw issue 373
Alejandro Villanueva
2011-06-22 11:51:31 -05:00
dcebe4b032
Merge branch 'master' into test_submission_views_365
Chris Moylan
2011-06-22 21:40:17 -05:00
f7bcfafff0
Switch css over to 960.gs. If I did everything right, things should look exactly the same.
Jef van Schendel
2011-06-23 02:09:00 +02:00
54de443a6a
Check on media['uploader']'s id rather than the username
Christopher Allan Webber
2011-06-22 13:57:34 -05:00
3a2b22e346
Merge remote branch 'remotes/gullydwarf-cfdv/is388_only_media_owner_edits'
Christopher Allan Webber
2011-06-22 13:54:14 -05:00
7577b7dfbe
Two not three ways to contribute now, reflecting that in docs :)
Christopher Allan Webber
2011-06-22 12:38:08 -05:00
ca9c7a07b2
adds conditional for display of media edit link
Caleb Forbes Davis V
2011-06-22 12:13:29 -05:00
b4c0aeb686
Add updates background images
Jef van Schendel
2011-06-22 17:48:20 +02:00
1db7bed64b
Several small UI changes to edit profile page: moved header, changed form wording, changed css class
Jef van Schendel
2011-06-22 17:02:28 +02:00
7f8a70ef25
Merge remote-tracking branch 'gitorious/master'
Jef van Schendel
2011-06-22 17:01:20 +02:00
cf383901a9
Merge remote branch 'remotes/elrond/idea/invalidid'
Christopher Allan Webber
2011-06-22 09:52:13 -05:00
69a303a84c
Merge remote-tracking branch 'gitorious/master'
Jef van Schendel
2011-06-22 15:32:06 +02:00
d220f87c12
I don't think we need the username to be part of the profile editing URL
Christopher Allan Webber
2011-06-21 23:26:45 -05:00
46fd661e34
Adding an extra space between function definitions
Christopher Allan Webber
2011-06-21 23:26:18 -05:00
b9f097a6f9
Indenting some sections between if / else blocks in root.html
Christopher Allan Webber
2011-06-21 23:25:15 -05:00
3208bea54c
Merge remote branch 'refs/remotes/gullydwarf-cfdv/is315'
Christopher Allan Webber
2011-06-21 23:22:16 -05:00
29f1333e72
Extra checks so that we don't even RUN tests unless the right celery environ set
Christopher Allan Webber
2011-06-21 17:02:49 -05:00
26c61fc843
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin
Christopher Allan Webber
2011-06-21 16:06:09 -05:00
cfd2cbf3dd
Make sure we *ONLY* ever kill the test database, EVER.
Christopher Allan Webber
2011-06-21 16:04:44 -05:00
3efb084809
Merge remote-tracking branch 'gitorious/master'
Jef van Schendel
2011-06-21 19:13:07 +02:00
f439193628
333. Adds explanation of command lines; tweaks format-patch line
Will Kahn-Greene
2011-06-14 22:06:01 -04:00
4fd18da0a8
Also fix clean_html so that it doesn't barf on an empty string.
Christopher Allan Webber
2011-06-21 08:20:05 -05:00
4e5a55787b
Merge remote-tracking branch 'gitorious/master'
Jef van Schendel
2011-06-21 11:22:31 +02:00
1975b5dd1f
began work on submission test. nothing to see here
Chris Moylan
2011-06-21 00:11:54 -05:00
0472653ee4
assigns migration steps to User database objects
cfdv
2011-06-20 22:47:43 -05:00
a2c37d0a78
Only migrate to description_html if description also exists.
Christopher Allan Webber
2011-06-20 21:02:46 -05:00
8268884653
Fix cleaned_markdown_conversion so that it doesn't bork on empty strings
Christopher Allan Webber
2011-06-20 21:01:05 -05:00
17bb7c388b
removes unecessary dependence on existence of username for User migration01, + fix whitespace issues
cfdv
2011-06-20 19:28:02 -05:00
e36ecab093
adds accommmodations for migration of fields in User: bio and url
cfdv
2011-06-20 13:07:15 -05:00
78c0744077
Merge remote-tracking branch 'origin/master' into is315
cfdv
2011-06-20 12:50:44 -05:00
2d1f91cc41
Merge remote-tracking branch 'gitorious/master'
Jef van Schendel
2011-06-20 16:33:14 +02:00
5c441e75eb
Also moving the test_server.ini to test_paste.ini to avoid ambiguity.
Christopher Allan Webber
2011-06-20 08:57:58 -05:00
41f965c59d
Moving server.ini->paste.ini because willkg points out server.ini is ambiguous
Christopher Allan Webber
2011-06-20 08:55:58 -05:00
fcdd172264
Updated git documentation to have more useful branch names.
Christopher Allan Webber
2011-06-19 20:53:38 -05:00
a01d04a017
Provide a migration to add description_html to MediaEntries that don't have it
Christopher Allan Webber
2011-06-19 20:42:48 -05:00
4bf8e8888c
Adds util.cleaned_markdown_conversion() and uses it in the submission process
Christopher Allan Webber
2011-06-19 20:41:40 -05:00
0692c01e4c
Merge remote branch 'remotes/jwandborg/issue_363'
Christopher Allan Webber
2011-06-19 20:00:35 -05:00
0798684894
Merge remote branch 'remotes/cmoylan/test_auth_views_364'
Christopher Allan Webber
2011-06-19 19:56:25 -05:00
0e66e6a6c6
Merge branch 'is330', remote-tracking branch 'origin/master' into is330
cfdv
2011-06-19 17:39:32 -05:00
cd95cb6d3d
Merge remote-tracking branch 'origin/master' into is315
cfdv
2011-06-19 17:20:23 -05:00
3efdd97c2e
Move InvalidId to db.util
Elrond
2011-06-20 00:09:40 +02:00
8b7663a0bd
Making ./runtests.sh the official way to run the tests.
Christopher Allan Webber
2011-06-19 16:52:27 -05:00
188240e312
./runtests.sh: run unit tests without having to remember the long command.
Christopher Allan Webber
2011-06-19 16:51:02 -05:00
eaca78748c
Need to run nosetests with CELERY_CONFIG_MODULE set to from_tests again.
Christopher Allan Webber
2011-06-19 16:43:23 -05:00
68bf5b1942
Documenting the setup_globals function.
Christopher Allan Webber
2011-06-19 16:24:31 -05:00
218b8124ca
Document our new global objects added during the configobj branch
Christopher Allan Webber
2011-06-19 16:23:17 -05:00