stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-31 12:10:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
5,668 Commits 4 Branches 0 Tags
ec052d71301acbf519947897f8adda7fdcf7fefb
Commit Graph
5668 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Almdal 85ea66d51e Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-02 20:52:55 -07:00
Andy Staudacher 72281d2b44 Fix for ticket 470. Replace ReCaptcha with reCAPTCHA in user visible strings. 2009-07-02 20:50:29 -07:00
Andy Staudacher 93e9efed97 Use Unicode characters (looks better to translator, and fixes normalization issue in translation server) 2009-07-02 20:49:47 -07:00
Tim Almdal adb820e37c Fix for ticket #359 and a partial fix for ticket #345. 
In G2, text strings have the &, ", < and > replaced by &amp;, &quote;,
&lt; and &gt; respectively.  Created the _decode_html_special_chars
method in helpers/g2_import.php to revert these character strings.
 2009-07-02 20:48:47 -07:00
Bharat Mediratta eb5538d135 Merge branch 'master' of git@github.com:/gallery/gallery3 
Conflicts:
	modules/server_add/controllers/admin_server_add.php
 2009-07-02 18:00:22 -07:00
Bharat Mediratta 1a5fe42b55 Temporary version add() that just dumps out the values for now. 2009-07-02 17:54:48 -07:00
Bharat Mediratta 9eee3b07a8 @todo if we uncheck all the children for a parent, we should uncheck the 
parent itself, otherwise in the code we'll add the entire parent since if
we find an album as a leaf, we assume that it's never been expanded in the UI.
 2009-07-02 17:54:22 -07:00
Bharat Mediratta 1cd321901b Properly manage disabled state for the [add] button. 2009-07-02 13:02:26 -07:00
Bharat Mediratta d4075a4657 Only enable the [add] button when boxes are checked. 2009-07-02 11:49:45 -07:00
Bharat Mediratta a619bb8196 Add some jsDoc. 2009-07-02 11:30:21 -07:00
Bharat Mediratta e5b6193b26 Partial pass of server_add cleanup. It's broken at this stage since 
I've redone the browsing code but I have not implemented the adding
code.

1) Rename index() to browse() since index is too generic.
2) Simplify the data that we pass to _dialog and _tree
3) Change _tree to return list items only, so that the outer dialog
   can be a <ul> for consistency.
4) Simplify the data structures so that we're not tracking checked vs.
   unchecked status in the PHP code, it's all done in jquery where we
   can do it with just a line or two of JS
5) use glob() which pretty much entirely replaces _get_children
 2009-07-02 11:23:40 -07:00
Tim Almdal 1c9dee93de Fix for ticket #390. 
Added a call to GalleryCoreApi::fetchItemViewCounts to retrieve the gallery2
view counts forthe imported items.
 2009-07-02 09:54:50 -07:00
Tim Almdal e0927b55d9 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-02 08:18:12 -07:00
Tim Almdal 768657d8b1 Suppress the filesize error if the thumbnail is not found so we can get 
an EMPTY_INPUT_FILE exception which we can then log and continue.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-07-02 23:09:20 +08:00
Tim Almdal 3dfe19e99a Start of fixing a problem with importing movies w/o a thumbnail 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-07-02 23:06:07 +08:00
Tim Almdal 8687278954 Fix for ticket #357. 
Changed the set the created date as part of the import and change
models/comment::save() to not set the creation date if it is already
set.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-07-02 22:57:31 +08:00
Tim Almdal a13ddfea8f Suppress the filesize error if the thumbnail is not found so we can get 
an EMPTY_INPUT_FILE exception which we can then log and continue.
 2009-07-02 07:53:24 -07:00
Tim Almdal b6bf7a5881 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-02 07:36:00 -07:00
Bharat Mediratta 495c76f729 Eliminate temporary variables by passing the $item into the view and 
making API calls on the item.
 2009-07-02 05:11:03 -07:00
Bharat Mediratta d4e976cc53 Remove empty <script> block. 2009-07-02 05:06:17 -07:00
Bharat Mediratta c60d7f431d ORM::Factory -> ORM::factory 2009-07-02 04:37:03 -07:00
Bharat Mediratta 14d7797cda In remove_path(), if the path is invalid don't echo it back in the UI. 2009-07-02 04:35:03 -07:00
Tim Almdal 7bc40fd315 Start of fixing a problem with importing movies w/o a thumbnail 2009-07-01 23:14:01 -07:00
Bharat Mediratta a674170bf7 2 fixes: 
1) Include the url in the cache key so that if the Gallery moves, we
   don't use old cached entries.

2) Use the relative path to files in the comments that we embed in our
   files so that we don't leak local paths.
 2009-07-01 22:55:43 -07:00
Tim Almdal 6f3ec5f039 Fix for ticket #357. 
Changed the set the created date as part of the import and change
models/comment::save() to not set the creation date if it is already
set.
 2009-07-01 22:18:52 -07:00
Tim Almdal 588f991d55 Updated to Exifer r4159 2009-07-01 21:56:02 -07:00
Tim Almdal 60b201f23b Add the partner id to the message being sent to digibug 2009-07-01 18:01:15 -07:00
Bharat Mediratta 8f9a943f55 Fix a bunch of XSS vulnerabilities turned up by manual inspection 
using the checklist in ticket #385.
 2009-07-01 17:57:39 -07:00
Bharat Mediratta 7b1e3c5021 Reapply c65bfb5a10 without extra 
whitespace changes.
 2009-07-01 11:32:27 -07:00
Bharat Mediratta 8f4c1c4ddf Revert "Fix for ticket #437" 
This change had unintentional whitespace changes.  Reverting for now, will reapply it.

This reverts commit c65bfb5a10.
 2009-07-01 11:31:12 -07:00
Tim Almdal c65bfb5a10 Fix for ticket #437 
Tracking vendor ticket: http://bit.ly/16b7Zj
 2009-07-01 10:45:37 -07:00
Bharat Mediratta f79e26b919 Merge branch 'master' of git@github.com:gallery/gallery3 2009-07-01 01:08:17 -07:00
Bharat Mediratta 9beac1132e Fix a typo in the Doctype. Fixes ticket #497. 2009-07-01 01:08:00 -07:00
jhilden b943b0f7c1 made the 'back to gallery' link in the admin a lighter grey 
(and removed the commented out <img>)
 2009-07-01 02:39:00 -04:00
Chad Kieffer 0add4ced22 Add a bit more contrast to superfish sub-menus. 2009-07-01 00:35:33 -06:00
jhilden 979d327595 change to the 'back to the Gallery' link from the admin. 2009-07-01 02:17:38 -04:00
Chad Kieffer 0d105bcf9d Display owner's full name rather than username, ticket #421. 2009-06-30 23:29:53 -06:00
Bharat Mediratta 58e3e469b9 Merge branch 'master' of git://github.com/hiwilson/gallery3 2009-06-30 21:09:38 -07:00
Bharat Mediratta 79de82bccc Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-30 20:53:18 -07:00
Bharat Mediratta 132bd8306e Re-add Session::abort_save(). It was reverted as part of the earlier 
change, but this is the part that we want to keep.
 2009-06-30 20:51:02 -07:00
Bharat Mediratta 4e46a6edf6 Updated Kohana to r4434 2009-06-30 20:48:16 -07:00
Bharat Mediratta 666c807fcc Revert "Add Session::abort_save() to Kohana." 
Obsoleted by upstream fix.

This reverts commit 06f066164f.
 2009-06-30 20:47:51 -07:00
Tim Almdal 200b78ee59 Revert the change that removed adding the click handler for the digibug print 
functionality.  Just return false when using javascript:digibug_popup was not
enough from having the browser switch pages and show a page with the word false.
Using an event handler allows us to call event.preventDefault which cancels the
page switch.
 2009-06-30 20:32:59 -07:00
Tim Almdal b541935d6f Fix issues with Digibug printing where the preview ws not showing up. 2009-06-30 20:17:48 -07:00
jhilden 0b34ec4e8b UI enhancement: made the 'back to the Gallery' links a little bit easier to discover 2009-06-30 22:22:29 -04:00
Bharat Mediratta 3ef39d4576 Update Exif_test to match change made in 4943103700 
Get rid of vestigial third column in exif::_keys().
 2009-06-30 19:17:45 -07:00
Bharat Mediratta d8e776cc88 Checkpoint. 2009-06-30 19:12:46 -07:00
Bharat Mediratta 5e8e3ab6b5 Rejigger the way we handle "done" status in the upgrader. Now we 
present the done box if you're done and let you get rid of it if you
want.  It's not beautiful, by any means, but it gives you an easy link
back to your Gallery when you're finished.

Fixes ticket #479.
 2009-06-30 18:28:55 -07:00
Bharat Mediratta 050c5a0383 Unlink the old rewritten path files in var/modules/g2_import when we 
validate the embed path.  This resolves an issue with b1 installs
which had versions of the rewritten code that were buggy and can be
replaced.
 2009-06-30 17:58:33 -07:00
Tim Almdal 8ed6d1183b Fix for #319. 
Created a new view "movieplayer.html.php", which is rendered by
Item_Model::movie_img().  Changed movie.html.php to use movie_img to render
the movie player link.
 2009-06-30 08:21:00 -07:00