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

90 Commits

Author SHA1 Message Date
Jorge Araya Navarro
fb2fbe2c0a fixing bug #255 as Joar and CWebber ask me to do :) 2012-06-28 22:13:26 -06:00
Joar Wandborg
00722c9908 Fixed some comment notification code for compliance with SQL 
* Pulled instance name in notification email from config
 2012-06-10 18:18:26 +02:00
Joar Wandborg
879ff4bde6 Merge remote-tracking branch 'is_derek/bug405_email_notifications_for_comments' into notifications-merge 
Conflicts:
	mediagoblin/db/mongo/migrations.py
 2012-06-10 15:53:46 +02:00
Elrond
32adc9b2a7 Panel: Find "unprocessed" not "processing" entries. 
Our entries in the queue are marked as "unprocessed" and
not as "processing" as the panel code wanted it to be. So
search for the correct string.
 2012-03-21 12:17:57 +01:00
Christopher Allan Webber
94e6052375 Merge branch 'master' into derek-moore-bug405_email_notifications_for_comments 
Conflicts:
	mediagoblin/db/mongo/migrations.py
 2012-03-18 12:12:41 -05:00
Brett Smith
a0a7f87f62 When media is deleted, delete associated comments too. 
The actual code is just a simple for loop; there might be a better
implementation but this is a fine start.  I also extended test_delete to
check this too.
 2012-03-17 17:53:00 -04:00
Derek Moore
252eaf21d5 These are changes for issue #405, add email comment notification. 2012-03-15 16:38:56 -07:00
Elrond
8efcd40558 Dot-Notation: MediaComment and some random places 2012-02-26 19:19:48 +01:00
Elrond
feba5c5287 Drop pre-rendered html: MediaComment.content_html 
After a bit of discussion, we decided to drop the
pre-rendered html from the database and render it on
the fly.

In another step, we will use some proper caching method to
cache this stuff.

This commit affects the MediaComment.content_html part.
 2012-02-18 12:50:30 +01:00
Elrond
1e72e075f8 Drop pre-rendered html: MediaEntry.description_html 
After a bit of discussion, we decided to drop the
pre-rendered html from the database and render it on
the fly.

In another step, we will use some proper caching method to
cache this stuff.

This commit affects the MediaEntry.description_html part.
 2012-02-18 12:41:25 +01:00
Will Kahn-Greene
7f4ebeed76 Fix copyright statements; add LICENSE for EXIF.py 2012-02-08 10:47:08 -05:00
Christopher Allan Webber
cf29e8a824 It's 2012 all up in here 2012-02-02 09:44:13 -06: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
5b1a7bae3c Added PuSH capability 2012-01-11 15:48:37 +01: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
Elrond
0575175846 Turn media.get_uploader into a property 
sqlalchemy gives autoloading (hopefully caching) link to
other objects as properties. So turn get_uploader on the
current mongo based stuff into a property to ease
transition.
 2011-12-27 20:41:31 +01:00
Elrond
4deda94a38 Replace media.get_uploader()._id by media.uploader 
media.get_uploader()._id loads a complete user object
without actually needing it, because media.uploader already
has the id!
 2011-12-24 19:27:29 +01:00
Elrond
f4ee839939 Dot-Notation for MediaEntry.media_type 2011-12-05 21:08:58 +01:00
Elrond
bec591d85b Dot-Notation for Users.is_admin 2011-12-05 21:08:57 +01:00
Elrond
7a3d00ec21 Dot-Notation for Users.status 2011-12-05 21:08:57 +01:00
Elrond
5a4e3ff1e2 Dot-Notation for Users.username 2011-12-05 21:08:57 +01:00
Jef van Schendel
eae7d0585f Changed comment error message wording slightly. Btw, should we translate these things? 2011-12-03 01:19:15 +01:00
Christopher Allan Webber
99d2ac1d83 Merge remote-tracking branch 'remotes/jwandborg/master' 2011-11-24 15:24:58 -06:00
Elrond
3018832153 Rename MediaEntry.uploader() to .get_uploader() 
The .uploader() method conflicts with the uploader database
field. As we're moving to .FIELD for db field access, this
is a relevant conflict.

So renaming .uploader() to .get_uploader()
 2011-11-22 22:29:37 +01:00
Elrond
ea33f63635 Wrap long line. 
Nothing else.
 2011-11-22 21:48:56 +01:00
Pablo J. Urbano Santos
56bfd91ab4 Added a message noticing the user the image has been successfully 
deleted.
 2011-11-22 21:07:09 +01:00
Pablo J. Urbano Santos
d0ba62e2e7 Fixes #597. Add a visible error when user tries to delete an image 
without cheking the "I'm sure" checkbox.
 2011-11-22 20:29:33 +01:00
Joar Wandborg
b9e1fa280e Merge branch 'video_gstreamer-only' 
Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/submit/views.py
 2011-11-21 21:51:30 +01:00
Christopher Allan Webber
7c378f2cd5 Allow user to set whether comments are ascending or descending 2011-11-19 14:01:38 -06:00
Pablo J. Urbano Santos
1a3138addd media_home: order comments by ascending date. 2011-11-19 19:15:41 +01:00
Elrond
eabe6b678a Dot-Notation for "_id" 
Note: Migrations can't use "Dot Notation"!

Migrations run on pymongo, not mongokit.
So they can't use the "Dot Notation".
This isn't really a big issue, as migrations are anyway
quite mongo specific.
 2011-11-15 11:32:13 +01:00
Christopher Allan Webber
ee91c2b88d Merge remote-tracking branch 'remotes/nyergler/pep8-ification' 
Conflicts:
	mediagoblin/db/migrations.py
	mediagoblin/db/models.py
	mediagoblin/user_pages/views.py
	mediagoblin/util.py
 2011-11-13 20:23:26 -06:00
Christopher Allan Webber
98308e61b6 Removed the bloof print debugging 2011-11-02 08:55:02 -05:00
Christopher Allan Webber
95e12bf231 Make sure you can't force comments on entries that don't exist. 
See: http://bugs.foocorp.net/issues/621
 2011-11-02 08:53:33 -05:00
Aaron Williamson
2b3a50db43 Make Comment posted! translatable. 2011-10-04 16:32:41 -04:00
Aaron Williamson
7298ffa11b Added a check to prevent blank messages from being posted. 2011-10-03 21:03:36 -04:00
Nathan Yergler
243c3843bd Whitespace and formatting cleanup. 
* Removed trailing whitespace
* Line length < 80 where possible
* Honor conventions on number of blank lines
* Honor conventions about spaces around :, =
 2011-10-01 15:10:02 -07:00
Aaron Williamson
152a3bfaa3 Finished splitting util.py into separate files. 2011-10-01 18:05:44 -04:00
Aaron Williamson
ae3bc7fabf Moved common, translation, template, and url code out of util.py and into tools/[file].py 2011-10-01 09:31:42 -04:00
Joar Wandborg
93bdab9daa Multimedia support - Commiting from a not yet finished state - Details below 
* DONE Initially testing with arista
** DONE Video display templates
*** TODO Multi-browser support
** TODO Video thumbnails
** TODO Link to original video
** TODO Video cropping

Also contains a lot of "debug" print's
 2011-09-23 02:35:57 +02:00
Elrond
8d7b549bb6 Use media.url_for_self() instead of generating it 
Some places used to generate the URL for a media entry on
their own instead of calling media.url_for_self() to do
that. The later handles missing slugs better.
 2011-09-09 23:59:32 +02:00
Shawn Khan
8daef28dc7 Page Redesign to Delete confirmation page 2011-09-05 20:37:08 -05:00
Will Kahn-Greene
12a100e4d8 508. Updates copyright/license information 2011-09-01 20:50:19 -04:00
Christopher Allan Webber
7a4c0126df Caution the admins about deleting the users' media though. 2011-08-30 22:38:09 -05:00
Joar Wandborg
502073f2bf Feature #403 - Ability to delete media entries - Fixes according to feedback 
*   Moved `mediagoblin.confirm` stuff to `mediagoblin.user_pages`,
    templates too.
*   Removed route extension for `mediagoblin.confirm`
*   Created `delete_media_files` which deletes all media files
    on the public_store when the entry is deleted
*   Created a new decorator to check if a user has the permission
     to delete an entry.
 2011-08-30 23:16:46 +02:00
Christopher Allan Webber
7dc3a66f92 Merge remote branch 'remotes/jwandborg/f403_ability_to_delete' 
Conflicts:
	mediagoblin/edit/views.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
	mediagoblin/user_pages/routing.py
 2011-08-28 22:05:54 -05:00
Christopher Allan Webber
894fa564e7 Merge branch 'master' into jwandborg-f482_media_attachments 
Conflicts:
	mediagoblin/config_spec.ini
	mediagoblin/edit/forms.py
	mediagoblin/edit/views.py
	mediagoblin/submit/views.py
	mediagoblin/templates/mediagoblin/user_pages/media.html
 2011-08-22 21:48:45 -05:00
Joar Wandborg
3a8c3a3855 Feature #482 - Media attachments - 
*   Moved attachment uploading to separate view
*   Support for multiple attachments!
 2011-08-22 18:06:28 +02:00
Mark Holmquist
08750772ea + 'confirm' section for confirmation dialogues 
+ implemented delete functionality
* fixed several instances of 'must be an instance of unicode, not str'
 2011-08-22 02:57:40 -07:00