4415 Commits

Author SHA1 Message Date
Aditi
43d143cd66 Add safe pipe for proper rendering of cleaned html. 2013-08-05 17:26:55 +05:30
Aditi
359cd2a29b media template for blog to get blogpost.html template from it. 2013-08-05 17:05:43 +05:30
Aditi
a857954148 Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin 2013-08-04 22:01:21 +05:30
Aditi
ec85d24dfe Write temporary template for blog_post_listing view. 2013-08-04 21:53:48 +05:30
Aditi
63dee1b337 Add icon for the blogpost. 2013-08-04 21:37:13 +05:30
Aditi
f4e7f652d9 Add tinymce code. 2013-08-04 20:41:38 +05:30
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
Aditi
af2f28033b Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin 2013-07-31 19:15:20 +05:30
Aditi
ef010b6453 Update version on tinymce. 2013-07-31 16:14:26 +05:30
Aditi
5955e619c0 Change field name to description. 2013-07-31 14:38:00 +05:30
Aditi
ed46df89aa Add elements for blog system. 2013-07-31 14:37:00 +05:30
Aditi
3e32941299 Add Draft feature and add view blog_post_listing. 2013-07-31 14:33:56 +05:30
Aditi
f506419c89 Add Url for blog post listing. 2013-07-31 14:10:50 +05:30
Aditi
36c7c13185 Fix size and selector for tinymce. 2013-07-31 14:09:47 +05:30
Aditi
fc52268fbe Integrate tinymce, Draft status. 2013-07-31 14:08:12 +05:30
Aditi
2867663d87 Change div class for wider firm fields. 2013-07-31 14:06:31 +05:30
Aditi
ec1d5a4e8e Add blog post state field to blog dashboard. 2013-07-31 14:04:16 +05:30
tilly-Q
63c3ca28ab Starting to write unit tests... 2013-07-30 19:06:26 -04:00
Aditi
46e0bba3da Remove ID of the blog post. 2013-07-30 19:01:17 +05:30
Aditi
59e5c448e9 Reverse order of blog posts on blog dashboard. 2013-07-30 18:58:17 +05:30
Aditi
d59a4b2da0 Manually render form fields for the integration of tinymce. 2013-07-30 18:49:55 +05:30
Aditi
f2a17ed6a7 Add tinymce in head for description field of blog, blogpost edit and create templates. 2013-07-30 18:48:41 +05:30
Aditi
7b23b1e58b Change blogpost_create redirect url. 2013-07-30 15:56:57 +05:30
Aditi
0a2da087e7 Add temporary blogpost display template. 2013-07-30 15:32:21 +05:30
Aditi
b5ae96851c Add feature: redirect to 404 error if blog or blog post slug do not exist. 2013-07-30 15:26:11 +05:30
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
Aditi
47b0c3160e Add Blog Edit button. 2013-07-29 18:00:02 +05:30
Aditi
72514eb272 Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
2013-07-29 13:31:35 +05:30
Aditi
221cde5711 Fix error in blog edit view. 2013-07-29 13:27:30 +05:30
Aditi
8f6a0bf44e Change Redirect url to blog dashboard in blog_edit view. 2013-07-29 11:08:03 +05:30
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