Commit Graph

185 Commits

Author SHA1 Message Date
Bharat Mediratta
5040adebb5 Totally revamp the G2 Import UI to make it sexxxy. Fixes #1683. 2011-04-22 16:30:37 -07:00
colings
ca47b887f5 Added extra arg to gallery_graphics calls and updated users 2011-02-23 20:31:07 -06:00
Bharat Mediratta
423daa52d5 Update copyright to 2011. 2011-01-21 23:01:06 -08:00
Joe7
e86e8b8bd1 Added missing spaces (manual merging from 0d36b97aca3b5ed53ea3ea398ce28b0f6198e577) 2011-01-07 17:53:37 +01:00
Joe7
5bfb7fb96a Added batch importer for groups
Added missing ordering for comments and tags retrieving queries
(One might gets the same output without ordering especially if column is the primary key, but the only way to go for sure it by setting it)
2011-01-07 17:52:12 +01:00
Joe7
c338d3138e Importing Gallery2 users in batches
Fixes Ticket #1554
2011-01-07 17:51:21 +01:00
Joe7
f2477703fa Fix against ticket #1581 - based on 0d36b97aca 2011-01-07 17:33:37 +01:00
Bharat Mediratta
a36c894c63 Fix g2_import::g2_url() to only replace the $g2_base_url once at the
beginning of the url string.  Also, only do this when we're about to
put it into the map, not when we're getting the g2 url else the url is
mangled for other purposes.  Fixes #1512.
2010-11-28 17:01:51 -08:00
Bharat Mediratta
f0781a9162 Add an extra line break after the RewriteBase line so that the
RewriteBase and RewriteRule lines don't get merged in the resulting
textarea.  Fixes #1481.
2010-11-09 09:17:13 -08:00
Bharat Mediratta
35d933cf7f Dump something in the logs if GalleryEmbed::init() fails. 2010-11-08 10:06:56 -08:00
Bharat Mediratta
dff1a53696 All modules should be named Xxx_Core for extensibility. Fixes #1458. 2010-10-25 21:05:31 -07:00
Bharat Mediratta
a1b1d323af When looking for G2 urls in the g2_map, try also swapping spaces for +
in case the url had spaces in it.  Fixes ticket #1388.
2010-09-18 16:46:15 -07:00
Bharat Mediratta
6bb75f623e Fix a bug in that last commit where I was treating resource_type as a function. 2010-09-18 16:34:48 -07:00
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