Commit Graph

135 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
0be0111b74 Remove an obsolete todo. 2010-01-01 22:11:08 -08:00
Bharat Mediratta
6d5d68a3f9 Start tracking the original G2 url and id for all entities. This will
allow us to map G2 image urls to the appropriate G3 ones.
2010-01-01 17:41:20 -08:00
Bharat Mediratta
b16ab9d94a Don't treat objects like strings. 2009-12-24 03:08:06 -08:00
Bharat Mediratta
2ff84b092d Update database query. 2009-12-06 21:35:04 -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
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
57adefc5ba Revert "Create theme::get_var(), theme::set_var() methods to set the options of the active site theme. Change all refrences to theme options to use these methods. Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme."
This reverts commit 26114972c3.
2009-11-19 11:44:01 -08:00
Tim Almdal
4db92d53b0 Revert "Make sure that calls to the theme::get_var() have sane defaults in the event that the theme does not supply them."
This reverts commit 51f2b54767.
2009-11-19 11:43:44 -08:00
Tim Almdal
51f2b54767 Make sure that calls to the theme::get_var() have sane defaults in the event that the theme does not supply them. 2009-11-19 08:48:23 -08:00
Tim Almdal
26114972c3 Create theme::get_var(), theme::set_var() methods to set the options of the active site theme. Change all refrences to theme options to use these methods. Update the version number of Gallery to 20 and move any them related options to the be stored under the active theme. 2009-11-18 15:36:13 -08:00
Bharat Mediratta
595e03b556 Get rid of "skipping" messages because they're overly verbose if you resume an import. This fixes ticket #856. 2009-11-03 13:28:04 -08:00
Tim Almdal
7ea13b3869 Normalize capitalization ticket #596 2009-10-28 12:15:52 -07:00
Tim Almdal
6fb116c53b Merge branch 'master' into talmdal_dev 2009-10-26 06:24:51 -07:00
Chad Kieffer
a5d2af336a Move g2_import styles from the theme to the module. 2009-10-25 16:51:24 -06: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
b528fbde57 Change this files to use the API instead of referencing the group tables directly 2009-10-21 11:50:42 -07:00