3654 Commits

Author SHA1 Message Date
Jessica Tallon
89909bd692 Fix import errors when running tests 2013-08-13 11:25:40 +01:00
Rodney Ewing
135dd5296b change dropdown button to <a> from <div> so that it is tabbable 2013-08-09 11:38:55 -07:00
Rodney Ewing
d7ecae5a4e Revert "slugs are now generated during processing"
This reverts commit 9da4e8049f2de900f7aa12f2fed8c60d6749ff0b.
2013-08-08 15:49:51 -07:00
Rodney Ewing
b26edfb944 Revert "Leave slug empty until we are sure media processing was successful."
This reverts commit f67611fb485b5a84cedc62b73beb1e551e8cb934.

For some reason, generating a slug here throws an integrity error during
a query when there is a duplicate slug.
2013-08-08 15:49:33 -07:00
Christopher Allan Webber
4de7db6fef Switching the MediaGoblin homepage image over to using the "official" gavroche style 2013-08-08 14:15:47 -05:00
Rodney Ewing
8fc57eaaa6 Add ?next= when trying to add a comment when not logged in 2013-08-08 11:07:12 -07:00
Rodney Ewing
202d951c3d Render 404 if not ajax request 2013-08-07 17:13:38 -07:00
Rodney Ewing
b2d6c45850 change interval to 1000ms 2013-08-07 16:58:06 -07:00
Emily O'Leary
3bd62dc4ca Changed how the comment was encoded/read.
Fixed CSRF + Post with comment preview.
Merged with latest master
2013-08-07 16:33:58 -07:00
Emily O'Leary
3cf4ae0c41 Changed the target of the markdown links for opening in a new tab as suggested by joar. 2013-08-07 16:33:10 -07:00
Emily O'Leary
bb3299ce21 Added i18n to my javascript changes as per trac #417 2013-08-07 16:33:09 -07:00
Emily O'Leary
5ab6029961 Added comment preview functionality to user pages. It works by passing the comment's value as a JSON string to a new handler that lives at /ajax/comment/preview. The query string is decoded, unquoted, and has its leading and trailing quotes removed to match the input that cleaned_markdown_conversion expects.
It does this in real time with a 500ms lag by using a timer. Initially I tried the onChange handler but you need to lose focus for that to process. The javascript timer is only invoked if the add comment button is pressed. A request is only sent if the comment box is not empty and the current value is not the same as the last value.
2013-08-07 16:33:09 -07:00
Rodney Ewing
9da4e8049f slugs are now generated during processing 2013-08-07 16:19:57 -07:00
Rodney Ewing
f67611fb48 Leave slug empty until we are sure media processing was successful.
Patch submitted by LotusEcho
2013-08-07 16:15:27 -07:00
Kenneth Dombrowski
155d234d95 * create config option for optional jinja2 extensions
* add comments & clarify code for jinja2 extensions

Conflicts:
	mediagoblin/config_spec.ini
2013-08-07 16:02:09 -07:00
Rodney Ewing
2ed6afb048 Use the workbench for video processing.
Patch submitted by Kushal
2013-08-07 15:31:40 -07:00
Christopher Allan Webber
316ede4705 autoplay is now by default False for videos.
This commit sponsored by Vasili Sviridov.  Thank you!
2013-08-07 15:03:37 -05:00
Christopher Allan Webber
24e6c34e88 Merge branch 'merge-pyconfigure'
Conflicts:
	docs/source/siteadmin/deploying.rst
2013-08-07 11:57:12 -05:00
Rodney Ewing
31de493e41 typo fix in foundations branch 2013-08-02 07:31:09 -07:00
Rodney Ewing
bf5a8e5452 Merge remote-tracking branch 'tilly-q/ticket-679' 2013-08-02 07:28:35 -07:00
tilly-Q
84c1cd7c52 I added a few more unitests in this commit. It now confirms that even after mi-
-gration, there is only one of each Foundation object.
2013-07-31 20:50:38 -04:00
tilly-Q
07e61ef13a Merge branch 'ticket-679' of gitorious.org:~npigeon/mediagoblin/npigeons-mediagoblin 2013-07-31 20:49:07 -04:00
tilly-Q
860fa806ee In this commit I added a few unittests to account for Foundations. There were
only a few tests I had to add to mediagoblin/tests/test_sql_migrations.py beca-
-use the foundation creation only happens at database initialization.
2013-07-31 20:12:35 -04:00
tilly-Q
9d6e453f8f This commit was the work I did fixing errors that cropped up from the merge.
There were a few errors because of the switch from sqlalchemy 0.7 to 0.8 but I
cleared them up.
2013-07-31 20:11:26 -04:00
Rodney Ewing
2119ee3b90 Merge commit 'refs/merge-requests/55' of git://gitorious.org/mediagoblin/mediagoblin into 55
Conflicts:
	docs/source/siteadmin/relnotes.rst
2013-07-31 15:27:22 -07:00
Rodney Ewing
9b60486894 minor styling updates to docs 2013-07-31 15:16:52 -07:00
Rodney Ewing
bc23c8b9b6 Merge commit 'refs/merge-requests/59' of git://gitorious.org/mediagoblin/mediagoblin into merge-requests/59 2013-07-31 15:07:44 -07:00
tilly-Q
63c3ca28ab Starting to write unit tests... 2013-07-30 19:06:26 -04:00
tilly-Q
52a355b275 Merge branch 'ticket-679' into OPW-Moderation-Update
Conflicts:
	mediagoblin/auth/tools.py
	mediagoblin/auth/views.py
	mediagoblin/db/migration_tools.py
	mediagoblin/db/migrations.py
	mediagoblin/db/models.py
	mediagoblin/decorators.py
	mediagoblin/user_pages/views.py
2013-07-29 18:40:19 -04:00
Christopher Allan Webber
a1e299d60e Why isn't .ogg in this list? A comment explains... it's detected by sniffing!
This commit sponsored by Tom Marble.  Thanks Tom!
2013-07-29 16:50:51 -05:00
tilly-Q
08cd10d84f I actually had to do a bit more work than I thought, because I needed to account
for plugins. In this commit I changed the MigrationManager and DatabaseData ob-
jects to account for FOUNDATIONS in any plugin's (or main program's) models.py
file.
2013-07-29 17:15:29 -04:00
tilly-Q
f2b2008da5 This was a very simple ticket actually. I created a list called FOUNDATIONS in
mediagoblin/db/models.py. This list holds all of the information about rows that
should be created at database initialization. Read the documentation near the
FOUNDATIONS list to understand the proper format for this list.

All of the work is done through a new method on MigrationManager in
mediagoblin/db/migrations_tools.py. This method, `populate_table_foundations`
parses the FOUNDATIONS list and creates the foundations based on the data incl-
uded. This only ever happens when the database is initialized. Migrations to
releases with new Foundations should be very easy just using the basic
database functionality.
2013-07-29 16:36:06 -04:00
tilly-Q
f26c21cd5b This is a very small commit. All that I have done here is to clean up my code
a bit. I made it so that mediagoblin.user_pages.report recieves the report
form as part of it's context. I also made sure I used {% trans %} tags effect-
-ively.
2013-07-29 15:14:39 -04:00
Rodney Ewing
130b85f81a babel 1.0 doesn't have a localedata.list() method, so updated setup.py.
made "import crypto" fully qualified
2013-07-29 11:26:06 -07:00
xray7224
cae55705b1 Fix problem causing exception when invalid Authentication header provided 2013-07-29 17:48:53 +01:00
xray7224
4554d6e014 Fix problem with routing to oauth 2013-07-29 17:29:56 +01:00
xray7224
0ec89cb29f Fixes problem with headers pointing to old federation dir 2013-07-29 17:25:10 +01:00
tilly-Q
3aa3871b90 This commit had some important milestones in it. The major update is that now I
have mostly completed the moderator punishment and resolution of reports. Along
with this, I have also added one last table to the database: one that holds ar-
-chived (or resolved) reports. This is some of the primary functionality of my
whole update, so this is a big step! The other changes I made this update are
primarily organizational. I refactored some of my code into functions and I cl-
eaned up many of my templates.

--\ mediagoblin/db/models.py
--| Created the new ArchivedReport table
--| Removed columns from BaseReport table that are only necessary for Archived
  |    reports

--\ mediagoblin/db/migrations.py
--| Created the new ArchivedReport table
--| Removed columns from BaseReport table that are only necessary for Archived
  |    reports

--\ mediagoblin/db/util.py
--| Created the user_privileges_to_dictionary function. This is useful for
  |    accessing a user's permissions from within a template.

--\ mediagoblin/moderation/forms.py
--| Expanded the disciplinary actions a moderator can take
--| Allowed the moderator to choose more than one disciplinary action at a time
  |    (It's now managed with a list of checkboxes rather than radio buttons)
----| Pulled a MultiCheckBox class from  a wtforms tutorial
--| Added various other form inputs for details of the moderator's disciplinary
  |    actions
--| Tried to ensure that every string is unicode and translated

--\ mediagoblin/moderation/tools.py
--| Created this file for holding useful moderation tools
--| Moved the penalizing code from views to the function take_punitive_actions
--| Added many more types of punitive actions
--| Added the archiving of old reports

--\ mediagoblin/moderation/views.py
--| Used the privileges_to_dictionary function for the Users Detail view to
  |   allow for different actions available to a moderator and an admin.
--| Added in functionality for ArchivedReports to the reports_detail and
  |   reports_panel views
--| Moved the punishments of repots_detail to tools.py (as mentioned above)

--\ mediagoblin/static/css/base.css
--| Added new styling for the User Detail page

--\ mediagoblin/static/images/icon_clipboard_alert.png
--| Added this image to represent unresolved reports

--\ mediagoblin/templates/mediagoblin/moderation/report.html
--| Added 'Return to Reports Panel' button
--| Fixed the spacing to be less that 80 columns wide
--| Added in display for Archived Reports

--\ mediagoblin/templates/mediagoblin/moderation/reports_panel.html
--| Changed the placement and columns of the tables
--| Fixed the spacing to be less that 80 columns wide
--| Added in display for Archived Reports

--\ mediagoblin/templates/mediagoblin/moderation/user.html
--| Fixed the spacing to be less that 80 columns wide
--| Took away the moderator's ability to add and remove privileges at will.
  |  Only the admin has this power now.

--\ mediagoblin/templates/mediagoblin/moderation/users_panel.html
--| Fixed the spacing to be less that 80 columns wide

--\ mediagoblin/tools/response.py
--| Added in code to remove a UserBan from a User if that user logs in after
  |  the expiration date
2013-07-27 16:44:40 -04:00
Christopher Allan Webber
99d79749c4 Set up in-package virtualenv via make 2013-07-25 15:15:49 -05:00
Christopher Allan Webber
68f6f91339 Removing aclocal.m4, which is autogenerated 2013-07-25 14:56:08 -05:00
Christopher Allan Webber
7b3d6c675e Adding .gitignore for pyconfigure/automake generated files 2013-07-25 14:53:18 -05:00
Christopher Allan Webber
00ed01b7cb Moving setup.py.in back to setup.py 2013-07-25 14:34:48 -05:00
Christopher Allan Webber
2723bb154a Merge remote-tracking branch 'refs/remotes/brandoninvergo/pyconfigure' into merge-pyconfigure 2013-07-25 14:29:30 -05:00
Christopher Allan Webber
9a2b36c9a2 More up to date README 2013-07-25 14:05:50 -05:00
Christopher Allan Webber
b889f97156 Move the "cd mediagoblin" to the right line. Thanks usrnix!
This commit sponsored by Kenneth Dombrowski.  Thanks!
2013-07-23 20:24:30 -05:00
xray7224
005181b166 Renames OAuth1 code to federation 2013-07-22 17:06:00 +01:00
xray7224
657263abdf Refactor WTFormData 2013-07-22 16:56:22 +01:00
Jessica Tallon
8e3bf97821 Fix problem with migration - OAuth 2013-07-22 17:17:01 +01:00
Jessica Tallon
617bff1830 Fixes some typo's and removes unused imports 2013-07-20 19:08:02 +01:00
xray7224
7271b06282 Moves first versions of the the models to migrations 2013-07-18 20:39:15 +01:00