heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,624 Commits 1 Branch 0 Tags
Commit Graph

3624 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Allan Webber
210a6cebe0 Switching the addmedia tool over to using the get_upload_file_limits tool also. 
This commit sponsored by Damien Radtke.  Thanks!
 2013-11-14 11:09:18 -06:00
Christopher Allan Webber
860b380bb5 Porting the piwigo submit system over to using the new submit utility. 
This also adds upload limit checks to the piwigo plugin!

This commit sponsored by Sam Black.  Thank you!
 2013-11-14 11:07:12 -06:00
Christopher Allan Webber
5d754da741 Breaking out get_upload_file_limits into its own utility. 
This commit sponsored by Mikael Nordfeldth.  Thank you!
 2013-11-14 11:06:10 -06:00
Christopher Allan Webber
86d5cb8a57 --license doesn't use the user default so correct that. It does use a URL though. 
This commit sponsored by Benjamin Williams.  Thank you!
 2013-11-14 10:25:31 -06:00
Christopher Allan Webber
cb7716f3b5 A couple more adjustments for unicode'ification of some arguments. 
This commit sponsored by Bruno Girin.  Thank you!
 2013-11-14 10:01:41 -06:00
Christopher Allan Webber
862e05a5b5 Hacks to get past unicode barriers 
The methods we're using here aren't ideal but they mirror those used
in the submit views...

This commit sponsored by Alexander Couper.  Thanks!
 2013-11-14 09:51:29 -06:00
Christopher Allan Webber
301da9caba Generic'ifying the submit code to not rely on the werkzeug FileStorage datastructure 
Important, because that only makes sense for wsgi! :)

This commit sponsored by Geoff Lehr.  Thank you!
 2013-11-13 19:40:13 -06:00
Christopher Allan Webber
5202924c91 Docstring for submit_media() 
This commit sponsored by Benjamin Prager.  Thank you!
 2013-11-13 17:25:33 -06:00
Christopher Allan Webber
b7a8760b6d Start of addmedia command. Kinda close to working ;) 2013-11-13 13:59:16 -06:00
Christopher Allan Webber
a4bf3e58ba Weird indentation issue, fixing! 
This commit sponsored by Iain Nicol.  Thank you!
 2013-11-13 11:53:58 -06:00
Christopher Allan Webber
9e15c674ce Refactoring submission utility to make it more generic! Reusable! 
This commit sponsored by Joar Wandborg.  Joar, thanks for the many
things you've done for MediaGoblin!
 2013-11-13 10:22:46 -06:00
Christopher Allan Webber
1779a0702f Starting to split out a submit_media utility 2013-11-12 14:03:17 -06:00
Christopher Allan Webber
70fe865647 Oh god how did I leave a pdb.set_trace() in here 
Well, cleaning that up :)

This commit sponsored by Enrico Zini.  Thanks!
 2013-11-10 17:35:56 -06:00
Christopher Allan Webber
904caab6b1 Apparently kombu is fine again 2013-11-10 12:38:49 -06:00
Christopher Allan Webber
7ec0a978e0 Fixing the ascii art media type. There was an ordering issue in the code. 
Moved set_file_metadata till after the thumb file was created!

This commit sponsored by Samat Jain.  Thank you!
 2013-11-08 11:22:48 -06:00
Christopher Allan Webber
02993c9daa Committing extracted and compiled translations 2013-11-05 14:45:34 -06:00
Christopher Allan Webber
d9271e5d9c Removing strings that should not have been translated 2013-11-05 14:43:01 -06:00
Christopher Allan Webber
09b0d5118d Just made it so the "okay to wipe your database" echo doesn't add a newline 2013-11-05 13:41:13 -06:00
Christopher Allan Webber
7865e7c16e Merge remote-tracking branch 'refs/remotes/tilly-q/dev_tools_environment_update' into mergetest 2013-11-05 13:29:40 -06:00
Christopher Allan Webber
c57bf8d9c0 Committing extracted and compiled translations 2013-11-04 15:34:21 -06:00
Christopher Allan Webber
cadeb02cf3 Committing present MediaGoblin translations before pushing extracted messages 2013-11-04 15:33:28 -06:00
Christopher Allan Webber
4491174df2 accoutn -> account. Typo fix caught by Laura Arjona! Thanks! 
This commit sponsored by Nick Adams!  Thank you!
 2013-11-04 15:05:40 -06:00
Christopher Allan Webber
288dcfe000 Committing extracted and compiled translations 2013-11-04 13:24:16 -06:00
Christopher Allan Webber
d110f656d6 Committing present MediaGoblin translations before pushing extracted messages 2013-11-04 13:23:17 -06:00
Christopher Allan Webber
496d779a63 Apparently we need a version of Kombu less than 3.0 for now. 
This commit sponsored by Andrés Muñiz Piniella.  Thank you!
 2013-11-03 20:22:57 -06:00
Christopher Allan Webber
70b0712de2 Removing duplicate views from views.py 2013-11-01 10:08:12 -05:00
tilly-Q
3a99517d43 This commit made it so that the script now extracts two different archive. One 
for the chosen database, and one for the media to go in the UserDev directory.
This will make the mg-dev-example-environments branch more efficient.
 2013-10-31 17:10:03 -04:00
tilly-Q
79a5fe72cf This was a very minor update. In the mg-dev-example-environment branch I changed 
the naming system for the databases, and in this branch I just changed the
default name to the new default. The new naming system is based on migrations
not milestones.
 2013-10-31 16:19:49 -04:00
Christopher Allan Webber
ea281d2480 Removing duplicate terms of service link in the header. 
My bad!  Since I moved it to the footer ;)

This commit sponsored by Sebastian Tennant.  Thanks!
 2013-10-24 22:42:40 -05:00
Devan Goodwin
f1bf5ccdd8 Fix error in collection templates. 
Removed unicode strings from some recently added has_privilege calls.
Appears this is not valid syntax as it would be in the python code
itself. Causes an error showing the template:

Error - <class 'jinja2.exceptions.TemplateSyntaxError?'>: expected token
',', got 'string'
 2013-10-20 17:06:56 -03:00
Christopher Allan Webber
9d2b0161b9 Make showing the Terms of Service a user option, and move it to the footer. 
This commit sponsored by Gjalt-Jorn Peters.  Thank you!
 2013-10-11 11:48:22 -05:00
Christopher Allan Webber
0c875e1e96 Renaming replace_table to replace_table_hack and documenting why it's a hack 
We'd still prefer people use other solutions when possible!

This commit sponsored by Michał Masłowski.  Thank you!
 2013-10-10 14:22:38 -05:00
Christopher Allan Webber
454a2c16bd Actually rename the table back, or else we just lose the old table! ;) 2013-10-10 14:14:32 -05:00
Christopher Allan Webber
2c4decf260 Merge remote-tracking branch 'tilly-q/merge-tillyq-moderation' into merge-tillyq-moderation 2013-10-10 14:06:07 -05:00
Christopher Allan Webber
f1318b59c8 Fix the create_moderation_tables migration to work with postgresql 
Was comparing/assigning to integers... but that's not how postgres rolls!
 2013-10-10 11:28:59 -05:00
tilly-Q
e5196ff000 I made some changes in this commit to help out with other people trying to work 
around the SQLite problems with Alter table. I added a new function to
migration_tools (replace_table) which does all the work I did in my migration of
core__users, but is now usable for other migrations.
 2013-10-09 17:11:41 -04:00
Christopher Allan Webber
17f0307c70 "Intellectual property" being a problematic term, replacing it in this document. 2013-10-09 14:17:13 -05:00
Christopher Allan Webber
a4609dd32b Fixing migration to account for new fields added to User model 
Uploaded and upload_limit were added after this migration was first written.
Tricky!
 2013-10-09 13:32:02 -05:00
Christopher Allan Webber
eedb6d1f3b Improving the whitespace around the {% trans %} adjustments from tilly-q 2013-10-09 10:37:30 -05:00
Christopher Allan Webber
d1608b0157 Merge remote-tracking branch 'tilly-q/OPW-Moderation-Update' into merge-tillyq-moderation 2013-10-09 10:30:19 -05:00
tilly-Q
0b1fcaebf5 This was a quick update to clean up some of my templates and fix the formatting 
in some of my other bits of code. In migrations.py, I clarified the comments &
fixed the code to stay within 80 columns. In each of the templates, I fixed the
spacing as well to stay within 80 columns and I also corrected my improper uses
of the trans tag to ensure that these pages can be translated correctly.
 2013-10-08 18:42:59 -04:00
Christopher Allan Webber
27fcf946d0 Fixing the test_change_password test. Needed a privilege! 
I'm pretty sure this should work correctly now.

This commit sponsored by Michał Masłowski.  Thanks!
 2013-10-08 15:30:12 -05:00
Christopher Allan Webber
6180e3a915 Fixing up the email verified stuff to reflect the email_verified stuff! 
This commit sponsored by Derek Holdaway.  Thanks!
 2013-10-08 13:58:02 -05:00
Christopher Allan Webber
fce8e96979 Fixing issues in the tests caused by the OPW-Moderation-Update merge 
Not that branch's fault!  Just both that branch and master had both done
a lot of changes to overlapping code.

self.test_user switched to self.our_user().  Updating everywhere.

This commit sponsored by Sam Kleinman.  Thank you! :)
 2013-10-08 11:36:18 -05:00
Christopher Allan Webber
8ac7859369 Adding a comment explaining what vR1 means. 
This commit sponsored by Kim Jin-hoon.  Thank you!
 2013-10-08 10:33:00 -05:00
Christopher Allan Webber
63866d806a Just fixing the order of migrations and a bit of whitespace. 
This commit sponsored by Glenn McGrath.  Thank you!
 2013-10-08 10:30:55 -05:00
Christopher Allan Webber
56c4ad89eb Merge remote-tracking branch 'refs/remotes/tilly-q/OPW-Moderation-Update' 
Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/user.html
	mediagoblin/tests/test_auth.py
	mediagoblin/tests/test_submission.py
 2013-10-07 15:48:33 -05:00
Christopher Allan Webber
345b958871 Make the develop makefile target the default. 
Why do ./configure && make && sudo make install if the second one make
installs, amirite? ;)

Generally I just think install should not be a default make target.

This commit sponsored by Ron Ursem.  Thank you!
 2013-10-07 14:45:50 -05:00
Christopher Allan Webber
ae51a0f0bd Fix by lennax: Fix the AC_MSG_ERROR undefined macro error. 
Thanks Lennax! :)
 2013-10-07 14:43:53 -05:00
tilly-Q
0a24db84c5 This was a very important update where I fixed a few small but fatal bugs in my 
code. I had removed the import of Privilege in mediagoblin.db.migrations, and
this was still necessary and was causing errors. I also made it so that media
deletion by moderators, through reports, actually fully deleted the media,
rather than just deleting the database representation of the media. Lastly, I
fixed a bug in migration that caused a fatal error on login because the UserBan
user_id column was improperly named in it's creation by migration.
 2013-10-03 17:07:11 -04:00