Commit Graph

105 Commits

Author SHA1 Message Date
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
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
Chad Kieffer
048e540a98 Fixed previous over zealous find and replace. 2009-10-04 15:44:24 -06: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
Andy Staudacher
b9bd1681a3 Update all code to use helper method html::clean(), html::purify(), ... instead of SafeString directly. 2009-08-29 22:54:20 -07:00
Andy Staudacher
a5dfc81a8f Merge commit 'upstream/master'
Conflicts:

	modules/akismet/views/admin_akismet.html.php
	modules/comment/helpers/comment_rss.php
	modules/gallery/helpers/gallery_rss.php
	modules/gallery/libraries/I18n.php
	modules/gallery/views/permissions_browse.html.php
	modules/gallery/views/simple_uploader.html.php
	modules/info/views/info_block.html.php
	modules/organize/controllers/organize.php
	modules/organize/views/organize.html.php
	modules/organize/views/organize_album.html.php
	themes/default/views/album.html.php
	themes/default/views/movie.html.php
	themes/default/views/photo.html.php
2009-08-29 14:17:48 -07:00
Andy Staudacher
c01ac42c46 Refactor all calls of p::clean() to SafeString::of() and p::purify() to SafeString::purify().
Removing any p::clean() calls for arguments to t() and t2() since their args are wrapped in a SafeString anyway.
2009-08-29 12:48:40 -07:00
Bharat Mediratta
4828db003f Remove 'ENGINE=InnoDB' specification from tables that we create. Use
the system's default table specification.  Fixes ticket #597.
2009-08-27 15:47:54 -07:00
Bharat Mediratta
1e90e40d3a Use events to generate menus, instead of having xxx_menu helpers.
This is the first step towards having a simple, lightweight and
unified API for module interaction.
2009-07-28 13:47:22 -07:00
Tim Almdal
ecc9203c23 Standardize the specification of tags.
With this patch a comma(,) is the only valid tag separator.  Spaces
are allowed in tags and phrases no longer need to be specified with a
dot.

Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-07-28 06:28:31 +08:00
Bharat Mediratta
3b7855010f Reduce import logging to errors only to reduce the size of the logs.
Excessive logging results in a very slow import.
2009-07-18 16:07:28 -07:00
Bharat Mediratta
5b3b675b6d Non-trivial changes to the event handling code:
1) The item_updated event no longer takes the old and new items.
   Instead we overload ORM to track the original data and make
   that available via the item.  This will allow us to move event
   publishing down into the API methods which in turn will give us
   more stability since we won't require each controller to remember
   to do it.

2) ORM class now tracks the original values.  It doesn't track
   the original relationships (no need for that, yet)

3) Added new events:
     item_deleted
     group_deleted
     user_deleted
2009-07-16 11:19:34 -07:00
Bharat Mediratta
7de339a676 Remove extra debug statements. 2009-07-14 16:10:37 -07:00
Tim Almdal
67d78e8d58 Correct the pattern match to compress multiple spaces into a single
dot.
2009-07-09 21:41:59 -07:00
Tim Almdal
512f22a600 Change the tag importer to convert spaces to a dot in multi word tags. 2009-07-09 17:18:58 -07:00
Tim Almdal
72ebc2fb34 Merge branch 'master' of git@github.com:gallery/gallery3
Conflicts:
	modules/g2_import/helpers/g2_import.php
2009-07-07 12:17:38 -07:00
Tim Almdal
b0cd0a52be Allow the task::log method to take an array of lines and change g2_import.php
helper to use this approach.
2009-07-07 12:10:50 -07:00
Bharat Mediratta
4e0848a1a5 Clean up some indentation. 2009-07-07 11:22:13 -07:00
Tim Almdal
b59e94e7dc Change references to Gallery 2 and Gallery 3 to consistently refer to
Gallery n as opposed any variants of this.
2009-07-07 07:32:36 -07:00
Tim Almdal
6588f3bbd1 Change wording of failed to import tags to make it consistent with the other failed import messages. Thanks shai 2009-07-06 21:46:50 -07:00
Tim Almdal
dfc704516a correct spacing in a message. thanks shai 2009-07-06 21:10:59 -07:00
Tim Almdal
dff0ffc4f5 Fix for tickets #312 and #370. Added a task logging api. Changed g2_import
to write all activity to the "log file".  The "log file" is stored in the
persistent cache.
2009-07-06 20:05:35 -07:00
Tim Almdal
85de208879 Lets try the BBCode conversion again... go with basic tags even if some are
deprecated.
2009-07-04 20:30:13 -07:00
Tim Almdal
50462edd9c Change the BBCode Transformation to use the <span class=""> where possible 2009-07-04 17:14:21 -07:00
Tim Almdal
799d82fd6a Revert "Change the bbcode transformation to more standard tags that can be"
This reverts commit 4ba022438e.
2009-07-04 17:01:47 -07:00
Tim Almdal
4ba022438e Change the bbcode transformation to more standard tags that can be
easily style via css
2009-07-04 16:18:48 -07:00
Tim Almdal
cf279fc315 Fix for #364 = G2 Import Doesn't support markup
Create a _transform_bbcode which coverts the g2 bbcode to html.
The html won't be rendered until ticket #400 is implemented as
pclean() excapse the html
2009-07-03 08:14:28 -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
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
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
7bc40fd315 Start of fixing a problem with importing movies w/o a thumbnail 2009-07-01 23:14:01 -07:00