1
0
Commit Graph

695 Commits

Author SHA1 Message Date
hukoeth
44533159e5 Version 3 beta 2: Added new options how to display the annotation areas, UI improvements, user profile now displays images of user, bugfixes 2010-09-06 20:45:50 -07:00
Bharat Mediratta
b92e0ee162 Merge branch 'master' of github.com:gallery/gallery3-contrib 2010-09-06 18:24:54 -07:00
Bharat Mediratta
1019f6c86f New User Albums module that creates a personal, editable album any
time a new user is created.
2010-09-06 18:24:25 -07:00
Bharat Mediratta
cdb32e8c12 Update identity API to match change in http://bit.ly/bVursD 2010-09-06 18:22:40 -07:00
dmolavi
d216ae83b7 Updated module version to reflect added Exif update capability. Also update copyright year on one of my ecard files. 2010-09-04 12:19:52 +08:00
Ben Smith
de7433a3bb fixed a problem with delete products and postage bands 2010-09-04 07:45:00 +12:00
hukoeth
b9309e86c7 - Version 3 beta 1
- Added possibility to attach users to annotations
- Moved the legend to resize_bottom
- Hovering over the legend will highlight the corresponding annotation
- Some UI improvements
- User profile page shows the images associated with the user (not fully functional yet)
2010-09-04 00:36:47 +08:00
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
hukoeth
cec1f5835b Hide form when dragging and resizing annotation area, minor UI improvements 2010-09-02 10:17:15 +08:00
hukoeth
53872ea129 - Version 2
- Implemented tag handling (tags can now be added while creating the face)
- When entering a tag the notes field is cleared and vice versa to avoid confusion
- Cancel confirmation dialog now uses jquery dialog
- Added helpers/photoannotation.php by tkott for XMP compatibility
- Fixed RTL positioning
- Fixed bug deleting annotations with the same tag
- Fixed annotation form positioning
2010-09-02 10:17:14 +08:00
hukoeth
b29606f840 - Fixed incorrect redirect when installed not in webroot and mod_rewrite is enabled
- Hopefully fixed video page bug
- Fixed re-activation bug
2010-09-02 10:17:14 +08:00
John Bowles
50975a2b83 Embed_videos: (Slightly) Smarter handling of video size 2010-09-02 10:16:40 +08:00
John Bowles
2ae81ee0e5 Embed_video: Fix code formatting 2010-09-02 10:16:40 +08:00
John Bowles
e843a28b00 Embed_videos: Add Vimeo support. 2010-09-02 10:16:39 +08:00
Bharat Mediratta
552f0c3988 Merge branch 'master' of git://github.com/bowlesjd/gallery3-contrib 2010-08-31 21:01:19 -07:00
dmolavi
a90fdc51f8 Autorotate module now updates Exif information after rotation. This
prevents external applications from re-rotating when viewing the image.
2010-09-01 09:09:11 +08:00
John Bowles
5d4bdaf2d7 Merge branch 'master' of http://github.com/gallery/gallery3-contrib 2010-08-31 13:37:52 -07:00
Ben Smith
6dfad7e9cd - Paypal IPN and order tracking. There are 3 statuses for an order
1. Awaiting Payment (red) - this will stay awaiting payment until either the admin confirms payment or paypal sends it IPN message to confirm that CC payment was successfull.
2. Payment Confirmed (green) - this means payment has been received but the item hasn't been posted. To mark as completed you will need to view the order and click "confirm order delivery"
3. completed. These aren't shown on the view orders but the order can still be viewed by typing in the order number.

- Side bar integration, Basket contents appears on the sidebar.
2010-08-30 13:09:23 +12:00
Thomas Bleher
d01599c1c1 Add IPTC module
Taken from http://gallery.menalto.com/node/95875 (file http://gallery.menalto.com/files/iptc_0.zip)
Author: gcog (I just imported it into Git unchanged)
2010-08-30 03:54:05 +08:00
Bharat Mediratta
9272744409 Merge branch 'master' of github.com:gallery/gallery3-contrib 2010-08-28 21:11:14 -07:00
hukoeth
6dfd62d012 Made module compatible with greydragon theme, fixed clicking cancel when editing annotations 2010-08-28 21:11:06 -07:00
hukoeth
20b07f9b20 Module now allows editing of annotations 2010-08-28 21:11:02 -07:00
hukoeth
92ac174dd9 Removed tagfaces interface, annotations can now be deleted on the photo,
annotations can be displayed under the photo
2010-08-28 21:10:58 -07:00
hukoeth
90ad68fcc6 Renamed modded tagfaces module to photoannotation to avoid confusion
Started working on feature to delete annotations directly
Added warning when tagfaces and photoannotation are activated at the same time
2010-08-28 21:10:52 -07:00
brentil
4f2750a0e2 Version 2.0 - 2010.08.27
Fixed: comply with translated/t("string") standards
Added: New caching system. ModuleUpdates now caches the last results so that it does not check every time the page is run. The cache expires every 30 days, when the user selects the option to Check Modules for Updates, or the cache is empty.
Added: Color coding for more cases when versions are out of sync (Orange = Your file version is newer than the installed version & Pink = Your installed version is newer than file version).
Added: Each module now links to it's location in the Gallery Codex so if your version is out of date you can go get the official version. This also allows for manual verification of DNE modules that are not in the GitHub.
Added: GitHub status check along with status check to access the internet outbound from your Gallery installation.
2010-08-29 12:10:00 +08:00
John Bowles
329799db33 Embed_videos: Moved JS to header, added DIV. Removed unused view. 2010-08-27 17:00:18 -07:00
John Bowles
78a4fbacea Embed Videos: Oops. Left out some of the regexes for youtube. 2010-08-26 23:35:22 -07:00
John Bowles
d0447f020a Clean up a few things 2010-08-26 22:57:20 -07:00
John Bowles
95b357636c Fetch title and description from Youtube API if none is provided. 2010-08-26 22:44:54 -07:00
John Bowles
30f8f02a56 Fixed controller. 2010-08-26 22:12:18 -07:00
John Bowles
c0050066ac Merge branch 'js-solution'
Conflicts:
	modules/embed_videos/controllers/embedded_videos.php
2010-08-26 22:07:07 -07:00
John Bowles
a2975fe6d7 It works! Cleaning up source and making tweaks. Will now concentrate making the input form more robust and adding support for more video sites. 2010-08-26 21:52:15 -07:00
John Bowles
a58601f640 Merge branch 'master' of github.com:bowlesjd/gallery3-contrib
Conflicts:
	modules/embed_videos/controllers/embedded_videos.php
2010-08-26 20:51:58 -07:00
John Bowles
39a07d3216 A few more changes 2010-08-26 20:47:31 -07:00
unknown
83493c95d6 Trying a new approach with DOM and jQuery 2010-08-26 22:43:41 -05:00
unknown
161c979458 Reformatting 2010-08-26 21:14:13 -05:00
John Bowles
5953556295 More refactoring. Getting closer to functional, starting to add support for other video sources. 2010-08-26 13:40:08 -07:00
John Bowles
655ce08eba Add photo template 2010-08-26 12:02:40 -05:00
John Bowles
6eaa276b54 Forgot to add files 2010-08-26 09:58:48 -07:00
John Bowles
762684e92f More refactoring 2010-08-26 09:56:37 -07:00
John Bowles
3bae079610 More refactoring work. 2010-08-26 02:38:31 -05:00
John Bowles
085d7cff74 Inital commit. Not yet in a working state, please do not pull. In the process of refactoring. 2010-08-25 21:42:01 -07:00
dmolavi
03d428f94d Initial comment of adsense module. This version
allows the user to place a single ad unit in either
the sidebar, header, or footer.
2010-08-25 12:57:37 +08:00
Bharat Mediratta
d6dc5f6b7a Update version in installer to match module.info 2010-08-22 20:47:12 -07:00
dmolavi
fda7048f5f Updated to version 3 to reflect added RECAPTCHA. 2010-08-22 20:46:39 -07:00
Bharat Mediratta
0546ad40f1 Updated to use the new captcha_protect_form event. Deleted
MY_recaptcha_event overload, it's no longer necessary.
2010-08-22 13:01:04 -07:00
dmolavi
22ac986ab0 Corrected capitalization on admin menu and added recaptcha overload to use recaptcha in the ecard form. 2010-08-23 03:50:43 +08:00
Tim Almdal
ce509f1708 Convert the permissions_form to use the jquery ui supplied sprites instead of gallery supplied icons. 2010-08-19 20:06:49 -07:00
Tim Almdal
ebfd95a8c6 Merge branch 'master' into talmdal 2010-08-18 21:49:11 -07:00
Tim Almdal
61a3dbc3f7 Store the theme definition in the theme.info file as a comment. 2010-08-18 21:48:41 -07:00
dmolavi
f2739d28f7 Initial commit of autorotate module. 2010-08-19 12:06:46 +08:00
Tim Almdal
2308b19b1e synchronize changes with the fix-ie.css in gallery3:master 2010-08-18 19:47:34 -07:00
Tim Almdal
4aa1e1ded6 Merge branch 'master' into talmdal 2010-08-18 18:53:59 -07:00
Tim Almdal
be42be32e0 Update masks to provide clear color references. 2010-08-18 18:53:19 -07:00
jim
ddb25ffd78 update README 2010-08-18 13:03:31 +08:00
jim
4009364900 adding the PAM module 2010-08-18 13:03:22 +08:00
Tim Almdal
d53e780397 Change the termination status message so it reads better. 2010-08-15 22:31:05 -07:00
Tim Almdal
c78d157ba9 Check that the zip extension is loaded, if it is use that to unzip the themeroller zip file. If its not loaded, then try using the zlib extension. If both are not available fail. 2010-08-15 22:30:36 -07:00
Tim Almdal
8e44cc55ab when the themeroller is activated, issue an error message if both the zlib or zip extensions are not installed (themeroller needs at least one of them).
Currently, only the zip extension is supported, but a future patch will support zlib."
2010-08-15 18:51:43 -07:00
Tim Almdal
752ed60890 Remove debugging statement 2010-08-15 18:51:24 -07:00
Tim Almdal
39cd511e41 Change the default display name to be more readable. 2010-08-15 18:51:14 -07:00
Tim Almdal
bf5ba3cf19 Add the generation of styles for warning messages. The themeroller themes only have info and error, so we create a warning class by average the color components (i.e. red, green and blue) between the colors used for info and error messages. 2010-08-15 18:50:52 -07:00
hukoeth
6d31beec13 Added installer. Added check for gallery core version. Some cleanup 2010-08-15 16:38:24 -07:00
hukoeth
20615273c3 - Moved save button to bottom
- Modules are now being displayed with their friendly name
- List sometimes went out of the bottom of box
- Changed some wording and removed warning since we are not using IDs anymore
2010-08-15 16:38:24 -07:00
hukoeth
9b55c39abb Code cleanup 2010-08-15 16:38:23 -07:00
hukoeth
fc22acf0b4 Modified module to use weight field in DB to order the modules instead of id requires commit d3a161ca1b 2010-08-15 16:38:22 -07:00
Tim Almdal
848e5805af Simplify the permissions dialog to make for easier generation. In this case, there is only 1 icon to click to toggle between access allowed and access denied. As well, if the permission is inherited then the icon to toggle permissions is disabled. 2010-08-13 11:28:53 -07:00
hukoeth
cd252d3928 Added installer. Added check for gallery core version. Some cleanup 2010-08-12 12:10:53 +08:00
hukoeth
ce4d3f05d2 - Moved save button to bottom
- Modules are now being displayed with their friendly name
- List sometimes went out of the bottom of box
- Changed some wording and removed warning since we are not using IDs anymore
2010-08-12 12:10:53 +08:00
Tim Almdal
513187a9d1 1) Change how duplicated themes are resolved: originally names would be generated as xxx_1_2 now its a more sane xxx_2
2) Update admin.html with the changes for ticket #1288
3) Allow color specification in the image mask names.
4) Disable the upload button once a zip archive file is selected.
2010-08-11 14:02:05 -07:00
hukoeth
40c4c4f2a4 Code cleanup 2010-08-10 21:34:42 -07:00
hukoeth
edb4f6c6f4 Modified module to use weight field in DB to order the modules instead of id requires commit d3a161ca1b 2010-08-10 21:34:33 -07:00
Tim Almdal
a21dc263cf Change the colors in the admin_screen template so that they are replaced with the themeroller colors. 2010-08-09 14:53:37 -07:00
Tim Almdal
9d3c9edc95 Get gallery images generating properly. It was always setting the color to black so it wouldn't show up properly. 2010-08-09 12:32:43 -07:00
Tim Almdal
9b92859a60 Change the masks so that there is no need to do edge detection as it turns out that ubuntu and debian don't use the bundled gd library and functions like imagefilter might not be available. This change removes the need for the imagefilter function as the masks are already in inverted color. 2010-08-09 07:05:39 -07:00
Tim Almdal
1349000336 Merge branch 'master' into talmdal 2010-08-09 06:53:34 -07:00
dmolavi
e94df5cdd0 trying to recommit the deletion of old files. 2010-08-08 15:33:21 -04:00
dmolavi
435b677141 old files no longer needed. 2010-08-08 14:27:38 -04:00
dmolavi
af883743e0 fix to only show on photo item pages. see http://bit.ly/90FxWm 2010-08-08 14:18:41 -04:00
dmolavi
8562a1abc3 commit of funtioning ecard module with post-RC2 changes. 2010-08-07 12:35:17 -07:00
Tim Almdal
011a0c0a89 Merge branch 'master' into talmdal 2010-08-06 14:44:40 -07:00
Tim Almdal
9618dc7644 Merge branch 'talmdal' of github.com:gallery/gallery3-contrib into talmdal
Conflicts:
	modules/themeroller/controllers/admin_themeroller.php
	modules/themeroller/helpers/themeroller_event.php
	modules/themeroller/views/site_screen.css.php
2010-08-06 14:43:57 -07:00
Tim Almdal
e51496abf9 Initial commit of the themeroller module. It takes an upload of the zip file produced by jqueryui.com/themeroller and generates a theme based on the color schema contained in the zip file. Still fairly experimental 2010-08-06 14:29:42 -07:00
Bharat Mediratta
0a69d925dc Sharephoto module from vallu (http://gallery.menalto.com/node/97234) 2010-08-05 11:35:23 -07:00
Bharat Mediratta
6dd078a38f Replace straight SQL with db::build() which takes care of the problem that the table name is not wrapped in curly braces so it won't get prefixed properly 2010-08-05 11:27:11 -07:00
hukoeth
da3978cc03 Fixed parsing error and hidden core and identity provider modules. 2010-08-05 11:23:28 -07:00
hukoeth
b7e991a5a5 navcarousel updated to 4.2
removed reference to a file no longer existing
made load event configurable (document.ready vs. window.load)
2010-08-05 11:23:20 -07:00
hukoeth
fa134d1313 Added moduleorder and navcarousel 2010-08-05 11:23:12 -07:00
Bharat Mediratta
d917430aec Did a pass over the ecard code. It still doesn't work, but it's a lot
closer to our regular style now.  And a fair bit simpler.

Structural
- Added an installer and moved all the default messages into it
  so that they're part of the install process.
- Got rid of the model; you don't need to add an ecard entry in
  the database to send an ecard.  You just need to send a mail.
- Renamed the form and controller methods to reflect the fact that
  we're sending an ecard, not adding an ecard to the db.
- Stopped inlining all of the code into the page like we do in
  comments, and instead put it into a dialog box with a button
  in the sidebar.  This lets us ditch the extra .js and .css and
  greatly simplifies the code.

General
- Added rules to the send_ecard form so that the validation
  code has something to chew on.
- Renamed ecard::can_ecard() to ecard::can_send_ecard() cause you
  should have a verb in there.
- Moved the can_send_ecard() check into ecard_theme::sidebar_bottom
  and out of ecards.html.php

Style cleanup
- Changed "Title Casing" to "Sentence casing" everywhere for
  consistency with our style.
- Cleaned up some indentation
- Got rid of carriage returns

LEFT TO DO:
1) Rename Ecards_Controller to Ecard_Controller for consistency (and
   put it in ecard.php)

2) Actually have it send the ecard :-)
2010-08-03 23:13:40 -07:00
Bharat Mediratta
6e38f07e9c Initial version of eCard from dmolavi, with carriage returns removed. 2010-08-03 22:45:30 -07:00
Bharat Mediratta
1c1e9ad920 Merge branch 'dialog' of github.com:gallery/gallery3-contrib into dialog 2010-08-01 10:24:10 -07:00
Bharat Mediratta
351a9d16b3 Force the respose type to be text/html to avoid the bug where the
buffering iframe doesn't know what to do with a JSON reply.

Print out an appropriate message after the upload completes.
2010-08-01 10:23:57 -07:00
Tim Almdal
1f01b0671f Merge branch 'master' into dialog 2010-08-01 08:34:04 -07: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
Bharat Mediratta
b4f2c13dcb Updated to reflect the API change in 48af5e6b5039839f93345bef92e1acf7952c50a1 2010-07-31 14:41:04 -07:00
Tim Almdal
e87c6a2832 Change the html_uploader module to use the json::reply. The json reply is not being picked up properly. 2010-07-27 21:48:28 -07:00
Tim Almdal
6e4719774f remove debugging statement 2010-07-26 11:06:47 -07:00
Tim Almdal
a8c232a752 Convert the favorites module to the new json::reply helper. **Note** this module doesn't install as it gets a ORM validation error. 2010-07-26 10:58:55 -07:00
Tim Almdal
115ae046a4 Convert the favorites module to the new json::reply helper. 2010-07-26 10:55:52 -07:00
Tim Almdal
43c53845db Convert the gwtorganize module to the new json::reply helper. 2010-07-26 10:55:20 -07:00