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

4415 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christopher Allan Webber
be1dfb991d Updated the release notes 2014-09-21 12:39:04 -05:00
Christopher Allan Webber
d12373845f Committing extracted and compiled translations 2014-09-21 11:08:49 -05:00
Christopher Allan Webber
b993e32ffd Committing present MediaGoblin translations before pushing extracted messages 2014-09-21 11:08:22 -05:00
Christopher Allan Webber
67c6e26a59 download url removed 2014-09-19 16:54:10 -05:00
Christopher Allan Webber
1f7f2891ea Merge remote-tracking branch 'refs/remotes/moggers87/garbage-branch' 2014-09-19 16:25:35 -05:00
Christopher Allan Webber
ff1e9e96b6 Temporarily disable garbage collection 
We need to make sure we safely set up transactions here... it looks
pretty clearly like we aren't yet, so we need to review this.  This
should be re-enabled by 0.8.0.
 2014-09-19 15:56:26 -05:00
Christopher Allan Webber
31f8909f9b Comment out the "check if the database is up to date" stuff 
... it's presently causing session issues :\
 2014-09-17 18:08:54 -05:00
Christopher Allan Webber
6430ae97ec Last two issues related to the python 3 merge tests: fixed! 
- Fix the "pulling the error out of excinfo" stuff for py3
 - The u"" only gets embedded in the string on py2.

This commit sponsored by Jeff Gibson.  Thanks, Jeff! :)
 2014-09-16 17:39:53 -05:00
ayleph
f0e795df82 Modify deleteuser to fail gracefully 
bin/gmg deleteuser will produce a traceback error if you attempt to delete a
user who does not exist. This commit provides a fix to allow deletuser to fail
gracefully.

This commit addresses https://issues.mediagoblin.org/ticket/969
 2014-09-16 15:29:09 -07:00
Christopher Allan Webber
1db2bd3fe7 Annnnd another json decode fix for py3! On a roll with these! 
This commit sponsored by Ramana Kumar.  Thanks!
 2014-09-16 15:35:23 -05:00
Christopher Allan Webber
37865d02dd decode to unicode before loading in json again, for py3 
This commit sponsored by Chris Cormack.  Thanks!
 2014-09-16 15:33:46 -05:00
Christopher Allan Webber
dd41141d23 Much more nicely formed form error check 
This doesn't rely on checking HTML output... thus, cleaner.

This commit sponsored by Alexandre Guédon.  Thank you!
 2014-09-16 15:25:30 -05:00
Christopher Allan Webber
16450dada2 Fix error check in test_edit.py for python 3 
This isn't the nicest of checks... we should probably be checking the
actual form passed into the context.  But for now, it's a fix.
 2014-09-16 15:15:13 -05:00
Christopher Allan Webber
7893d43a8f Fix exception catching on python 3 
This commit sponsored by Paul Smith.  Thank you!
 2014-09-16 15:08:28 -05:00
Christopher Allan Webber
13f37e75eb Fix iteritems usage on python 3 
This commit sponsored by Ben (Free Software Melbourne) Finney.  Thanks!
 2014-09-16 15:07:33 -05:00
Matt Molyneaux
584520e325 The scheduled garbage collection task was not being called due to it being misnamed 
Fix #968
 2014-09-16 21:05:32 +01:00
Christopher Allan Webber
21cbf8294e json.loads(request.body) => json.loads(response.body.decode())) 
This fixes python 3 stuff.

This commit sponsored by James Reilly.  Thanks, James!
 2014-09-16 14:56:13 -05:00
Christopher Allan Webber
fa3f46d714 Import mock correctly on py3 
This commit sponsored by Andrew McNicol.  Thank you!
 2014-09-16 14:46:02 -05:00
Christopher Allan Webber
b6774d339a Simplify things here and use io.open 2014-09-16 14:37:52 -05:00
Christopher Allan Webber
58a7292fed Fix test_legacy_api.py 
Or rather, reimplement one of Berker's fixes and add one of mine:
 - add back the http_auth_headers fix Berker wrote
 - decode to json when testing the response.body, since we have no
   idea what the order will be here
 2014-09-16 14:37:36 -05:00
Christopher Allan Webber
3a02813c7a Import mock from unittest if on py3 2014-09-16 14:26:40 -05:00
Christopher Allan Webber
f6bad0eb26 Merge branch 'master' into merge-python3-port 
Has some issues, will iteratively fix!

Conflicts:
	mediagoblin/gmg_commands/__init__.py
	mediagoblin/gmg_commands/deletemedia.py
	mediagoblin/gmg_commands/users.py
	mediagoblin/oauth/views.py
	mediagoblin/plugins/api/views.py
	mediagoblin/tests/test_api.py
	mediagoblin/tests/test_edit.py
	mediagoblin/tests/test_oauth1.py
	mediagoblin/tests/test_util.py
	mediagoblin/tools/mail.py
	mediagoblin/webfinger/views.py
	setup.py
 2014-09-16 14:01:43 -05:00
Christopher Allan Webber
5b64c92e08 Temporarily disabling the mediagoblin errors middleware 
We don't have paste (core) in py3, so....
 2014-09-15 14:26:57 -05:00
Christopher Allan Webber
0977d10d2a No reason to wrap the rest of the options in a quote 
This commit sponsored by Thane Williams.  Thank you!
 2014-09-15 12:11:08 -05:00
Christopher Allan Webber
3c06c3efaf Upgrading gunicorn. Referenced issue is resolved. 
Also, upgrading seems to fix weird
"RuntimeError: dictionary changed size during iteration" issues
I was seeing.  (Looked like a gunicorn issue, not ours.)
 2014-09-15 11:46:56 -05:00
Christopher Allan Webber
0c32c7fe83 py2.7 compatibility with open(..., encoding="utf-8"), use io.open 
This commit sponsored by Peter Baumgarten.  Thank you!
 2014-09-12 12:30:09 -05:00
Christopher Allan Webber
9156ab68d0 Explicitly open READMEFILE as utf-8 2014-09-12 10:42:23 -05:00
Christopher Allan Webber
99c466045a Fix unicode error in pdf media type 
(we're checking against bytestrings, so make that explicit)
 2014-09-12 09:30:46 -05:00
Christopher Allan Webber
b6df960806 Set up tox.ini to run more properly: 
- Don't run dbupdate... the tests themselves do this, and we might
   mess up someone's db
 - We shouldn't run setup.py develop because that installs a new
   *live* db... the tests do isolation, so...
 - Install the package's dependencies by the package itself... it
   seems that removing "skipsdist = True" fixes this
 - Run py.test manually rather than use runtests.sh (which itself uses
   ./bin/py.test if it can)
 2014-09-12 09:26:01 -05:00
Jessica Tallon
8998300b98 Merge branch '945-well-known' 
* 945-well-known:
  Add /.well-known/webfinger API to lookup user hrefs
  Add XRD+XML formatting for /.well-known/host-meta
 2014-09-08 17:55:03 +01:00
Jessica Tallon
1bce996181 Add /.well-known/webfinger API to lookup user hrefs 2014-09-08 17:54:03 +01:00
Odin Hørthe Omdal
1b4e199668 Raw image mediatype had a non-unicode logging call 
Was causing UnicodeDecodeError when file/folder was not ascii.
Fixes bug #935.
 2014-09-07 09:43:49 -05:00
Odin Hørthe Omdal
4f1a5148cb Add __repr__ for Collection and CollectionItem 2014-09-07 09:42:07 -05:00
Christopher Allan Webber
a6570fae03 Slight tweak to the description wording 2014-09-07 09:39:01 -05:00
Low Kian Seong
478e4c9365 Update setup.py 
A `description` is needed so that project is not listed as `UNKNOWN` on `pypi`
 2014-09-07 09:37:33 -05:00
Christopher Allan Webber
b29b4e175f Handle cr2 files through the raw_image media type 
This commit sponsored by Jim Campbell.  Hey, I know that guy!  Thanks
Jim! :)
 2014-09-06 10:57:13 -05:00
Jessica Tallon
1b22d51a5d Fixes navbar for sandyseventiesspeedboat 2014-09-05 16:00:06 +01:00
Jessica Tallon
0af1b85998 Add XRD+XML formatting for /.well-known/host-meta 2014-09-05 14:17:42 +01:00
Jessica Tallon
b61519ce53 Only have Model.activity for activity compatable objects/targets 2014-09-03 15:58:40 +01:00
Jessica Tallon
0421fc5ee8 Fix migrations and refactor object_type 
- Make changes to objectType to be more pythonic "object_type"
- Move object_type to mixins rather than be on the models
- Convert migrations to sqlalchemy core rather than ORM (fix)
- Change TYPES to use descriptive strings rather than numbers
 2014-09-02 16:38:52 +01:00
Christopher Allan Webber
f251d99828 now in the 0.7.1.dev cycle 2014-08-27 13:28:51 -05:00
Christopher Allan Webber
cb9f5570f9 Correcting, host-meta not webfinger. 2014-08-27 12:27:04 -05:00
Christopher Allan Webber
fcee02a776 Run the following to fix the missing git submodule init step 2014-08-27 12:26:23 -05:00
Jessica Tallon
23bf7f3b02 Oops forgot to add medigoblin.tools.federation 2014-08-27 15:32:59 +01:00
Jessica Tallon
ce46470c02 Add ActivityIntermediator table and refactor some of Activity model 
- This has introduced a intermediatory table between object/target and
  the activity. This allows for multiple activities to be associated
  with one object/target.
- This moves some of the methods off Activity model into a mixin which
  didn't need to interact with database things.
- This also cleaned up the migrations as well as adding retroactive
  creation of activities for collection creation.
 2014-08-27 15:20:27 +01:00
Christopher Allan Webber
c7690151cc Also add git submodule init to the release docs 2014-08-26 12:31:29 -05:00
Jessica Tallon
1c15126819 Add better support for targets on Activities 
This adds betters upport for targets in the content generation
and on the model itself. Adding getters for properties which would
otherwise require looking up e.g. get_author.
 2014-08-26 10:19:39 +01:00
Christopher Allan Webber
5a9111063f At version 0.7.0, at last! 2014-08-25 15:31:55 -05:00
Christopher Allan Webber
3db594557a Committing extracted and compiled translations 2014-08-25 14:44:41 -05:00
Christopher Allan Webber
551027ab0e Committing present MediaGoblin translations before pushing extracted messages 2014-08-25 14:44:17 -05:00