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

1637 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joar Wandborg
836df45dbe Added code for leaflet geolocation map 2012-01-25 23:42:04 +01:00
Joar Wandborg
9bf7563d4c Installed EXIF.py in extlibs/ 2012-01-25 23:42:04 +01:00
Joar Wandborg
c5ba5b0456 Installed leaflet in extlib 2012-01-25 23:42:04 +01:00
Elrond
c47a03b909 Proper url_to_{prev,next} for SQL 
Uses complete sqlalchemy syntax now.
 2012-01-22 18:41:06 +01:00
Elrond
02ede85826 Create a fully functional get_comments for SQL 
Using proper sqlalchemy syntax instead of the emulated
mongo one.
 2012-01-22 18:40:42 +01:00
Christopher Allan Webber
ee4fb8125a Canonical license URIS for CC stuff should have a trailing slash. 2012-01-21 17:00:42 -06:00
Christopher Allan Webber
2c1f1fd08b Show the license list in sorted form 2012-01-21 16:58:03 -06:00
Christopher Allan Webber
da6206c4be Oops, I broke teh all rights reserved ;) 2012-01-21 16:56:49 -06:00
Christopher Allan Webber
5d775ebd2f Provided a SORTED_SUPPORTED_LICENSES (but keep the old unsorted dict!) 2012-01-21 16:51:21 -06:00
Christopher Allan Webber
ac014f0424 Convert over the license field, too! 2012-01-21 16:41:07 -06:00
Christopher Allan Webber
2788e6a164 License "all rights reserved" default should be None/NULL, not empty string 2012-01-21 16:40:39 -06:00
Elrond
3c351460e1 Fix unit tests with new license support 
Make the license field in the forms optional and let them
properly be defaulted to "".
 2012-01-21 19:24:36 +01:00
Aaron Williamson
c8035da197 Added migration for license field, resolved conflict in db/sql/models.py 2012-01-19 22:00:08 -05:00
Elrond
fbad3a9fb9 Add copyright header and a bit of pep8ification 
Nearly all the sql files missed a copyright header.
So added it!
And while there fixed a few pep8 things.
 2012-01-20 00:17:05 +01:00
Elrond
92edc74e9b Use custom query class 
A custom query class allows to add more methods on
queries (read: "cursors").

This custom query class especially adds a .sort with a
calling convention exactly like the mongo one.
Makes a lot of existing code happy!
 2012-01-20 00:00:57 +01:00
Aaron Williamson
97ec97dbc7 Minor formatting and syntax fix. 2012-01-18 21:21:49 -05:00
Aaron Williamson
17c23e15e4 Moved get_license_data to mixin.py, added license to sql media model, added translation tags to license template. 2012-01-18 21:07:55 -05:00
Aaron Williamson
291e24f397 Merge branch 'mediagoblin-upstream' into feature544_basic_license_data 2012-01-18 20:40:18 -05:00
Elrond
6fc8af3278 sql/fake.py: Some fake objects/methods to calm the code 
sql/fake.py contains some fake classes and functions to
calm the rest of the code base. Or provide super minimal
implementations.

Currently:
- ObjectId "class": It's a function mostly doing
  int(first_arg) to convert string primary keys into
  integer primary keys.
- InvalidId exception
- DESCENING "constant"
 2012-01-18 23:35:55 +01:00
Michele Azzolari
c03d13cd79 Cleaned the code 2012-01-17 23:15:47 +01:00
Michele Azzolari
77b91efcc2 We handle exceptions if PuSH fails 2012-01-17 22:42:36 +01:00
Elrond
6d13314e99 Merge remote branch 'remotes/macno/pushatom' 
* remotes/macno/pushatom:
  As per spec, we permit to have more then 1 hub
  As suggested by Elrond, we use only one setting
  Default is now PuSH disabled
  Added PuSH capability
 2012-01-17 18:30:15 +01:00
Aaron Williamson
4225a677ca Changed license.html to fit new layout better 2012-01-17 01:23:21 -05:00
Aaron Williamson
a6c49d49dc Fixed a syntax error in edit/views and added back in some missing license stuff from models 2012-01-17 01:22:02 -05:00
Aaron Williamson
0bfb4dc249 Added new files 2012-01-17 01:13:55 -05:00
Aaron Williamson
25bdf9b657 Fixed merge with upstream 2012-01-17 01:05:15 -05:00
Aaron Williamson
99a270e952 Merged changes with upstream 2012-01-17 00:59:21 -05:00
Aaron Williamson
25b48323a8 First crack at basic license support. 2012-01-17 00:33:55 -05:00
Jef van Schendel
8c7701f9f1 Small fix to simplify font style 2012-01-15 17:23:21 +01:00
Jef van Schendel
62f2557cae Another small text style fix 2012-01-15 17:10:35 +01:00
Jef van Schendel
b699791956 Small margin/font-weight fix 2012-01-15 17:07:15 +01:00
Elrond
52fc51f6a9 Drop sessions with invalid ObjectIds 
The session can contain invalid objectids when switching a
more or less live instance (with logged in users) from
mongo to sql or vice versa.
So drop the complete session and force the user to login
again.
 2012-01-14 13:36:00 +01:00
Elrond
9c94700413 Move maketarball.sh into devtools/ 
Now that there is a devtools directory, use it!
 2012-01-14 12:54:16 +01:00
Christopher Allan Webber
1b5bbc0a85 make this script executable 2012-01-13 20:27:53 -06:00
Christopher Allan Webber
4670ff1c56 Simple translation update script 2012-01-13 20:26:36 -06:00
Elrond
762d4a0c48 Fix request.user==None error 
If one isn't logged in and views the profile of a user
without media, one gets a problem, because request.user is
None and has no _id attribute.

Fix this.
 2012-01-13 23:42:33 +01:00
Jef van Schendel
fafec72740 Remove unnecessary piece of text in media.html. Fix "Markdown text" indentation so they are the same. 2012-01-13 23:23:02 +01:00
Jef van Schendel
20659de234 Add CC0 license header to Sphinx MediaGoblin theme (mg.css) 2012-01-13 17:38:20 +01:00
Michele Azzolari
bb025ebda1 As per spec, we permit to have more then 1 hub 2012-01-12 11:05:05 +01:00
Michele Azzolari
7f251b037b As suggested by Elrond, we use only one setting 2012-01-12 00:00:28 +01:00
Michele Azzolari
f502a89b6d Default is now PuSH disabled 2012-01-11 16:11:23 +01:00
Michele Azzolari
5b1a7bae3c Added PuSH capability 2012-01-11 15:48:37 +01:00
Elrond
02db7e0a83 Add MediaFile table and related infrastructure. 
- This adds a new SQL table field type for path tuples.
  They're stored as '/' separated unicode strings.

- Uses it to implement a MediaFile table.

- Add relationship and proxy fields on MediaEntry to give a
  nice media_files "view" there.

- Let the converter fill the MediaFile.
 2012-01-11 12:19:03 +01:00
Elrond
0ab21f981a Dot-Notation: Some random places 2012-01-11 11:42:26 +01:00
Elrond
cb7ae1e433 Fix url_for_self mixup 
Move changes from mongo/models:url_for_self back into
mixin:url_for_self.
 2012-01-11 11:16:35 +01:00
Christopher Allan Webber
73079ac4b8 Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin 
Conflicts:
	mediagoblin/db/mongo/models.py
 2012-01-10 08:12:30 -06:00
Michele Azzolari
1df68a3524 Fixed #724 and added extra infos to the atom feed (author uri and links to the html version of each entry) 2012-01-10 08:10:53 -06:00
Joar Wandborg
914b8bcde3 Added check for request.user to media.html attachment-related conditional 2012-01-10 13:12:14 +01:00
Elrond
c2d6792ddb Test Suite: Enable attachments, add failing test 
attachments are an optional part. But it doesn't hurt to
enable them in the test suite at all.

Also (with enabled attachmemtns) the main media view fails,
if one isn't logged in (joar found it!).  So add a simple
(currently failing) test for this.
 2012-01-10 12:52:01 +01:00
Elrond
1dc7f28d24 Fix reset.css reference and drop link to video-js.css 
1. reset.css was moved to /css/extlib/ some time ago.
   So update the staticdirect link to it.

2. We don't have video-js.css (any more?). Drop link to it.
 2012-01-09 14:39:54 +01:00