stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-06-02 01:39:21 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,668 Commits 4 Branches 0 Tags
ec052d71301acbf519947897f8adda7fdcf7fefb
Commit Graph

38 Commits

Author SHA1 Message Date
Bharat Mediratta
c3c2b45280 Update the copyright to 2010. It's only 3 months into the year :-) 2010-03-03 10:15:34 -08:00
Andy Staudacher
2c3c126aaf Fix ticket 930: Use the first frame as video thumbnail if the video is shorter than 3 seconds. And fall back to the default thumbnail if that operation fails. 
Thanks to lsowen for providing a patch!
 2010-02-06 20:07:58 -08:00
Bharat Mediratta
bbe70119ef Localize validation messages. 2010-01-27 23:05:57 -08:00
Bharat Mediratta
e02675b730 Change "filename" to "name" in the edit album form. I'd rather have 
consistency between field names than deal with underlying issues with
Forge bitching about the "name" property.
 2010-01-19 19:31:01 -08:00
Bharat Mediratta
8ce11ac970 Convert Movies_Controller::update() over to model based validation. 2010-01-16 12:07:36 -08:00
Bharat Mediratta
efdb73cb98 Make movie creation use model based validation. Move movie related 
logic from movie::create() into Item_Model
 2010-01-16 12:00:50 -08:00
Bharat Mediratta
94f58e8b65 Move setting Item_Model::rand_key into Item_Model::save() since it's 
business logic.
 2010-01-15 10:48:39 -08:00
Bharat Mediratta
20bd09ff00 A more thorough fix for #745 and #940. Stop using the referer to 
guess how to send the user back.  Instead, proxy the originating item
id through the edit forms so that we can tell exactly what page we
were on when we began editing.  If we were viewing the item, then
redirect to its new url (in case it changed) to fix ticket #745.  But
if we were viewing some other item, then just stay on the current page
to fix #940.

The page_type approach didn't work because you'd have the same
"collection" page_type when doing a context menu edit for an album.
 2009-12-31 17:21:19 -08:00
Bharat Mediratta
d5c35210b9 Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 2009-12-06 21:38:47 -08:00
Tim Almdal
16bed1ffd5 Remove the hidden form variable _method which was used in the no longer rest controllers. 2009-12-06 21:32:27 -08:00
Bharat Mediratta
dee3ee81e2 Database::orwhere() is now Database_Builder::or_where() 2009-11-26 20:25:32 -08:00
Bharat Mediratta
1fd0e14359 Convert all DB where() calls to take 3 arguments. 
Convert all open_paren() calls to and_open() or or_open() as appropriate.
 2009-11-26 12:09:04 -08:00
Bharat Mediratta
f50dbd992d Merge branch 'master' of git@github.com:gallery/gallery3 into bharat_dev 
Conflicts:
	modules/gallery/controllers/rest.php
 2009-11-25 13:40:47 -08:00
Bharat Mediratta
2e420522ec Preliminary work to cut over to Kohana 2.4 
- Kohana::log() -> Kohana_Log::add()
- Kohana::config_XXX -> Kohana_Config::instance()->XXX
- Implement View::set_global in MY_View
- Updated Cache_Database_Driver to latest APIs
- ORM::$loaded -> ORM::loaded()
- Updated item::viewable() to use K2.4 parenthesization
 2009-11-25 13:22:24 -08:00
Tim Almdal
2d5c232c42 Refactor the album, movie and photo handling to remove the REST_Controller. Partial fix for ticket #917 2009-11-25 12:46:04 -08:00
Tim Almdal
26f8240e34 Revert "Try an new approach to extending forms. Create an extend_form event. For the first attempt replace the comment_add_form and item_add_form events." 
This reverts commit 809e738536.
 2009-11-09 11:52:43 -08:00
Tim Almdal
809e738536 Try an new approach to extending forms. Create an extend_form event. For the first attempt replace the comment_add_form and item_add_form events. 2009-11-01 13:14:11 -08:00
Tim Almdal
e72022f062 Include the gallery_toolkit_path in the path when determining the location of ffmpeg. 2009-10-31 16:23:08 -07:00
Tim Almdal
3c936d661a Change the name of identity library from Identity to IdentityProvider. Create a helper class called identity to simplify call the Identity Provider. Move the contents of MY_Session.php to the new helper class and remove the MY_Session class 2009-10-22 13:11:03 -07:00
Tim Almdal
78ee4193b7 Remove all non Identity API methods from Identity.php. Created an MY_Session class to provide the user state changes in the session and a login.php helper that has the login form. 2009-10-16 10:06:58 -07:00
Tim Almdal
bc241e44c2 Cleanup merge of user/group helpers into Identity interface. Reduce redundant code in the user module and remove references to the Identity helper from the user module as the user module should be able to access things directly. Simplify the get_user_list api method to just accept an array of ids to return user objects for. 2009-10-16 08:55:26 -07:00
Tim Almdal
00eacd659f Start simplifying the interface by moving the static methods from user.php and group.php. Tried creating a identity helper, but the helper identity.php was confused with the library Identity.php. So got around this by making the methods on Identity static and calling the instance within the static methods. Also temporarily moved the user.php and group.php back into the user module. 2009-10-16 08:53:31 -07:00
Bharat Mediratta
0a66ef9cc7 Don't allow users to change the file extension of photos/movies 
If you can change the extension, then you can alter the way the server
handles the file, which is a security problem.  So for example, you
can change a .JPG to a .PHP and then if you put some malicious PHP
code in the EXIF data, you can get the server to execute
it. Vulnerability is low because only users who have edit permissions
could do this.

Fixes ticket #846
 2009-10-13 10:36:50 -07:00
Bharat Mediratta
bc63e4fcf9 Make the slug field required for all items. 
Make the filename field required for photos/movies.
Fixes ticket #838
 2009-10-11 11:16:07 -07:00
Chad Kieffer
3e6ba7acc3 Renamed most, if not all css selectors from gName to g-name. Moved a few shared images from wind to lib. Deleted unused images in the admin_wind. This will likely break a few ajax features. 2009-10-04 00:27:22 -06:00
Tim Almdal
b79129e365 Clone the photo::get_edit_form to the movies helper and use it to generate the movie edit form. Fixes ticket #726. 2009-09-23 12:02:35 -07:00
Bharat Mediratta
3f997562de Add support for a per-item "slug" which will be the user-visible url 
component for that given item.  Album hierarchies are represented by
nested slugs.  By default, we convert the filename to a slug when you
create an album, photo or movie.
 2009-09-07 15:42:08 -07:00
Bharat Mediratta
68a78f7cce Quiet down ffmpeg in movie::extract_frame() 2009-09-07 15:34:01 -07:00
Bharat Mediratta
0f766b149d Second non-trivial change to the event code. We now publish model 
related events from within the model handling code.  The only
exception to this currently is item_created which is challenging
because we have to save the item using ORM_MPTT::add_to_parent()
before the object itself is fully set up.  When we get that down to
one call to save() we can publish that event from within the model
also.
 2009-07-16 12:31:40 -07:00
Bharat Mediratta
2a40f48d65 Add /opt/bin as a binary path. 2009-07-14 06:36:48 -07:00
Bharat Mediratta
c60d7f431d ORM::Factory -> ORM::factory 2009-07-02 04:37:03 -07:00
Bharat Mediratta
abbecb9e7e Look in /opt/local/bin for binaries, too. 
Fixes ticket #423.
 2009-06-24 21:19:05 -07:00
Bharat Mediratta
b4ef00c8d4 Use a placeholder image if ffmpeg is missing instead of throwing an 
exception which would get silently swallowed by swfUpload.
 2009-06-16 19:47:52 -07:00
Bharat Mediratta
b70623118a Add /usr/local/bin to PATH before trying to detect binaries. 2009-06-12 00:58:34 -07:00
Bharat Mediratta
d0b2544511 Check in /usr/local/bin for ffmpeg, and create the setting even if its 
empty (to make it easier for folks to change it in Admin > Settings >
Advanced)
 2009-06-09 18:59:53 -07:00
Bharat Mediratta
181c97ef4b Relax the regex we use to extract the movie size so that it works with 
the new version of ffmpeg that I have on my dev box (ffmpeg
0.5-svn17737+3:0.svn20090303-1)
 2009-05-31 12:53:03 -07:00
Bharat Mediratta
88a3d43ba9 Update all references to the core application to now point to the 
gallery module.  This type of mass update is prone to some small bugs.
 2009-05-27 16:17:29 -07:00
Bharat Mediratta
28b41056e3 Restructure things so that the application is now just another module. 
Kohana makes this type of transition fairly straightforward in that
all controllers/helpers/etc are still located in the cascading
filesystem without any extra effort, except that I've temporarily
added a hack to force modules/gallery into the module path.

Rename what's left of "core" to be "application" so that it conforms
more closely to the Kohana standard (basically, just
application/config/config.php which is the minimal thing that you need
in the application directory)

There's still considerable work left to be done here.
 2009-05-27 15:07:27 -07:00