4043 Commits

Author SHA1 Message Date
Loïc Le Ninan
0742e11dff Fixes #899 : DeprecationWarning about Required going away in WTForms 3.0. Replaced Required with InputRequired. 2014-06-13 10:23:07 -05:00
Natalie Foust-Pilcher
b9d990ac6a Fixed another error created by my last fix 2014-06-12 14:48:15 -04:00
Natalie Foust-Pilcher
32ba7efcfc Fixed a fatal error causing mediagoblin to crash when certain types of media
were uploaded
2014-06-12 14:12:34 -04:00
Christopher Allan Webber
9f84506885 Adding Loïc Le Ninan to the contributor list 2014-06-11 17:06:11 -05:00
Loïc Le Ninan
8c7ba963af #303 : enhancement : add a command to delete users 2014-06-11 16:42:26 -05:00
Rodrigo Rodrigues da Silva
8db3277cd7 Put block mediagoblin_sidebar back in user_pages/media.html. Fixes issue #906. 2014-06-11 11:37:03 -05:00
Christopher Allan Webber
713dde5b9d Adding comments in the migration explaining a bit what's going on.
This commit sponsored by Philip Horger.  Thank you!
2014-06-11 11:09:28 -05:00
Christopher Allan Webber
987a63514f Explicitly set the column names to "user" and "privilege" 2014-06-11 11:01:17 -05:00
Christopher Allan Webber
c56a88b43e Switch "user_id" to "privilege" and "privilege_id" to "user".
This builds on the previous code Natalie wrote, but makes some changes:
 - More direct alterations for non-sqlite code
 - In both cases, I've made it so that we switched the field names from
   privilege_id and user_id to user and privilege respectively.  This
   way we can do the name swap, but in one case it's "easy": just
   changing the name.  (In the sqlite case it's still tricky though.)
2014-06-10 18:02:34 -05:00
Christopher Allan Webber
70bceff85f Merge remote-tracking branch 'refs/remotes/tilly-q/ticket-874' into mergetest
Conflicts:
	mediagoblin/db/migrations.py
2014-06-10 16:48:45 -05:00
Christopher Allan Webber
1ec440b446 Adding Rodrigo to AUTHORS 2014-06-10 11:51:12 -05:00
Rodrigo Rodrigues da Silva
33ee70f9b0 Adding a template hook to the dropdown header 2014-06-10 11:49:41 -05:00
Christopher Allan Webber
eb7f69ac30 metadata here should really be stored_metadata.
We went through all the difficulty of converting the tags and never
saved them!

Thanks to Boris Bobrov for pointing this out.

This commit also sponsored by William Kahn-Greene.  Thanks Will... for
everything! :)
2014-06-06 09:57:27 -05:00
Christopher Allan Webber
d57dd89e98 psql, not postgres, in configure.ac 2014-06-05 11:01:21 -05:00
Berker Peksag
76bb92dcb4 Fix a typo in babel.ini. 2014-06-02 10:41:26 -05:00
Christopher Allan Webber
b02e37c297 removing zh and ja from RTL list. medicalwei reports they are not RTL languages.
This commit sponsored by Philipp Edelmann.  Thanks!
2014-06-02 10:39:23 -05:00
Christopher Allan Webber
ac7f3b17bf git submodule fetch -> git submodule update 2014-06-02 10:34:16 -05:00
tilly-Q
4ed4908cbd Added pyld to the mediagoblin dependencies because it is necessary with the new
metadata functionality.
2014-05-29 12:57:40 -04:00
tilly-Q
da537ed44e Merge branch 'metadata' 2014-05-14 13:02:30 -04:00
tilly-Q
2daf8ec000 Fixed a small error relating to the default value of media_metadata 2014-05-14 12:34:13 -04:00
tilly-Q
414c682fb4 Added some tests for metadata. 2014-05-14 12:16:03 -04:00
tilly-Q
1688abbfc4 Cleaned up the code a little bit 2014-05-14 12:03:58 -04:00
tilly-Q
0e69d93295 Fixed small error in the edit.metadata javascript 2014-05-14 12:02:54 -04:00
tilly-Q
c8abeb58af Set a default value to MediaEntry.media_metadata 2014-05-14 11:56:59 -04:00
tilly-Q
0d6550fb05 Tweaked the metadata edit screen to run jsonschema validators against the data. 2014-05-14 11:51:13 -04:00
tilly-Q
65f5714118 Adjusted batchaddmedia to make use of more internal nodes. Added to the docs. 2014-05-13 18:24:26 -04:00
tilly-Q
375db9c9bc Wrote a test for the compact_and_validate metadata function. 2014-05-13 17:45:29 -04:00
tilly-Q
e78472abac Added 'dc:created' to the list of metadata columns being validated by
jsonschema.
2014-05-13 17:44:10 -04:00
tilly-Q
80fefb8514 Removed unused imports. 2014-05-13 16:59:02 -04:00
tilly-Q
c0ea2bad04 Prepared for input without an 'id' column and made all of the internal nodes
into free floating nodes so that compact_and_validate will remove them.
2014-05-13 16:57:12 -04:00
tilly-Q
03766fd870 Made it so that admins or moderators only would see the feature_management_panel
link if they have the featurer privilege
2014-05-13 16:28:38 -04:00
tilly-Q
2e76016c9a Added a line to the readme 2014-05-13 15:45:50 -04:00
tilly-Q
c5667c7300 Removed unused imports and removed development only migrations fromc
archivalook plugin
2014-05-13 15:34:35 -04:00
tilly-Q
1d09e8b4f1 Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadata
Conflicts:
	mediagoblin/gmg_commands/__init__.py
2014-05-13 15:24:59 -04:00
tilly-Q
f3ced5db21 Added a link to the manage feature screen in the dropdown menu for
those that have the appropriate privilege. Added a readme.
2014-05-13 15:03:42 -04:00
tilly-Q
b24c27d123 Added the new plugin I've been working at all summer at this link:
6dbd68dab8:
2014-05-13 15:03:42 -04:00
tilly-Q
cc7c9091ac Merge branch 'template_hooks_for_moderation' 2014-05-13 14:49:54 -04:00
tilly-Q
6100f9eef2 Merge branch 'permission_scheme' 2014-05-13 14:47:19 -04:00
tilly-Q
b5dd245989 Made the metadata table functional within the new metadata_display plugin and
removed all traces of it from core.
2014-05-12 18:07:31 -04:00
tilly-Q
f14519c398 Merge branch 'metadata' of gitorious.org:mediagoblin/cwebbers-mediagoblin into metadata
Conflicts:
	mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html
2014-05-12 17:14:55 -04:00
tilly-Q
8524a6bdc5 Added documentation for the batchaddmedia gmg tool to the mediagoblin docs. 2014-05-12 17:02:31 -04:00
Christopher Allan Webber
acfcaf6366 Move the metadata display table over to being contained in a plugin 2014-05-12 14:50:58 -05:00
tilly-Q
8f65028ddf Corrected the rdfa in the metadata table. 2014-05-12 14:48:46 -04:00
tilly-Q
9ceea31c5b Made the metadata table look pretty 2014-05-12 14:27:26 -04:00
tilly-Q
7d52eb7705 Modified the batchaddmedia script so that it only looks for one csv file instead
of the previous method which looked for two files.
2014-05-12 14:10:29 -04:00
tilly-Q
e8d64d453b Cleaned up the 'batchaddmedia' command a bit 2014-05-12 13:19:03 -04:00
tilly-Q
6b6b1b076b Made some changes so that the metadata editing page works well with the updated
metadata tools.
2014-05-12 13:13:46 -04:00
tilly-Q
7bcb3e100c Merge branch 'metadata-editor' into metadata 2014-05-12 12:26:07 -04:00
tilly-Q
494bce47f9 Changed the format of the wtforms table slightly 2014-05-12 12:20:03 -04:00
Christopher Allan Webber
fbea284aeb Removing the prefix stuff 2014-05-11 18:47:55 -05:00