mediagoblin.git
10 years agoPut block mediagoblin_sidebar back in user_pages/media.html. Fixes issue #906.
Rodrigo Rodrigues da Silva [Mon, 9 Jun 2014 17:40:21 +0000 (14:40 -0300)]
Put block mediagoblin_sidebar back in user_pages/media.html. Fixes issue #906.

10 years agoAdding comments in the migration explaining a bit what's going on.
Christopher Allan Webber [Wed, 11 Jun 2014 16:09:28 +0000 (11:09 -0500)]
Adding comments in the migration explaining a bit what's going on.

This commit sponsored by Philip Horger.  Thank you!

10 years agoExplicitly set the column names to "user" and "privilege"
Christopher Allan Webber [Wed, 11 Jun 2014 16:01:17 +0000 (11:01 -0500)]
Explicitly set the column names to "user" and "privilege"

10 years agoSwitch "user_id" to "privilege" and "privilege_id" to "user".
Christopher Allan Webber [Tue, 10 Jun 2014 23:02:34 +0000 (18:02 -0500)]
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.)

10 years agoMerge remote-tracking branch 'refs/remotes/tilly-q/ticket-874' into mergetest
Christopher Allan Webber [Tue, 10 Jun 2014 21:48:45 +0000 (16:48 -0500)]
Merge remote-tracking branch 'refs/remotes/tilly-q/ticket-874' into mergetest

Conflicts:
mediagoblin/db/migrations.py

10 years agoAdding Rodrigo to AUTHORS
Christopher Allan Webber [Tue, 10 Jun 2014 16:51:12 +0000 (11:51 -0500)]
Adding Rodrigo to AUTHORS

10 years agoAdding a template hook to the dropdown header
Rodrigo Rodrigues da Silva [Thu, 5 Jun 2014 20:07:25 +0000 (17:07 -0300)]
Adding a template hook to the dropdown header

10 years agometadata here should really be stored_metadata.
Christopher Allan Webber [Fri, 6 Jun 2014 14:57:27 +0000 (09:57 -0500)]
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! :)

10 years agopsql, not postgres, in configure.ac
Christopher Allan Webber [Thu, 5 Jun 2014 16:01:21 +0000 (11:01 -0500)]
psql, not postgres, in configure.ac

10 years agoFix a typo in babel.ini.
Berker Peksag [Fri, 9 May 2014 13:26:09 +0000 (16:26 +0300)]
Fix a typo in babel.ini.

10 years agoremoving zh and ja from RTL list. medicalwei reports they are not RTL languages.
Christopher Allan Webber [Mon, 2 Jun 2014 15:39:23 +0000 (10:39 -0500)]
removing zh and ja from RTL list.  medicalwei reports they are not RTL languages.

This commit sponsored by Philipp Edelmann.  Thanks!

10 years agogit submodule fetch -> git submodule update
Christopher Allan Webber [Mon, 2 Jun 2014 15:31:49 +0000 (10:31 -0500)]
git submodule fetch -> git submodule update

10 years agoAdded pyld to the mediagoblin dependencies because it is necessary with the new
tilly-Q [Thu, 29 May 2014 16:57:40 +0000 (12:57 -0400)]
Added pyld to the mediagoblin dependencies because it is necessary with the new
metadata functionality.

10 years agoMerge branch 'metadata'
tilly-Q [Wed, 14 May 2014 17:02:30 +0000 (13:02 -0400)]
Merge branch 'metadata'

10 years agoFixed a small error relating to the default value of media_metadata
tilly-Q [Wed, 14 May 2014 16:34:13 +0000 (12:34 -0400)]
Fixed a small error relating to the default value of media_metadata

10 years agoAdded some tests for metadata.
tilly-Q [Wed, 14 May 2014 16:16:03 +0000 (12:16 -0400)]
Added some tests for metadata.

10 years agoCleaned up the code a little bit
tilly-Q [Wed, 14 May 2014 16:03:58 +0000 (12:03 -0400)]
Cleaned up the code a little bit

10 years agoFixed small error in the edit.metadata javascript
tilly-Q [Wed, 14 May 2014 16:02:54 +0000 (12:02 -0400)]
Fixed small error in the edit.metadata javascript

10 years agoSet a default value to MediaEntry.media_metadata
tilly-Q [Wed, 14 May 2014 15:56:59 +0000 (11:56 -0400)]
Set a default value to MediaEntry.media_metadata

10 years agoTweaked the metadata edit screen to run jsonschema validators against the data.
tilly-Q [Wed, 14 May 2014 15:51:13 +0000 (11:51 -0400)]
Tweaked the metadata edit screen to run jsonschema validators against the data.

10 years agoAdjusted batchaddmedia to make use of more internal nodes. Added to the docs.
tilly-Q [Tue, 13 May 2014 22:15:28 +0000 (18:15 -0400)]
Adjusted batchaddmedia to make use of more internal nodes. Added to the docs.

10 years agoWrote a test for the compact_and_validate metadata function.
tilly-Q [Tue, 13 May 2014 21:45:29 +0000 (17:45 -0400)]
Wrote a test for the compact_and_validate metadata function.

10 years agoAdded 'dc:created' to the list of metadata columns being validated by
tilly-Q [Tue, 13 May 2014 21:44:10 +0000 (17:44 -0400)]
Added 'dc:created' to the list of metadata columns being validated by
jsonschema.

10 years agoRemoved unused imports.
tilly-Q [Tue, 13 May 2014 20:59:02 +0000 (16:59 -0400)]
Removed unused imports.

10 years agoPrepared for input without an 'id' column and made all of the internal nodes
tilly-Q [Tue, 13 May 2014 20:53:28 +0000 (16:53 -0400)]
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.

10 years agoMade it so that admins or moderators only would see the feature_management_panel
tilly-Q [Tue, 13 May 2014 20:26:00 +0000 (16:26 -0400)]
Made it so that admins or moderators only would see the feature_management_panel
link if they have the featurer privilege

10 years agoAdded a line to the readme
tilly-Q [Tue, 13 May 2014 19:45:50 +0000 (15:45 -0400)]
Added a line to the readme

10 years agoRemoved unused imports and removed development only migrations fromc
tilly-Q [Tue, 13 May 2014 19:34:06 +0000 (15:34 -0400)]
Removed unused imports and removed development only migrations fromc
archivalook plugin

10 years agoMerge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadata
tilly-Q [Tue, 13 May 2014 19:24:59 +0000 (15:24 -0400)]
Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadata

Conflicts:
mediagoblin/gmg_commands/__init__.py

10 years agoAdded a link to the manage feature screen in the dropdown menu for
tilly-Q [Tue, 13 May 2014 18:58:04 +0000 (14:58 -0400)]
Added a link to the manage feature screen in the dropdown menu for
those that have the appropriate privilege. Added a readme.

10 years agoAdded the new plugin I've been working at all summer at this link:
tilly-Q [Tue, 13 May 2014 15:47:41 +0000 (11:47 -0400)]
Added the new plugin I've been working at all summer at this link:
https://gitorious.org/npigeons-mediagoblin/archivalook/source/6dbd68dab85650792456b8e24bbbd36a323c2018:

10 years agoMerge branch 'template_hooks_for_moderation'
tilly-Q [Tue, 13 May 2014 18:49:54 +0000 (14:49 -0400)]
Merge branch 'template_hooks_for_moderation'

10 years agoMerge branch 'permission_scheme'
tilly-Q [Tue, 13 May 2014 18:47:19 +0000 (14:47 -0400)]
Merge branch 'permission_scheme'

10 years agoMade the metadata table functional within the new metadata_display plugin and
tilly-Q [Mon, 12 May 2014 22:07:31 +0000 (18:07 -0400)]
Made the metadata table functional within the new metadata_display plugin and
removed all traces of it from core.

10 years agoMerge branch 'metadata' of gitorious.org:mediagoblin/cwebbers-mediagoblin into metadata
tilly-Q [Mon, 12 May 2014 21:14:55 +0000 (17:14 -0400)]
Merge branch 'metadata' of gitorious.org:mediagoblin/cwebbers-mediagoblin into metadata

Conflicts:
mediagoblin/plugins/metadata_display/templates/mediagoblin/plugins/metadata_display/metadata_table.html

10 years agoAdded documentation for the batchaddmedia gmg tool to the mediagoblin docs.
tilly-Q [Mon, 12 May 2014 21:02:12 +0000 (17:02 -0400)]
Added documentation for the batchaddmedia gmg tool to the mediagoblin docs.

10 years agoMove the metadata display table over to being contained in a plugin
Christopher Allan Webber [Mon, 12 May 2014 19:50:58 +0000 (14:50 -0500)]
Move the metadata display table over to being contained in a plugin

10 years agoCorrected the rdfa in the metadata table.
tilly-Q [Mon, 12 May 2014 18:48:46 +0000 (14:48 -0400)]
Corrected the rdfa in the metadata table.

10 years agoMade the metadata table look pretty
tilly-Q [Mon, 12 May 2014 18:27:26 +0000 (14:27 -0400)]
Made the metadata table look pretty

10 years agoModified the batchaddmedia script so that it only looks for one csv file instead
tilly-Q [Mon, 12 May 2014 17:59:28 +0000 (13:59 -0400)]
Modified the batchaddmedia script so that it only looks for one csv file instead
of the previous method which looked for two files.

10 years agoCleaned up the 'batchaddmedia' command a bit
tilly-Q [Mon, 12 May 2014 17:19:03 +0000 (13:19 -0400)]
Cleaned up the 'batchaddmedia' command a bit

10 years agoMade some changes so that the metadata editing page works well with the updated
tilly-Q [Mon, 12 May 2014 17:07:11 +0000 (13:07 -0400)]
Made some changes so that the metadata editing page works well with the updated
metadata tools.

10 years agoMerge branch 'metadata-editor' into metadata
tilly-Q [Mon, 12 May 2014 16:26:07 +0000 (12:26 -0400)]
Merge branch 'metadata-editor' into metadata

10 years agoChanged the format of the wtforms table slightly
tilly-Q [Mon, 12 May 2014 16:20:03 +0000 (12:20 -0400)]
Changed the format of the wtforms table slightly

10 years agoRemoving the prefix stuff
Christopher Allan Webber [Sun, 11 May 2014 23:47:55 +0000 (18:47 -0500)]
Removing the prefix stuff

10 years agoSplitting up compact_json from compact_and_validate
Christopher Allan Webber [Fri, 9 May 2014 22:33:58 +0000 (17:33 -0500)]
Splitting up compact_json from compact_and_validate

This commit sponsored by Harry Rogoff.  Thank you!

10 years agoexpand_json utility... yet another convenience function :)
Christopher Allan Webber [Fri, 9 May 2014 21:49:42 +0000 (16:49 -0500)]
expand_json utility... yet another convenience function :)

This commit sponsored by Benjamin Lebsanft.  Thank you!

10 years agoRemoving the mediagoblin.jsonld file, which really was just the RDFa 1.1 file.
Christopher Allan Webber [Fri, 9 May 2014 19:32:46 +0000 (14:32 -0500)]
Removing the mediagoblin.jsonld file, which really was just the RDFa 1.1 file.

This commit sponsored by Matthew Cope.  Thanks!

10 years agoCompact and validate tools, loading internal json tools, much more
Christopher Allan Webber [Fri, 9 May 2014 19:10:27 +0000 (14:10 -0500)]
Compact and validate tools, loading internal json tools, much more

This commit sponsored by Caleb Nidey.  Thank you!

10 years agoUpdating batchaddmedia to use new metadata tools
Christopher Allan Webber [Wed, 7 May 2014 23:50:48 +0000 (18:50 -0500)]
Updating batchaddmedia to use new metadata tools

10 years agoStarting to add metadata tools, as well as mediagoblin's schema
Christopher Allan Webber [Wed, 7 May 2014 23:41:34 +0000 (18:41 -0500)]
Starting to add metadata tools, as well as mediagoblin's schema

10 years agoRemoving unused variables
Christopher Allan Webber [Wed, 7 May 2014 20:21:58 +0000 (15:21 -0500)]
Removing unused variables

10 years agoRemoving build_json_ld_metadata
Christopher Allan Webber [Wed, 7 May 2014 20:21:10 +0000 (15:21 -0500)]
Removing build_json_ld_metadata

10 years agoThe URL format checker now works correctly
Christopher Allan Webber [Wed, 7 May 2014 18:36:52 +0000 (13:36 -0500)]
The URL format checker now works correctly

...though it isn't checking the right thing

10 years agoAdded in a few blank lines when a user edits the metadata of a file that has
tilly-Q [Tue, 6 May 2014 21:45:43 +0000 (17:45 -0400)]
Added in a few blank lines when a user edits the metadata of a file that has
none.

10 years agoFixed a slight css error.
tilly-Q [Tue, 6 May 2014 21:23:22 +0000 (17:23 -0400)]
Fixed a slight css error.

10 years agoMade it so the metadata editting page is only one step away from functioning
tilly-Q [Tue, 6 May 2014 21:19:30 +0000 (17:19 -0400)]
Made it so the metadata editting page is only one step away from functioning
correctly.

10 years agoCreated a UI for editting a media's metadata. Had to add a new macro to
tilly-Q [Tue, 6 May 2014 21:00:25 +0000 (17:00 -0400)]
Created a UI for editting a media's metadata. Had to add a new macro to
wtforms.html in the process.

10 years agoSet up the metadata editor forms
tilly-Q [Tue, 6 May 2014 16:54:08 +0000 (12:54 -0400)]
Set up the metadata editor forms

10 years agoCreated the media metadata editor page
tilly-Q [Tue, 6 May 2014 16:39:23 +0000 (12:39 -0400)]
Created the media metadata editor page

10 years agoAdd lib64/ directory to .gitignore file.
Jessica Tallon [Mon, 5 May 2014 16:24:32 +0000 (17:24 +0100)]
Add lib64/ directory to .gitignore file.

10 years agoMerge branch 'permission_scheme' of gitorious.org:mediagoblin/npigeons-mediagoblin...
tilly-Q [Thu, 1 May 2014 18:28:11 +0000 (14:28 -0400)]
Merge branch 'permission_scheme' of gitorious.org:mediagoblin/npigeons-mediagoblin into permission_scheme

Conflicts:
mediagoblin.ini
mediagoblin/auth/tools.py
mediagoblin/config_spec.ini

10 years agoChanged the default permission scheme to be the same as the scheme we use in
tilly-Q [Thu, 1 May 2014 18:21:25 +0000 (14:21 -0400)]
Changed the default permission scheme to be the same as the scheme we use in
master so that if admins have not set their mediagoblin_local.ini to include
this new option, they will notice no difference in use.

10 years agoAdded new template hooks to allow for plugin-added moderation powers
tilly-Q [Tue, 29 Apr 2014 16:44:21 +0000 (12:44 -0400)]
Added new template hooks to allow for plugin-added moderation powers

10 years agoFixed some minor whitespace issues
tilly-Q [Mon, 28 Apr 2014 20:40:02 +0000 (16:40 -0400)]
Fixed some minor whitespace issues

10 years agoIn this commit I made it so that each deployment can have custom settings for
tilly-Q [Fri, 29 Nov 2013 19:29:56 +0000 (14:29 -0500)]
In this commit I made it so that each deployment can have custom settings for
which privileges are given to users when they are intiated. These settings are
modified in mediagoblin.ini.

10 years agoMade the columns properly referenced in models and migrations.
tilly-Q [Wed, 23 Apr 2014 18:59:53 +0000 (14:59 -0400)]
Made the columns properly referenced in models and migrations.

10 years agoRenamed the columns on core__privileges_users table so that they are unique and
tilly-Q [Tue, 22 Apr 2014 17:32:47 +0000 (13:32 -0400)]
Renamed the columns on core__privileges_users table so that they are unique and
will not cause any more problems.

10 years agoIn the middle of some major changes
tilly-Q [Mon, 21 Apr 2014 23:07:28 +0000 (19:07 -0400)]
In the middle of some major changes

10 years agoMade it so that the metadata table only shows terms with filled values
tilly-Q [Mon, 21 Apr 2014 19:46:02 +0000 (15:46 -0400)]
Made it so that the metadata table only shows terms with filled values

10 years agoCreated the basic structure of the metadata display table in rdfa lite
tilly-Q [Mon, 21 Apr 2014 19:42:57 +0000 (15:42 -0400)]
Created the  basic structure of the metadata display table in rdfa lite

10 years agoFixed a problem that was causing errors in batch uploading remote files.
tilly-Q [Mon, 21 Apr 2014 16:29:00 +0000 (12:29 -0400)]
Fixed a problem that was causing errors in batch uploading remote files.

10 years agoI had imported requests twice
tilly-Q [Mon, 21 Apr 2014 16:18:29 +0000 (12:18 -0400)]
I had imported requests twice

10 years agoMerge branch 'metadata' of gitorious.org:mediagoblin/npigeons-mediagoblin into metadata
tilly-Q [Mon, 21 Apr 2014 16:17:39 +0000 (12:17 -0400)]
Merge branch 'metadata' of gitorious.org:mediagoblin/npigeons-mediagoblin into metadata

Conflicts:
mediagoblin/gmg_commands/batchaddmedia.py
setup.py

10 years agoMade it possible to submit media with the metadata provided
tilly-Q [Mon, 21 Apr 2014 16:07:33 +0000 (12:07 -0400)]
Made it possible to submit media with the metadata provided

10 years agoChanged the name of the metadata column
tilly-Q [Tue, 15 Apr 2014 18:17:43 +0000 (14:17 -0400)]
Changed the name of the metadata column

10 years agoMoved the metadata column to MediaEntry rather than MediaFile
tilly-Q [Tue, 15 Apr 2014 17:51:27 +0000 (13:51 -0400)]
Moved the metadata column to MediaEntry rather than MediaFile

10 years agoAdded the 'requests' library as a dependency and switched over to using it to
tilly-Q [Tue, 15 Apr 2014 17:35:22 +0000 (13:35 -0400)]
Added the 'requests' library as a dependency and switched over to using it to
fetch remote pieces of media in the batchupload script

10 years agoFixed incorrectly coded references to filesystem paths
tilly-Q [Fri, 11 Apr 2014 17:06:09 +0000 (13:06 -0400)]
Fixed incorrectly coded references to filesystem paths

10 years agoTook out all of the references to the temporary url I was using
tilly-Q [Thu, 3 Apr 2014 16:20:30 +0000 (12:20 -0400)]
Took out all of the references to the temporary url I was using
/metadata_context/v1

10 years agoFixed a bad get of 'dcterms:rights' and am throwing away the idea of an external
tilly-Q [Thu, 3 Apr 2014 16:18:17 +0000 (12:18 -0400)]
Fixed a bad get of 'dcterms:rights' and am throwing away the idea of an external
context file for the json-ld because it feels unnecessary seeing as we are just
using the dc core terms

10 years agoWrote more comprehensive error messages.
tilly-Q [Thu, 27 Mar 2014 21:29:34 +0000 (17:29 -0400)]
Wrote more comprehensive error messages.

10 years agoFixed a minor error in the batch upload script and modified the json-ld context.
tilly-Q [Thu, 27 Mar 2014 21:10:31 +0000 (17:10 -0400)]
Fixed a minor error in the batch upload script and modified the json-ld context.

10 years agoFixed up some fatal errors. Is still not ready.
tilly-Q [Thu, 27 Mar 2014 18:11:12 +0000 (14:11 -0400)]
Fixed up some fatal errors. Is still not ready.

10 years agoAdded exception handling into the metadata format checking function.
tilly-Q [Thu, 27 Mar 2014 17:55:15 +0000 (13:55 -0400)]
Added exception handling into the metadata format checking function.

10 years agoBegan work on metadata validation
tilly-Q [Thu, 27 Mar 2014 17:31:04 +0000 (13:31 -0400)]
Began work on metadata validation

10 years agoChanged some of the print messages as well as tweaked the order of
tilly-Q [Fri, 21 Feb 2014 17:38:02 +0000 (12:38 -0500)]
Changed some of the print messages as well as tweaked the order of
the commands attempts to figure out what type of file the target file
is.

10 years agoI made it so the command no longer requires the "Target type" to be provided,
tilly-Q [Wed, 19 Feb 2014 19:27:14 +0000 (14:27 -0500)]
I made it so the command no longer requires the "Target type" to be provided,
it now recognizes whether the target is a directory or an archive on its own.

I added in a help message, which is still incomplete, but should make it easier
for admins to know how to use this new command. I believe we should also provi-
-de an example of the location.csv and metadata.csv files, so there is no conf-
-usion. Also, I made it possible for the command to recognize zip files as a
valid archive. I also made some minor changes to the commands description w/i
the larger gmg command help menu.

10 years agoMinor change in the wording of argparsing.
tilly-Q [Thu, 13 Feb 2014 18:57:10 +0000 (13:57 -0500)]
Minor change in the wording of argparsing.

10 years agoThe script now officially works! It works in many different situations, whether
tilly-Q [Wed, 12 Feb 2014 19:37:00 +0000 (14:37 -0500)]
The script now officially works! It works in many different situations, whether
the media is to be uploaded is stored locally or on the web. Still have to clean
up the code and look for errors. I may also refactor some of this into a functi-
on to be used with a GUI frontend in another project. Lastly, I need to merge
this with the metadata branch I've been working on, and convert the metadata.csv
information into the proper format for the new metadata column.

10 years agoThis branch will create a commandline bulk-upload script. So far, I have written
tilly-Q [Thu, 6 Feb 2014 20:17:06 +0000 (15:17 -0500)]
This branch will create a commandline bulk-upload script. So far, I have written
the code to read csv files into a usable dictionary.

10 years agoBig update. I added in a json-ld context file which will be used in all our
tilly-Q [Tue, 18 Mar 2014 20:49:48 +0000 (16:49 -0400)]
Big update. I added in a json-ld context file which will be used in all our
metadata columns in the future. The context describes the dublin core elements.
It still has not been finalized however.

10 years agoIn this commit, I added a new column which will be used for RDFa metadata of
tilly-Q [Thu, 6 Feb 2014 20:15:57 +0000 (15:15 -0500)]
In this commit, I added a new column which will be used for RDFa metadata of
media.

10 years agoChanged the name of the metadata column
tilly-Q [Tue, 15 Apr 2014 18:17:43 +0000 (14:17 -0400)]
Changed the name of the metadata column

10 years agoMoved the metadata column to MediaEntry rather than MediaFile
tilly-Q [Tue, 15 Apr 2014 17:51:27 +0000 (13:51 -0400)]
Moved the metadata column to MediaEntry rather than MediaFile

10 years agoAdded the 'requests' library as a dependency and switched over to using it to
tilly-Q [Tue, 15 Apr 2014 17:35:22 +0000 (13:35 -0400)]
Added the 'requests' library as a dependency and switched over to using it to
fetch remote pieces of media in the batchupload script

10 years agoFixed incorrectly coded references to filesystem paths
tilly-Q [Fri, 11 Apr 2014 17:06:09 +0000 (13:06 -0400)]
Fixed incorrectly coded references to filesystem paths

10 years agoAdding Berker to the AUTHORS list
Christopher Allan Webber [Thu, 10 Apr 2014 20:27:42 +0000 (15:27 -0500)]
Adding Berker to the AUTHORS list

10 years agoIssue #686: Create User.url_for_self() method.
Berker Peksag [Sun, 23 Feb 2014 12:47:09 +0000 (14:47 +0200)]
Issue #686: Create User.url_for_self() method.

*Note from cwebber on merge of this branch:*
  Thanks also to Sturm who provided an early version of this patch.

10 years agoIssue #824: Add gmg deletemedia command.
Berker Peksag [Sun, 23 Feb 2014 14:20:03 +0000 (16:20 +0200)]
Issue #824: Add gmg deletemedia command.