stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 19:39:16 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,074 Commits 4 Branches 0 Tags
77ec06166320dee631bbffcf3d57b0e2debcb157
Commit Graph

172 Commits

Author SHA1 Message Date
Bharat Mediratta
77ec061663 Redirect to the root album when there's an empty path and empty id. 
Fixes ticket #1387.
 2010-09-18 15:12:43 -07:00
Bharat Mediratta
36f3a0387d Tighten up the "your gallery2 has xxx in it" info display. 2010-09-08 21:39:35 -07:00
Bharat Mediratta
5cd34160af Remove unnecessary g2_import CSS (which we were loading on every page 
-- doh!) and replace it with a new "enumeration" list style in the
admin_wind CSS.  Reshuffle the page a little bit to make it look cleaner.
 2010-09-08 21:34:16 -07:00
Bharat Mediratta
fe3dd6b55d Add information about disabling XCache during the import process. Fixes ticket #1352. 2010-09-08 21:12:20 -07:00
Bharat Mediratta
ab880120e6 The G2 import sets the sort_order to "asc"/"desc" but 
Item_Model::get_position() expects "DESC".  This breaks navigation in
any album imported from G2 that has a descending sort order.

Two things:
1) Use "ASC"/"DESC" in G2 import for consistency
2) Make Item_Model::get_position() more robust against capitalization

Fixes ticket #1334.
 2010-09-07 21:04:38 -07:00
Bharat Mediratta
2f94dfc67c Add "Options +FollowSymLinks" to the example mod_rewrite rules and put 
it in a textarea for easy copying.
 2010-09-06 19:40:36 -07:00
Bharat Mediratta
3707d4e94f Properly identify the base G2 url when G2 isn't using the rewrite 
module.  Fixes ticket #1322.
 2010-08-29 21:50:25 -07:00
Bharat Mediratta
e881693798 Remember which comments we imported and don't import them a second 
time.  Fixes ticket #1282.
 2010-08-29 21:29:40 -07:00
Bharat Mediratta
fcd4f77bb4 Reformat comment. 2010-08-29 21:26:25 -07:00
Bharat Mediratta
2c717b18d3 Don't concatenate two strings together as an argument for t() or t2(); 
the l10n_scanner cannot parse it properly and drops those from the
localization list.  Fixes ticket #1284.
 2010-08-29 20:04:02 -07:00
Bharat Mediratta
639d31a2c1 If the imported item from Gallery 2 has a preferred derivative with a 
rotation, then rotate the imported image accordingly.  Fixes ticket #1274..
 2010-08-08 21:17:16 -07:00
Bharat Mediratta
e85b345eda Visually separate the G2 comment's subject and body when we blend them 
into the G3 comment body.  Fixes ticket #1269.
 2010-08-08 17:10:00 -07:00
Bharat Mediratta
cdb6306d7e Backdate the created/updated dates for imported comments. Fixes ticket #1215. 2010-08-08 16:50:02 -07:00
Bharat Mediratta
a22cf8cf1c Handle "1" as a default order direction in G2. Why would we ever do that? Dunno. 
Fixes ticket #1276.
 2010-08-08 10:14:29 -07:00
Bharat Mediratta
addbd6fb81 Fix ticket #1253 where the maintenance page bombs if you have already 
configured your Gallery 2 import but you move your Gallery 3.
 2010-07-26 21:38:40 -07:00
Bharat Mediratta
3feb561054 Internationalize the "Gallery 2 path saved." message and remove the trailing period. Fixes ticket #1171. 2010-07-03 11:40:56 -07:00
Bharat Mediratta
2025c2c37d If the G2 orderBy or orderDirection fields are blank, use the G2 defaults. 
Second half of fix for #1054.
 2010-06-16 15:53:07 -07:00
Bharat Mediratta
8d1c6887a5 Fix a bug introduced in 1077477a90 where 
we don't generate album highlights correctly.  Possible fix for #1054.
 2010-06-16 15:12:00 -07:00
Bharat Mediratta
179161d05e Fix two bugs: 
#1161: guest comments get dropped because of a missing email address.
#1075: G2 comments with " get turned into "
 2010-06-16 15:07:13 -07:00
Bharat Mediratta
b2afba1db1 The fact that we have a path to a G2 embed file doesn't mean that it's still 
valid so check to see that it's ok before proceeding.  This should resolve #458.
 2010-06-15 09:14:10 -07:00
ckieffer
f1076590f1 Add page_title to admin views. Closes #1038. 2010-04-30 00:08:37 -06:00
Bharat Mediratta
7f175ea87e Move G2_Import_Exception into libraries because it's not a helper class. 2010-03-30 13:18:05 -07:00
Bharat Mediratta
ea43c5f06f Merge branch 'master' of github.com:gallery/gallery3 2010-03-28 21:04:44 -07:00
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
109c390f25 Ignore fetchItemViewCount errors during import and default to 0. The error is still logged to the G3 syslog. 2010-03-02 13:53:09 -08:00
Andy Staudacher
1077477a90 G2 importer stability improvements: 
- Log which validation rule was violated if there's an ORM validation error.
 - Add more try / catch blocks to avoid abortion where possible.
 2010-02-28 19:29:41 -08:00
Bharat Mediratta
2eea7b874a Specify the type for movie Item_Models correctly. Fixes ticket #1033. 2010-02-23 21:08:52 -08:00
Bharat Mediratta
ce39dc768c Normalize invalid/missing G2 email addresses 2010-02-22 21:21:04 -08:00
Bharat Mediratta
a9f8b94793 Fix cut/paste typo 2010-02-22 21:08:59 -08:00
Bharat Mediratta
6a40e0a341 Revise the "review your permission" text to my liking. 2010-02-09 16:04:36 -08:00
Andy Staudacher
c0a598417c Change access::can to access::required in g2 redirect, to please the controller auth code audit test. 2010-02-09 13:54:14 -08:00
Andy Staudacher
157872434d Import hashed passwords from G2 (which will only work if they're PasswordHash passwords, not if they're G2 style md5 / salted md5). 2010-02-09 13:41:35 -08:00
Andy Staudacher
dcee225935 Better handling of G2's multi level sort order in g2_import 2010-02-09 10:17:48 -08:00
Andy Staudacher
55d1ce7fb7 More g2_import model validation fixes, and make import less noisy (don't copy each comment text to the import log). 2010-02-09 01:51:04 -08:00
Andy Staudacher
42bc127925 Fix g2_import bugs related to item and user model validation. 2010-02-09 00:46:09 -08:00
Andy Staudacher
bca3eeb923 Import G2 permissions in the import process. Ignores user and item specific permissions. 2010-02-07 21:39:26 -08:00
Andy Staudacher
a6170dc065 Fix maintenance view for the case when g2_import is configured and the user replaced the original g2 directory with the .htaccess file only. 2010-02-06 18:37:25 -08:00
Andy Staudacher
7232b6c026 Fixing G2 url mapping for G2 default style URLs (where ShowItem and DownloadItem URLs aren't rewritten in G2). 
Note: For a perfect solution, we should add 2 map entries for each of G2's ShowItem and DownloadItem URLs, one for short and one for long style URLs.
E.g. A G2 installation might have been using short style URLs not for its complete lifetime. And long style URLs are supposed to work in G2 even when short style URLs are enabled (and its used that way in bbcode / as a way to get permenant, id based URLs from G2).
 2010-02-06 16:29:51 -08:00
Andy Staudacher
33b39efb49 Add core.DownloadItem redirect for G2's Photo and Movie items (was previously omitted, but we already had core.DownloadItem redirects for derivatives) 2010-02-06 15:46:13 -08:00
Andy Staudacher
d069155228 Fix g2 redirects for non-admins. The g2 URL mapping controller was accidentally declared as admin controller. 
(The previous attempt to fix this isn't a bad change either, thus keeping the external permenant redirect).
 2010-02-06 15:08:10 -08:00
Andy Staudacher
e092405fdf Fix g2 redirect to use external redirect (and declare it as permanent). 
Redirects weren't working for me in Firefox 3.5 when not signed into G3 (and all items are public).
 2010-02-06 14:59:28 -08:00
Andy Staudacher
d8d1155615 Fix maintenance view, which was broken when the g2_import module was installed but not configured correctly. 2010-02-06 14:20:19 -08:00
Andy Staudacher
9bede5763a Fix g2_import admin screen: It wouldn't work if it didn't know the location of G2 yet. 2010-02-06 13:15:02 -08:00
Tim Almdal
aa2e4de024 Corrected copy paste errors in g2_import task. Fixes ticket #949. 2010-02-01 22:55:47 -08:00
Bharat Mediratta
c050acf30a Fix lots of warnings that pop up when we're in E_STRICT mode. They're 
mostly issues around uninitialized variables, calling non-static
functions in a static context, calling Session functions directly
instead of on its singleton, passing non-variables by reference, and
subclasses not using the same interface as the parent class.
 2010-01-31 16:07:41 -08:00
Bharat Mediratta
844d40a759 Oops, forgot to bump the version to 2 in install(). 2010-01-29 14:12:07 -08:00
Bharat Mediratta
4b32a71afc Convert back to using ORM::factory(..., $id) instead of calling where(). 2010-01-27 22:34:11 -08:00
Bharat Mediratta
cfbbf9ef60 Convert __toString() to use (string) cast instead. 2010-01-27 21:58:06 -08:00
Bharat Mediratta
a4519c6dce Updated for model based validation. 2010-01-24 14:03:36 -08:00
Bharat Mediratta
b3023493f4 Clean the G2 base url so that we can't leak XSS vulnerabilities that 
way (highly unlikely, but now it's impossible).
 2010-01-02 14:00:00 -08:00