1
0
Commit Graph

1032 Commits

Author SHA1 Message Date
Tim Almdal
b3d25ac9d2 remove the gallery.common.css file and merge its contents with the browny_wind and browny_admin_wind screen.css files. 2010-09-15 21:00:04 -07:00
Tim Almdal
a9d0507ce3 Change the theme generator so that the screen.css that it generates matches the content of the admin_wind/css/screen.css and wind/css/screen.css files. 2010-09-15 20:15:50 -07:00
Thomas Bleher
f0758bb35c kbd_nav: disable navigation shortcuts when any dialog is open
Without this, it becomes impossible to move the cursor inside a text field
(for example when editing the tags of an image).
2010-09-16 08:57:52 +08:00
Tim Almdal
e4c5e79b7c Add a .gitignore so that local_config.php is ignored by git. Also add a readme that describes the contents of local_config.php file. Patches #1366. 2010-09-12 11:25:12 -07:00
Tim Almdal
ca107543dd Add support for theming the tag cloud. Includes fix for #1140. 2010-09-12 11:00:29 -07:00
Tim Almdal
94c3a5bd63 Provide a new permission screen that uses the jquery sprites as the icons. At some point will look to merge this permission screen into core. 2010-09-11 14:44:08 -07:00
Tim Almdal
ff0afc9e47 synchronize the fix-ie.css with the version in wind. 2010-09-11 14:42:39 -07:00
Tim Almdal
3919ca1206 Merge branch 'master' into talmdal 2010-09-11 12:19:09 -07:00
root
6e5e05755c Add keyboard navigation module from http://photo.dragonsoft.us/clickcount/click.php?id=9 2010-09-11 17:33:08 +08:00
hukoeth
4fe8e21836 Disable notification when converting tag to user annotations, added option to converter to allow deletion and/or removal of tag after conversion 2010-09-11 17:32:58 +08:00
hukoeth
daf1d8a66c Fixed typo in admin area
Added option to hide the user cloud for guests
Don't send notification mail on new comment when notification module is active and user is watching item
2010-09-11 16:11:07 +08:00
hukoeth
b7ee10fce4 Version 4 RC: Implemented user search, minified JavaScript 2010-09-11 16:11:07 +08:00
hukoeth
3c7d2c5218 Small bugfix in annotation form fixed 2010-09-11 16:11:06 +08:00
hukoeth
de68eb78e6 Added user sidebar block, Replaced user dropdown field with ajax input field, added some error handling
@todo: user sidebar block displays 30 users maximum and only users with annotations associated with them, add a search field allowing to search for all other users
2010-09-11 16:11:04 +08:00
Tim Almdal
3334623f03 Merge branch 'master' into talmdal 2010-09-09 21:42:40 -07:00
Tim Almdal
b8306c57de add the organize styles to the site screen so that the organize dialog takes on the appropriate styling when the theme is generated. 2010-09-09 20:41:18 -07:00
Tim Almdal
e4e303687d Add a zip wrapper which uses the php zlib module. This is the backup plan if the zip module is not installed. 2010-09-09 20:39:50 -07:00
Bharat Mediratta
321b163844 Update identity API to match change in http://bit.ly/bVursD 2010-09-06 23:02:57 -07:00
Bharat Mediratta
b7deaa471b Merge branch 'master' of git://github.com/Glooper/gallery3-contrib 2010-09-06 20:49:04 -07:00
hukoeth
862729855f Fix installer bug 2010-09-06 20:46:02 -07:00
hukoeth
dfe754d373 Version 4 beta 2: Added admin option to customize the notification mails sent to users, bugfixes, code cleanup 2010-09-06 20:45:58 -07:00
hukoeth
55d9bc4986 Version 4 beta 1:
- Implemented user notification (I need testers for this since for some reason my server is not sending mails with PHPs mail-function so I couldn't test)
- Users can decide if they want to receive notifications by editing their profile
- Admin can decide if notifications is switched on by default for new users and users who have not saved this setting
- Guest user is now hidden when adding an annotation
- Added admin option allowing to convert a user annotation to a tag or note annotation when deleting a user
- Added admin option to remove orphaned annotations
- Fixed borders not showing when hovering over an annotation area when having borders switched off on photo hover
- Fixed issue on user page where sometime only one photo would be shown x-times
- Fixed pagination on user profile pages
2010-09-06 20:45:54 -07:00
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
mamouneyya
bfba13f19d merge with latest Wind theme updates 2010-09-04 12:19:24 +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
Bharat Mediratta
e06dd57c9f Revert "Updated the browny admin theme to support the theme options as tabs."
This reverts commit d157ab750c.

Reverted at mamouneyya's request
2010-09-02 17:14:29 -07: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
mamouneyya
b427805a69 Merge remote branch 'gallery3-contrib/master' 2010-08-30 03:55:28 +08: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
8cf229ee72 Update greydragon to the latest as of Aug-28 2010-08-28 21:42:35 -07: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