Ben Smith
964d67f878
Merge branch 'master' of git@github.com:gallery/gallery3-contrib.git
...
Conflicts:
modules/basket/controllers/admin_configure.php
modules/basket/controllers/admin_postage_bands.php
modules/basket/controllers/admin_product_lines.php
modules/basket/controllers/basket.php
modules/basket/helpers/basket.php
modules/basket/helpers/basket_event.php
modules/basket/helpers/basket_installer.php
modules/basket/helpers/postage_band.php
modules/basket/helpers/product.php
modules/basket/views/add_to_basket.html.php
modules/basket/views/admin_configure.html.php
modules/basket/views/admin_postage_bands.html.php
modules/basket/views/admin_product_lines.html.php
modules/basket/views/basket.html.php
modules/basket/views/checkout.html.php
modules/basket/views/confirm_order.html.php
modules/basket/views/order_complete.html.php
modules/basket/views/view_basket.html.php
modules/favourites/controllers/favourites.php
modules/gwtorganise/controllers/json_album.php
modules/user_homes/helpers/user_homes_event.php
2010-09-03 19:37:38 +12:00
Bharat Mediratta
8eec328a06
Change json::reply calls to use "html" instead of "form" and not JSON
...
encode HTML payloads when we don't need to.
This is follow on for:
7607e1f932
2010-07-31 21:32:59 -07:00
Tim Almdal
43c53845db
Convert the gwtorganize module to the new json::reply helper.
2010-07-26 10:55:20 -07:00
Ben Smith
f10820ab49
Added a build version
2010-06-20 10:04:46 -07:00
Bharat Mediratta
5173395bbd
Revert "Added a build version"
...
This reverts commit 842fd2c66f
2010-06-20 10:04:18 -07:00
Ben Smith
842fd2c66f
Added a build version
2010-06-20 10:03:40 -07:00
Ben Smith
cf01231d65
Added a build version
2010-04-18 10:42:58 +12:00
Bharat Mediratta
214b362f29
Merge branch 'master' of git://github.com/Glooper/gallery3-contrib
...
Conflicts:
modules/gwtorganise/controllers/json_album.php
2010-03-06 20:36:53 -08:00
Bharat Mediratta
5f65d082f9
Update the copyright to 2010.
2010-03-03 10:16:08 -08:00
Ben Smith
7d5244dcbb
A few fixes for RC1.
2010-02-26 09:55:09 +13:00
Bharat Mediratta
8bd90d145d
Merge branch 'master' into bharat_dev
2010-01-27 09:29:29 -08:00
Bharat Mediratta
f7a539c0e6
Merge branch 'master' of git://github.com/Glooper/gallery3-contrib
...
Conflicts:
modules/gwtorganise/controllers/json_album.php
2010-01-27 09:26:45 -08:00
Bharat Mediratta
db6b1f9042
Updated for model based validation, but not tested.
2010-01-25 22:29:38 -08:00
Ben Smith
bb81dd694d
Updated to latest G3 experimental.
...
Added drag and drop from desktop.
Added ability to resize before upload / including resize options
Added Thumbnails when uploading.
Moved to latest GWT so some speed improvements
2010-01-26 17:00:01 +13:00
Tim Almdal
7380d7bc76
1) Call identity::active_user instead of user::active()
...
2) The where clause needs to be passed as array of arrays when filtering for albums.
2010-01-17 09:27:48 -08:00
Tim Almdal
9a96a37681
Another 2.4 migration-ism. Need to pass the where clause in an appropriate format. array(fieldname, operator, value);
2010-01-14 13:41:40 -08:00
Tim Almdal
4923164626
Change the offset from zero to null on the item->find_all call. Changed with K2.4
2010-01-12 10:49:58 -08:00
Bharat Mediratta
90ef5daa49
Update some database calls.
2009-12-25 13:25:36 -08:00
Ben Smith
7b6ad2ebcf
initially added files and eclipse project.
2009-09-28 14:09:12 +13:00
