tilly-Q [Sun, 23 Mar 2014 20:43:20 +0000 (16:43 -0400)]
Merge branch 'bulk-upload' into metadata
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.
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.
tilly-Q [Thu, 13 Feb 2014 18:57:10 +0000 (13:57 -0500)]
Minor change in the wording of argparsing.
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.
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.
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.
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.
Christopher Allan Webber [Sat, 22 Mar 2014 16:00:10 +0000 (11:00 -0500)]
Fix Babel version restriction. Onward and upward!
(Fix suggested by simonft... thanks!)
Christopher Allan Webber [Fri, 21 Mar 2014 04:25:25 +0000 (23:25 -0500)]
Fix version conflicts we were hitting with six
Boris Bobrov [Tue, 11 Mar 2014 11:23:58 +0000 (16:23 +0500)]
fixes to blog url generation
Christopher Allan Webber [Tue, 11 Mar 2014 16:28:46 +0000 (11:28 -0500)]
The default failures are just way too verbose. Quieting them down a bit.
This commit sponsored by Chad Glendenin. Thanks!
Christopher Allan Webber [Tue, 11 Mar 2014 16:07:35 +0000 (11:07 -0500)]
Adding Boris to AUTHORS
Boris Bobrov [Tue, 11 Mar 2014 10:50:01 +0000 (15:50 +0500)]
added new slugify with unidecode
Christopher Allan Webber [Sun, 9 Mar 2014 19:13:04 +0000 (14:13 -0500)]
Remove mention of blog plugin in config
Christopher Allan Webber [Sat, 8 Mar 2014 18:38:41 +0000 (12:38 -0600)]
Explicitly use /bin/bash even if shell is /bin/false
Christopher Allan Webber [Sat, 8 Mar 2014 18:28:23 +0000 (12:28 -0600)]
Changing "su -" to just "su"... considerably simpler.
I don't think inheriting environment stuff is a serious issue.
Alon Levy [Sat, 1 Mar 2014 19:52:14 +0000 (21:52 +0200)]
make exif a submodule
Updates it to latest which includes a fix for a 100% hang on a jpg without any EXIF data:
https://www.dropbox.com/s/m5l185qxq9w5mzk/raspberry-pi-gpio-cheat-sheet.jpg
Signed-off-by: Alon Levy <alon@pobox.com>
Christopher Allan Webber [Thu, 20 Feb 2014 20:06:36 +0000 (14:06 -0600)]
Tyops in deployment docs as pointed out by @latchkeyed@identi.ca.
Thanks for noticing and correcting!
Christopher Allan Webber [Wed, 19 Feb 2014 23:30:07 +0000 (17:30 -0600)]
mediagoblin -> mediagoblin
Thanks Luismi for pointing this out!
tilly-Q [Thu, 13 Feb 2014 19:10:11 +0000 (14:10 -0500)]
fixed my mistaken use of => from last commit >__<
tilly-Q [Thu, 13 Feb 2014 19:00:09 +0000 (14:00 -0500)]
Changed setup.py install_requirements to require sqlalchemy at least of version
0.8.0. Our code was crashing when running with sqlalchemy 0.7.4 because of
imports like sqlalchemy.orm.with_polymorphic
Christopher Allan Webber [Sun, 9 Feb 2014 19:40:59 +0000 (13:40 -0600)]
robogoblins.xcf
Christopher Allan Webber [Sun, 9 Feb 2014 19:33:57 +0000 (13:33 -0600)]
robogoblins source
Christopher Allan Webber [Sun, 9 Feb 2014 18:56:16 +0000 (12:56 -0600)]
updated COPYING file for current data in this directory
Christopher Allan Webber [Fri, 7 Feb 2014 01:00:12 +0000 (19:00 -0600)]
Source files for some of the test submission artwork.
Christopher Allan Webber [Mon, 27 Jan 2014 19:48:56 +0000 (13:48 -0600)]
jpope's been helping a bunch, so of course we need to put him in AUTHORS!
Christopher Allan Webber [Sun, 26 Jan 2014 19:08:01 +0000 (13:08 -0600)]
Fixing the STL media page for post-skeleton merge
Christopher Allan Webber [Thu, 23 Jan 2014 15:32:54 +0000 (09:32 -0600)]
Okay that broke the build process(?), testing if this fixes it
Christopher Allan Webber [Thu, 23 Jan 2014 15:23:51 +0000 (09:23 -0600)]
Once we can, that is.
Christopher Allan Webber [Thu, 23 Jan 2014 15:23:38 +0000 (09:23 -0600)]
Setting a specific pbr version in setup.py
Christopher Allan Webber [Tue, 14 Jan 2014 18:13:36 +0000 (12:13 -0600)]
Have the hook handle happen in the root_view proxy view itself
This way it isn't set in stone at a module level, especially if this
gets imported before the whole application inits, or if run during
tests and possibly imported multiple times.
Christopher Allan Webber [Tue, 14 Jan 2014 18:03:07 +0000 (12:03 -0600)]
Merge remote-tracking branch 'refs/remotes/tilly-q/variable-front-page'
jpope [Mon, 13 Jan 2014 21:04:02 +0000 (15:04 -0600)]
fixes #829 plus a little more that was somewhat related
jpope [Mon, 13 Jan 2014 17:37:36 +0000 (11:37 -0600)]
adjust exif info alignment
jpope [Mon, 13 Jan 2014 14:14:00 +0000 (08:14 -0600)]
adjust exif to match other sections and remove extra css
jpope777 [Sat, 11 Jan 2014 06:26:28 +0000 (00:26 -0600)]
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
jpope [Sat, 11 Jan 2014 05:46:32 +0000 (23:46 -0600)]
another airy update
jpope [Sat, 11 Jan 2014 05:38:34 +0000 (23:38 -0600)]
minor updates for airy
tilly-Q [Thu, 9 Jan 2014 23:17:38 +0000 (18:17 -0500)]
This is a very minor change that makes it possible for plugins to provide an
alternative to the default root_view.
jpope777 [Wed, 8 Jan 2014 06:08:55 +0000 (00:08 -0600)]
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
jpope [Wed, 8 Jan 2014 06:08:11 +0000 (00:08 -0600)]
move "wide" view to seperate branch
jpope [Wed, 8 Jan 2014 05:23:53 +0000 (23:23 -0600)]
rename couple of css classes
jpope777 [Wed, 8 Jan 2014 02:40:12 +0000 (20:40 -0600)]
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
jpope [Wed, 8 Jan 2014 02:39:33 +0000 (20:39 -0600)]
adjust thumbnails
jpope [Wed, 8 Jan 2014 01:46:58 +0000 (19:46 -0600)]
center media within media container
jpope [Wed, 8 Jan 2014 00:21:51 +0000 (18:21 -0600)]
add warning color to delete buttons.
jpope [Wed, 8 Jan 2014 00:10:10 +0000 (18:10 -0600)]
style cancel "button" on attachments page
jpope777 [Tue, 7 Jan 2014 23:53:36 +0000 (17:53 -0600)]
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
jpope [Tue, 7 Jan 2014 23:52:38 +0000 (17:52 -0600)]
add a little button color and new media page layout
jpope [Tue, 7 Jan 2014 18:09:02 +0000 (12:09 -0600)]
skeletonize frontpage welcome
jpope [Tue, 7 Jan 2014 08:20:58 +0000 (02:20 -0600)]
adjust 404 page
jpope [Tue, 7 Jan 2014 08:19:46 +0000 (02:19 -0600)]
adjust banned page
jpope [Tue, 7 Jan 2014 08:02:12 +0000 (02:02 -0600)]
realign columns on mod user page
jpope777 [Tue, 7 Jan 2014 07:06:09 +0000 (01:06 -0600)]
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
jpope [Tue, 7 Jan 2014 07:05:01 +0000 (01:05 -0600)]
debone and redo the header
jpope [Tue, 7 Jan 2014 02:27:32 +0000 (20:27 -0600)]
adjust mod report page
jpope777 [Tue, 7 Jan 2014 01:05:23 +0000 (19:05 -0600)]
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
jpope [Tue, 7 Jan 2014 00:40:59 +0000 (18:40 -0600)]
move js back to the head
jpope [Tue, 7 Jan 2014 00:31:57 +0000 (18:31 -0600)]
small adjustments to user mod page again
jpope777 [Tue, 7 Jan 2014 00:21:29 +0000 (18:21 -0600)]
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
jpope [Tue, 7 Jan 2014 00:18:52 +0000 (18:18 -0600)]
realign the user admin page
jpope777 [Mon, 6 Jan 2014 21:20:53 +0000 (15:20 -0600)]
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
jpope [Mon, 6 Jan 2014 21:19:14 +0000 (15:19 -0600)]
migrate media page to skeleton
jpope [Mon, 6 Jan 2014 16:52:11 +0000 (10:52 -0600)]
more skeleton migrations
jpope [Mon, 6 Jan 2014 02:56:28 +0000 (20:56 -0600)]
Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton
Conflicts:
.gitmodules
mediagoblin/static/css/base.css
jpope [Mon, 6 Jan 2014 02:47:36 +0000 (20:47 -0600)]
start moving more to skeleton
jpope777 [Mon, 6 Jan 2014 01:04:44 +0000 (19:04 -0600)]
initial skeleton push
jpope [Sun, 5 Jan 2014 23:12:13 +0000 (17:12 -0600)]
undo that "update"
jpope [Sun, 5 Jan 2014 22:56:47 +0000 (16:56 -0600)]
updated
jpope [Sun, 5 Jan 2014 22:55:58 +0000 (16:55 -0600)]
Merge remote-tracking branch 'upstream/master' into skeletongobblin
Christopher Allan Webber [Thu, 2 Jan 2014 21:07:54 +0000 (15:07 -0600)]
Not only the web server starts MediaGoblin app! Better phrasing.
Christopher Allan Webber [Thu, 2 Jan 2014 21:01:54 +0000 (15:01 -0600)]
Merge remote-tracking branch 'refs/remotes/rodney757/dbupdate'
Conflicts:
mediagoblin/db/util.py
mediagoblin/gmg_commands/dbupdate.py
Christopher Allan Webber [Thu, 2 Jan 2014 20:49:04 +0000 (14:49 -0600)]
Merge remote-tracking branch 'remotes/jiyda/220_rtl_language_support'
Conflicts:
mediagoblin/templates/mediagoblin/base.html
mediagoblin/tools/template.py
Christopher Allan Webber [Thu, 2 Jan 2014 17:17:59 +0000 (11:17 -0600)]
Don't fail transcoding if we fail to generate a thumbnail.
This patch by Sergio Durigan Junior. Thank you, Sergio!
Christopher Allan Webber [Wed, 1 Jan 2014 22:42:04 +0000 (16:42 -0600)]
sqlalchemy-migrate 0.8.X doesn't get along with sqlalchemy 0.9.0
jpope [Wed, 1 Jan 2014 17:54:23 +0000 (11:54 -0600)]
fix misplaced body tag when I moved the javascript to bottom of page
jpope777 [Wed, 1 Jan 2014 06:48:23 +0000 (00:48 -0600)]
incorporate skeleton layout in the galleries
jpope777 [Tue, 31 Dec 2013 21:52:44 +0000 (15:52 -0600)]
update base.html
jpope777 [Tue, 31 Dec 2013 21:00:16 +0000 (15:00 -0600)]
add symlinks to skeleton
jpope777 [Tue, 31 Dec 2013 20:50:21 +0000 (14:50 -0600)]
add skeleton submodule
Alon Levy [Fri, 27 Dec 2013 01:00:02 +0000 (19:00 -0600)]
media_types/sniff_media: reset file back to 0 offset for actual copy. Required when not using celery
Alon Levy [Fri, 27 Dec 2013 00:35:27 +0000 (18:35 -0600)]
pdf/processing: fix non pdf regression, copy correct file
Alon Levy [Fri, 27 Dec 2013 00:34:40 +0000 (18:34 -0600)]
pdf/processing: avoid possible dead goblin if pdfinfo failed
Sebastian Spaeth [Thu, 12 Dec 2013 17:56:36 +0000 (18:56 +0100)]
Rename a few files and minor cleanup
Within the blog plugin, rename a few files and clean up a few things
that can be cleaned up.
Sebastian Spaeth [Thu, 12 Dec 2013 17:25:29 +0000 (18:25 +0100)]
Remove "Create blog" from admin top bar
This is such a rare event that we do not need a "Create blog" button
in the top navbar. It suffices to have the link on the "blog dashboard"
page. Also, this saves us a hook to run on all pages that we render, basically.
Sebastian Spaeth [Thu, 12 Dec 2013 17:12:13 +0000 (18:12 +0100)]
Add the profile_hook in case of user with or without media
the hook was only run in case the user had no media uploaded yet.
This does not make any sense, so we run the hook in all cases now.
The designers might have to think about the placement of the stuff
being inserted at some point...
Sebastian Spaeth [Thu, 12 Dec 2013 17:03:47 +0000 (18:03 +0100)]
Force evaluation of Query() through count()
Otherwise "blogs" is a query that evaluates to true, even if the user
has no blogs. This fixes the bug that the blog link is shown on a user's
profile page even if she has no blogs at all.
Sebastian Spaeth [Thu, 12 Dec 2013 16:50:34 +0000 (17:50 +0100)]
Fix "middot" when blog plugin is disabled
The blog plugin accidentally introduced two "middots in the admin bar,
which were visible when the blog plugin was disabled. Fixing this by
moving the second dot in the blog template.
Sebastian Spaeth [Thu, 12 Dec 2013 16:38:18 +0000 (17:38 +0100)]
Undo changes since gsoc in media_confirm_delete
Since the Gsoc the use of decorators has simplified this function.
Reintroduce the same code as before Adidits blog branch made these
changes.
Sebastian Spaeth [Thu, 12 Dec 2013 16:29:48 +0000 (17:29 +0100)]
Use MEDIA_TYPE, not hardcoded variable of same value
Sebastian Spaeth [Thu, 12 Dec 2013 16:13:48 +0000 (17:13 +0100)]
Convert blog plugin to use new privileges system
there is no user.is_admin anymore. Adapt to use the new privileges
system.
Sebastian Spaeth [Thu, 12 Dec 2013 15:51:18 +0000 (16:51 +0100)]
Revert "Replace hardcoded URL by variable for the same."
This reverts commit
e0e02e98bcd4664b1c0a57e422ea4c0e5b6ba059.
There is absolutely no need for this.
Sebastian Spaeth [Thu, 12 Dec 2013 15:38:35 +0000 (16:38 +0100)]
Finalize merging of the blog branch by Aditi (Gsoc 2013)
Comment out the blog plugin by default. Remove the blog README.md in
the root directory.
Sebastian Spaeth [Thu, 12 Dec 2013 15:24:34 +0000 (16:24 +0100)]
Merge branch 'master' into upstream-master
Conflicts:
mediagoblin/templates/mediagoblin/base.html
mediagoblin/templates/mediagoblin/user_pages/user.html
Christopher Allan Webber [Wed, 11 Dec 2013 18:29:47 +0000 (12:29 -0600)]
Fixing Josie's name
tilly-Q [Sun, 8 Dec 2013 17:40:47 +0000 (12:40 -0500)]
Fixed a small typo that was causing the mediagoblin.moderation.users_detail
page to crash.
Christopher Allan Webber [Tue, 3 Dec 2013 19:24:20 +0000 (13:24 -0600)]
Committing extracted and compiled translations
Christopher Allan Webber [Tue, 3 Dec 2013 19:23:25 +0000 (13:23 -0600)]
Committing present MediaGoblin translations before pushing extracted messages
Christopher Allan Webber [Tue, 3 Dec 2013 19:22:47 +0000 (13:22 -0600)]
Make "Username's privileges" translatable
This commit sponsored by Aaron Borden. Thank you!