From 5025929d76172efd6dd3a7b0f4da7611a3df9391 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 15 Jul 2011 15:25:15 -0600 Subject: Fixed conflicted changelog. --- user_guide/changelog.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'user_guide/changelog.html') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index c1ee37fc5..95270febc 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -84,6 +84,8 @@ Change Log
  • Libraries
    • -- cgit v1.2.3-24-g4f1b From e0df07950b101316c07ccec882ae00f930bca0c6 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Fri, 22 Jul 2011 16:11:34 -0600 Subject: Fixed conflict in changelog. --- user_guide/changelog.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'user_guide/changelog.html') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 95270febc..81307fe0b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -86,6 +86,8 @@ Change Log
  • Altered Session to use a longer match against the user_agent string. See upgrade notes if using database sessions.
  • Added is_unique to the Form Validation library.
  • Added $this->db->set_dbprefix() to the Database Driver.
    • +
  • Changed $this->cart->insert() in the Cart Library to return the Row ID if a single item was inserted successfully.
    • +
  • Added $this->load->get_var() to the Loader library to retrieve global vars set with $this->load->view() and $this->load->vars().
    • -- cgit v1.2.3-24-g4f1b From e9ebe463e42d4ab7f7d29f85c87b3f24004a64b8 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Sat, 13 Aug 2011 11:23:04 -0600 Subject: Added note for fixed issue #199 in changelog. --- user_guide/changelog.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'user_guide/changelog.html') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 81307fe0b..d2654c44b 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -73,7 +73,7 @@ Change Log
  • Added Session Class userdata to the output profiler. Additionally, added a show/hide toggle on HTTP Headers, Session Data and Config Variables.
  • Removed internal usage of the EXT constant.
  • Visual updates to the welcome_message view file and default error templates. Thanks to danijelb for the pull request.
    • -
  • Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch.
    • +
  • Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch.
  • Helpers @@ -100,6 +100,7 @@ Change Log
  • Fixed a bug (Reactor #231) where Sessions Library database table example SQL did not contain an index on last_activity. See Upgrade Notes.
  • Fixed a bug (Reactor #229) where the Sessions Library example SQL in the documentation contained incorrect SQL.
  • Fixed a bug (Core #340) where when passing in the second parameter to $this->db->select(), column names in subsequent queries would not be properly escaped.
    • +
  • Fixed issue #199 - Attributes passed as string does not include a space between it and the opening tag.

    • Version 2.0.2

    -- cgit v1.2.3-24-g4f1b From 32ad584b25b6429b2e4ce2f38177e88a12f2b117 Mon Sep 17 00:00:00 2001 From: Adam Jackett Date: Sat, 23 Jul 2011 14:35:47 -0400 Subject: Added having() fix to changelog. --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide/changelog.html') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index d2654c44b..7779a690d 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -88,6 +88,7 @@ Change Log
  • Added $this->db->set_dbprefix() to the Database Driver.
  • Changed $this->cart->insert() in the Cart Library to return the Row ID if a single item was inserted successfully.
  • Added $this->load->get_var() to the Loader library to retrieve global vars set with $this->load->view() and $this->load->vars().
    • +
  • Changed $this->db->having() to insert quotes using escape() rather than escape_str().
    • -- cgit v1.2.3-24-g4f1b From 090eb6075eac3a16974f6baed236875ee1dc8a90 Mon Sep 17 00:00:00 2001 From: Adam Jackett Date: Sat, 23 Jul 2011 11:53:02 -0400 Subject: Merge changelog. --- user_guide/changelog.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'user_guide/changelog.html') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 7779a690d..f5eb53aa3 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -102,6 +102,8 @@ Change Log
  • Fixed a bug (Reactor #229) where the Sessions Library example SQL in the documentation contained incorrect SQL.
  • Fixed a bug (Core #340) where when passing in the second parameter to $this->db->select(), column names in subsequent queries would not be properly escaped.
  • Fixed issue #199 - Attributes passed as string does not include a space between it and the opening tag.
    • +
  • Fixed a bug where the method $this->cart->total_items() from Cart Library now returns the sum of the quantity of all items in the cart instead of your total count.
    • +
  • Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.

    • Version 2.0.2

    -- cgit v1.2.3-24-g4f1b From 76e621786007907192c3e84cbde3e1a12dbf83fb Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Tue, 9 Aug 2011 16:03:49 -0600 Subject: Fixed conflict in changelog. --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide/changelog.html') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index f5eb53aa3..e6c1425af 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -104,6 +104,7 @@ Change Log
  • Fixed issue #199 - Attributes passed as string does not include a space between it and the opening tag.
  • Fixed a bug where the method $this->cart->total_items() from Cart Library now returns the sum of the quantity of all items in the cart instead of your total count.
  • Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.
    • +
  • Fixed a bug where using $this->db->select_max(), $this->db->select_min(), etc could throw notices. Thanks to w43l for the patch.

    • Version 2.0.2

    -- cgit v1.2.3-24-g4f1b From fe1d45a023b08753f4c5f1d908d54ae842277558 Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Sat, 13 Aug 2011 11:06:57 -0600 Subject: Fixed conflicts. --- user_guide/changelog.html | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide/changelog.html') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index e6c1425af..9bebb7044 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -105,6 +105,7 @@ Change Log
  • Fixed a bug where the method $this->cart->total_items() from Cart Library now returns the sum of the quantity of all items in the cart instead of your total count.
  • Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.
  • Fixed a bug where using $this->db->select_max(), $this->db->select_min(), etc could throw notices. Thanks to w43l for the patch.
    • +
  • Replace checks for STDIN with php_sapi_name() == 'cli' which on the whole is more reliable. This should get parameters in crontab working.

    • Version 2.0.2

    -- cgit v1.2.3-24-g4f1b From dd9b763ef18808637680237d78d8698799ccf8fa Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Wed, 10 Aug 2011 09:00:13 -0600 Subject: Fixed conflicts. --- user_guide/changelog.html | 2 ++ 1 file changed, 2 insertions(+) (limited to 'user_guide/changelog.html') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 9bebb7044..783c9d3d1 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -74,6 +74,8 @@ Change Log
  • Removed internal usage of the EXT constant.
  • Visual updates to the welcome_message view file and default error templates. Thanks to danijelb for the pull request.
  • Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch.
    • +
  • Added "application/x-csv" to mimes.php.
    • +
  • Helpers -- cgit v1.2.3-24-g4f1b From 9d887b32a1fe998cbb0307a5e678ac3ba5076a1e Mon Sep 17 00:00:00 2001 From: Phil Sturgeon Date: Wed, 10 Aug 2011 08:06:37 -0600 Subject: Fixed conflicts in changelog. --- user_guide/changelog.html | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'user_guide/changelog.html') diff --git a/user_guide/changelog.html b/user_guide/changelog.html index 783c9d3d1..5d5767b74 100644 --- a/user_guide/changelog.html +++ b/user_guide/changelog.html @@ -75,7 +75,7 @@ Change Log
  • Visual updates to the welcome_message view file and default error templates. Thanks to danijelb for the pull request.
  • Added insert_batch() function to the PostgreSQL database driver. Thanks to epallerols for the patch.
  • Added "application/x-csv" to mimes.php.
    • - +
  • Fixed a bug where Email library attachments with a "." in the name would using invalid MIME-types.
  • Helpers @@ -105,9 +105,15 @@ Change Log
  • Fixed a bug (Core #340) where when passing in the second parameter to $this->db->select(), column names in subsequent queries would not be properly escaped.
  • Fixed issue #199 - Attributes passed as string does not include a space between it and the opening tag.
  • Fixed a bug where the method $this->cart->total_items() from Cart Library now returns the sum of the quantity of all items in the cart instead of your total count.
    • +<<<<<<< HEAD
  • Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.
  • Fixed a bug where using $this->db->select_max(), $this->db->select_min(), etc could throw notices. Thanks to w43l for the patch.
  • Replace checks for STDIN with php_sapi_name() == 'cli' which on the whole is more reliable. This should get parameters in crontab working.
    • +======= +
  • Fixed a bug where not setting 'null' when adding fields in db_forge for mysql and mysqli drivers would default to NULL instead of NOT NULL as the docs suggest.
    • +
  • Fixed a bug where using $this->db->select_max(), $this->db->select_min(), etc could throw notices. Thanks to w43l for the patch.
    • +
  • Fixed a bug where Email library attachments with a "." in the name would using invalid MIME-types.
    • +>>>>>>> 0aaf42b... Fixed a bug where Email library attachments with a . in the name would using invalid MIME-types.

    Version 2.0.2

    -- cgit v1.2.3-24-g4f1b