600 Commits

Author SHA1 Message Date
xray7224
a5682e8960 Support some webfinger API's and real profile and /api/user/<user>/ 2014-07-22 23:13:14 +01:00
xray7224
98596dd072 Support for the comments endpoint 2014-07-22 23:13:14 +01:00
xray7224
37f070b067 Fixes problem where full URL was being used inplace of host 2014-07-22 23:13:14 +01:00
xray7224
d461fbe5cb Use the the slug as the UUID instead of a newly generated UUID 2014-07-22 23:13:14 +01:00
Jessica Tallon
5b014a0866 Add image URL's (thumb & full) 2014-07-22 23:13:14 +01:00
Jessica Tallon
c8bd2542d7 Fixes where User id in API would return url rather than host 2014-07-22 23:13:14 +01:00
Jessica Tallon
a840d2a848 Adds comments for the MediaEntry api 2014-07-22 23:13:14 +01:00
Jessica Tallon
bdde87a4b3 Changes serialization to .serialize method on object - MediaEntry 2014-07-22 23:13:14 +01:00
Jessica Tallon
2b7b9de32e Make sure new media has a new uuid added on 2014-07-22 23:13:14 +01:00
Jessica Tallon
e590179ab6 Adds migration on MediaEntry to add uuid 2014-07-22 23:13:13 +01:00
Jessica Tallon
d7b3805f2d Starts the user (profile) endpoint and lays groundwork for inbox and feed endpoint 2014-07-22 23:13:13 +01:00
Jessica Tallon
637b966ac2 Adds seralize on user 2014-07-22 23:13:13 +01:00
Tryggvi Bjorgvinsson
09bed9a732 Use unicode for logging comments
The comment problems detailed in issue 791 are related to logging
of comments creation. The log tries to format unicode comments into
an ascii string (that is the unicode comment content).

This also creates problems with mark seen functionality since that
also logs the comments which breaks and you end up with a lot of
international comments in your message queue.

This commit makes both log messages unicode as well as the
representation of the comment.
2014-07-18 15:27:35 +01:00
Jessica Tallon
892eed590f Fix #894 - index User.username field
This commit sponsored by Emily O'Leary.  Thank you!
2014-07-17 10:21:29 -05:00
Berker Peksag
e2cb0f86fe Remove sqlalchemy-migrate imports from the codebase. Do not touch tests yet. 2014-06-27 03:17:12 +03:00
Christopher Allan Webber
27f9932731 Removing legacy mongo-related docstring 2014-06-23 13:45:00 -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
Berker Peksag
e49b7e02b2 Use six.text_type instead of unicode().
I will be switch to use ``from __future__ import unicode_literals`` later.
2014-06-02 20:59:28 +03:00
Berker Peksag
386c9c7c55 Use six.iteritems() instead of dict.iteritems(). 2014-05-26 19:50:38 +03:00
tilly-Q
c8abeb58af Set a default value to MediaEntry.media_metadata 2014-05-14 11:56:59 -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
Berker Peksag
7f342c72f6 Continue to port GMG codebase. 2014-05-08 20:33:14 +03:00
Berker Peksag
f6a700e8ae Fix some compat issues in mediagoblin/db/models.py. 2014-05-08 20:32:02 +03:00
tilly-Q
9adef07e8f Made the columns properly referenced in models and migrations. 2014-04-23 14:59:53 -04:00
tilly-Q
7918f86ac0 Renamed the columns on core__privileges_users table so that they are unique and
will not cause any more problems.
2014-04-22 14:36:23 -04:00
tilly-Q
0bfb4089cc Changed the name of the metadata column 2014-04-21 12:11:11 -04:00
tilly-Q
9f3dc83a6c Moved the metadata column to MediaEntry rather than MediaFile 2014-04-21 12:11:11 -04:00
tilly-Q
2dd966b5e2 In this commit, I added a new column which will be used for RDFa metadata of
media.
2014-04-21 12:07:59 -04:00
Berker Peksag
de6a313c5a 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.
2014-04-10 15:23:09 -05:00
Christopher Allan Webber
64eab630bf Not only the web server starts MediaGoblin app! Better phrasing. 2014-01-02 15:07:54 -06:00
Christopher Allan Webber
e0bf6b4bf7 Merge remote-tracking branch 'refs/remotes/rodney757/dbupdate'
Conflicts:
	mediagoblin/db/util.py
	mediagoblin/gmg_commands/dbupdate.py
2014-01-02 15:01:54 -06:00
tilly-Q
9412fffef1 I went through the code and just removed some blank spaces. I also looked it
thru and it looked great.
2013-11-19 15:14:14 -05:00
Josie
7dfcc538d3 Addressed ticket number 630 by removing MediaEntry.collected 2013-11-18 20:05:15 -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
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
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
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
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
tilly-Q
9519c0a91f In this commit, I mostly did work on the migrations. Firstly, I droppped the
vestigial columns from the User table (ie. status, email_verified, is_admin).
Otherwise, I did a lot of work converting my existing migrations from high-
level ORM commands to low-level SQL commands to ensure that the migrating will
work regardless of what stage their instance is working in. I also re-integrated
my two registered migrations into one. Because the migration became very long, I
also added a lot of clarifying documentation.
2013-10-03 16:13:12 -04:00
tilly-Q
a523ffce3c This commit was solely to remove unused imports in the code that I have written 2013-09-23 14:10:11 -04:00