rWatcher
7ac7894f8f
Merge commit 'gallery3-contrib/master'
2010-06-14 15:00:30 -04:00
Tim Almdal
a66546a572
Remove duplicate event definitions and remove the '_' from the event names.
2010-06-02 08:24:54 -07:00
Tim Almdal
f658f994c9
Update the developer module so that it actually works. Derive the available
...
events by scanning the available modules. Corrected the generation of the
hidden csrf value.
2010-06-01 11:37:43 -07:00
Tim Almdal
680643c4f9
Extend the admin scheduler controller from the admin maintenance controller to pick up the existing maintenance controller functionality. Add a config/routes.php which routes all admin/maintenance requests to the admin/schedule controller.
2010-05-31 09:42:39 -07:00
Tim Almdal
0b6b5bc72b
Make the scheduler module work without any changes to the core modules. Cloned the admin_maintenace.html.php file into the scheduler module. Then the scheduler_event::admin_menu call back replaces the admin_maintenance url with its url.
2010-05-31 08:32:17 -07:00
Tim Almdal
ff982c780b
Make the scheduler module work without any changes to the core modules. Cloned the admin_maintenace.html.php file into the scheduler module. Then the scheduler_event::admin_menu call back replaces the admin_maintenance url with its url.
2010-05-31 08:30:54 -07:00
Chad Kieffer
9e3c0c0884
Add page_title to admin views. Closes #1038 .
2010-04-30 00:27:19 -06:00
Chad Kieffer
1d32548f8b
Merge branch 'master' of github.com:gallery/gallery3-contrib
2010-04-21 21:33:19 -06:00
Ben Smith
cf01231d65
Added a build version
2010-04-18 10:42:58 +12:00
Ben Smith
87df3018d9
Changed User homes to include new functionality for creating private galleries.
2010-04-18 10:40:52 +12:00
Ben Smith
e39a8084d5
Initially Added Favourites Module
2010-04-18 10:40:05 +12:00
Bharat Mediratta
8fa33819f0
Merge branch 'master' of github.com:gallery/gallery3-contrib
2010-04-10 11:20:37 -07:00
rWatcher
c2453f3990
Merge commit 'gallery3-contrib/master'
2010-04-07 18:49:07 -04:00
rWatcher
38cda8c76c
Sidebar bugfix for dynamic pages.
2010-04-07 18:48:33 -04:00
Bharat Mediratta
39bd6892a8
Move the "Fix MPTT" task into the gallery module.
2010-04-04 14:48:19 -07:00
rWatcher
bd7b614608
Merge commit 'gallery3-contrib/master'
2010-04-01 21:40:07 -04:00
rWatcher
dd59051dc8
Initial commit.
2010-04-01 21:32:23 -04:00
rWatcher
f2fe6dd2b5
Added some comments.
2010-04-01 20:59:36 -04:00
rWatcher
30a106a529
Fixed weird RTL bug.
2010-04-01 19:52:20 -04:00
Tim Almdal
199417ff77
correct a typo on the admin screen.
2010-04-01 07:52:31 -07:00
Tim Almdal
7891bdfff5
Fix for ticket #1107 .
...
1) Change the link on the register welcome dialog to use the change password form.
thanks to TAZattitude for pointing the way.
2) Address the issue that default change password form, expects the user to know
the old password. As this is the first login, they might not write down the
generated password, so when they get to form, they are screwed, as they can't
change the password w/o the old one. So we register will generate a clone
of the password change form, where the old password is supplied as a hidden
field.
2010-04-01 07:38:06 -07:00
rWatcher
d9cc8eae26
Code cleanups.
2010-03-25 21:15:16 -04:00
rWatcher
aefa0cf848
Added a maximum auto-zoom level parameter.
2010-03-25 20:48:40 -04:00
rWatcher
e017b7351c
Added optional toolbar icons.
2010-03-24 21:53:47 -04:00
rWatcher
b155ea730a
Name admin options the same way the show up on the map.
2010-03-24 21:10:37 -04:00
rWatcher
64193b1a3f
Added option to map the entire contents of an album on the sidebar.
2010-03-24 21:05:19 -04:00
rWatcher
606898787c
Fixed bug with manually specifying GPS coordinates.
2010-03-20 13:21:01 -04:00
Ben Smith
e12efbc9b3
Removed dependency on Google Gears to allow it to work on safari. Fixed issues with opacity on IE. There are still some issues with viewing on IE.
2010-03-20 12:31:28 +13:00
rWatcher
e2a17d6e17
Added some additional informational text.
2010-03-18 18:06:03 -04:00
rWatcher
c873d12df5
Added a return to album link.
2010-03-18 16:53:49 -04:00
rWatcher
f00fe14584
Make links translatable.
2010-03-18 16:53:19 -04:00
rWatcher
cd999855bc
Removed duplicate image.
2010-03-17 20:25:15 -04:00
rWatcher
867d079c8a
Code cleanup.
2010-03-17 20:24:28 -04:00
rWatcher
d0205a2a6d
Increase the version number, set some default values.
2010-03-17 20:15:04 -04:00
rWatcher
faa9e52da2
Added admin option for selecting starting map type.
2010-03-17 20:05:30 -04:00
rWatcher
c494c10359
Added map this album and map this user sidebar options.
2010-03-16 23:38:11 -04:00
rWatcher
6b88b8411c
Added user mapping and a page title.
2010-03-16 16:27:24 -04:00
rWatcher
ff9b1802d2
That was some ugly code. Rewritten.
2010-03-16 02:41:32 -04:00
rWatcher
636f3798f6
Display location block on tag pages.
2010-03-16 02:30:47 -04:00
rWatcher
1ff516e08d
Check and see if there are any photo's to display for a given day or month before displaying the sidebar block.
2010-03-16 01:40:31 -04:00
rWatcher
65871c8773
Removed background color from CSS code.
2010-03-16 01:39:28 -04:00
rWatcher
c8439bfb47
Added Serge D's suggestion for placing Latitude and Longitude fields on the same line.
2010-03-14 03:10:20 -04:00
rWatcher
c7746bf1bb
Don't hard-code protocol.
2010-03-13 14:10:19 -05:00
rWatcher
9f7f992881
Use full URL instead of relative URL in order to work properly with mod_rewrite.
2010-03-13 13:53:18 -05:00
rWatcher
89ba9336f5
Code cleanup and comments.
2010-03-10 23:02:19 -05:00
rWatcher
e497dad6ab
Only display markers for photos that the user can actually see.
2010-03-10 22:50:00 -05:00
rWatcher
46b7bebe22
Automatically zoom and center the map.
2010-03-10 22:46:30 -05:00
rWatcher
d7ced770ac
Added an album-mapping page.
2010-03-10 20:39:22 -05:00
rWatcher
9d8a667cf7
Enable the options on the new admin screen.
2010-03-10 17:04:44 -05:00
rWatcher
c46dee67e5
Added an admin screen.
2010-03-10 16:33:30 -05:00
rWatcher
b55a52c5b0
Merge commit 'gallery3-contrib/master'
2010-03-10 13:10:35 -05:00
rWatcher
dc5a564cad
Bug Fix for GPS-tagged photos that spell out South and West.
2010-03-10 13:07:37 -05:00
Chad Kieffer
3481552db1
Merge branch 'master' of github.com:gallery/gallery3-contrib
2010-03-10 08:56:12 -07: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
69993f3f9c
Merge branch 'master' of git://github.com/mp2300/gallery3-contrib
2010-03-06 20:34:22 -08:00
rWatcher
b5b50dcb1c
Importing new flags from forum posts.
2010-03-06 02:04:41 -05:00
rWatcher
2cf32a7f95
Importing flags from forum posts.
2010-03-06 01:59:45 -05:00
rWatcher
ab20993400
Updated as per forum requests.
2010-03-05 14:21:06 -05:00
rWatcher
c65a6027c7
Bug Fix for international translations.
2010-03-05 13:54:25 -05:00
rWatcher
8ff31c77ba
Set a default flag type.
2010-03-04 23:01:59 -05:00
rWatcher
12760d48d2
Initial commit of language_flags module.
2010-03-04 22:55:41 -05:00
rWatcher
8d446c45ca
Bug Fix: Filtering the calendar for one user now works.
2010-03-04 16:24:04 -05:00
rWatcher
2769c87027
Fun with timezones.
2010-03-04 14:48:24 -05:00
rWatcher
c72586efdc
Update the copyright to 2010.
2010-03-04 00:36:58 -05:00
rWatcher
cd2e9500e3
Merge commit 'gallery3-contrib/master'
2010-03-04 00:31:35 -05:00
rWatcher
f862f893fe
Code cleanup and comments.
2010-03-04 00:31:03 -05:00
rWatcher
29a1d7e80c
Code and CSS cleanups, also added a sidebar.
2010-03-03 20:51:33 -05:00
rWatcher
a7da5cc836
Added a title and breadcrumbs to the calendar page.
2010-03-03 18:47:52 -05:00
Bharat Mediratta
a75547ce83
Remove the logout link when we're in SSO mode.
2010-03-03 15:38:52 -08:00
rWatcher
85bb854b71
Don't make months clickable unless there's something to display for it.
2010-03-03 18:34:16 -05:00
Bharat Mediratta
ac28b85c5f
Merge branch 'master' of github.com:gallery/gallery3-contrib
2010-03-03 10:16:22 -08:00
Bharat Mediratta
5f65d082f9
Update the copyright to 2010.
2010-03-03 10:16:08 -08:00
rWatcher
1d03b836d7
CSS and Translation fixes.
2010-03-03 02:07:42 -05:00
rWatcher
3a446dc7b4
Warn users that EXIF is required in order for CalendarView to function properly.
2010-03-01 15:13:02 -05:00
rWatcher
63ec13a413
TagsMap integration.
2010-03-01 01:35:50 -05:00
rWatcher
954d88e5b6
Make the calendars translatable.
2010-03-01 00:42:06 -05:00
Chad Kieffer
25f09e9f0e
Merge branch 'master' of github.com:gallery/gallery3-contrib
2010-02-28 12:23:48 -07:00
rWatcher
7903bc085c
Merge commit 'gallery3-contrib/master'
2010-02-28 14:23:32 -05:00
rWatcher
c305ac2ad9
Scan existing photos for GPS coordinates.
2010-02-28 14:22:59 -05:00
Andy Staudacher
45277812b5
Update register module for changes to the identity provider API.
2010-02-27 15:44:46 -08:00
rWatcher
897056816e
Page numbering bugfix.
2010-02-26 14:19:53 -05:00
rWatcher
bc83d543f8
Added a sidebar map.
2010-02-25 23:05:38 -05:00
rWatcher
2efa2bebe7
It helps if you know what direction the coordinates are referencing.
2010-02-25 22:49:25 -05:00
rWatcher
f055accf85
Initial commit of EXIF_GPS module.
2010-02-25 21:51:55 -05:00
rWatcher
4f61137174
Removed checkbox for enabling/disabling the sidebar buttons.
2010-02-25 18:34:14 -05:00
rWatcher
bc6de82a78
Display the sidebar on all pages, not just albums and photos.
2010-02-25 17:11:22 -05:00
Ben Smith
7d5244dcbb
A few fixes for RC1.
2010-02-26 09:55:09 +13:00
rWatcher
035cf12fea
Updated for RC1.
2010-02-24 20:54:24 -05:00
rWatcher
01aae41d74
Code cleanup.
2010-02-24 17:24:54 -05:00
rWatcher
97b4ac60ac
Add CalendarView icon to tag menu.
2010-02-24 17:00:24 -05:00
rWatcher
536fa8aa4c
Fixed breadcrumbs in calendarview.
2010-02-24 16:58:04 -05:00
rWatcher
042ea227d2
Changed sidebar name to rWInfo.
2010-02-24 16:36:35 -05:00
rWatcher
0c3264935f
Merge commit 'gallery3-contrib/master'
2010-02-23 14:28:58 -05:00
mp2300
5296c55724
Wordpress authentication for Gallery3
2010-02-21 21:26:42 +01:00
Chad Kieffer
8dd6ed2958
Merge branch 'master' of github.com:gallery/gallery3-contrib
2010-02-19 20:15:42 -07:00
Bharat Mediratta
0da1677951
Merge branch 'master' of github.com:gallery/gallery3-contrib
2010-02-19 11:26:45 -08:00
Bharat Mediratta
9ba2306157
Properly return groups for the guest user.
2010-02-19 11:26:26 -08:00
Chad Kieffer
a3df4704b5
Merge branch 'master' of github.com:gallery/gallery3-contrib
2010-02-17 22:12:55 -07:00
Ben Smith
3ac02d35f5
Added validation on forms. such that if validation fails the form will reload with validation details.
...
Also added ability to include javacsript in forms. This means that the add album now auto fills the directory and slug name(?).
2010-02-11 15:36:47 +13:00
rWatcher
7b0df0982f
Remove the breadcrumb code that was crashing the month and day views, link the month view onto the main calendar view page.
2010-02-07 23:48:23 -05:00
rWatcher
ce31263a51
We don't need this anymore.
2010-02-07 23:47:15 -05:00
rWatcher
5b21bdfd5d
Replaced the broken Calendar library with a new, working one.
2010-02-07 23:37:54 -05:00
Tim Almdal
7558feb6ca
Move the scheduler module to the contrib repository for this release.
2010-02-02 15:02:46 -08:00
Bharat Mediratta
0cad5cc23c
PRefer explode() to split()
2010-02-01 00:53:35 -08:00
Bharat Mediratta
d1062c9340
Add default values for calendar() args.
2010-02-01 00:50:46 -08:00
Bharat Mediratta
8bd90d145d
Merge branch 'master' into bharat_dev
2010-01-27 09:29:29 -08:00
Bharat Mediratta
2dff991b59
Merge branch 'master' of git://github.com/rledisez/gallery3-contrib
2010-01-27 09:27:39 -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
Ben Smith
3c83eb8c96
changed to comply to standards
2010-01-27 14:31:40 +13:00
Bharat Mediratta
db6b1f9042
Updated for model based validation, but not tested.
2010-01-25 22:29:38 -08:00
Bharat Mediratta
f54b4b0579
IdentityProvider::create_user() now requires an email address as well.
2010-01-25 22:26:57 -08:00
Bharat Mediratta
4ad10e7290
Updated for model based validation
2010-01-25 22:26:19 -08:00
Bharat Mediratta
7a6d8eb8b3
Updated for model based validation
2010-01-25 22:26:08 -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
rWatcher
7ab0b1bb56
Use the photo title, not the file name.
2010-01-25 01:04:59 -05:00
rWatcher
a6b2b6408a
Merge commit 'gallery3-contrib/master'
2010-01-25 00:28:05 -05:00
Tim Almdal
c7d1baab70
Add the user home home directory to the user profile page.
2010-01-24 20:43:02 -08:00
Romain LE DISEZ
fbf635b099
Merge commit 'upstream/master'
2010-01-24 23:25:27 +01:00
Tim Almdal
68b290be51
Change the check_environment method in the module helper and the module installers to can_activate to reflect that it is doing more than just checking the environment.
2010-01-22 12:30:53 -08:00
Tim Almdal
b0270cf722
Refactor the identity provider installation in to a common helper method (change_provider) with an initialization callback.
2010-01-22 12:09:46 -08:00
Tim Almdal
b8bce53b8f
Use the admin module to install and switch to the LDAP identity provider.
2010-01-22 09:42:41 -08:00
rWatcher
0a2d33e2ff
Fixed tag links in rWInfo.
2010-01-20 20:49:23 -05:00
rWatcher
10e4e2842f
Fixed issue with batch tagging the contents of sub-albums.
2010-01-20 19:12:47 -05:00
rWatcher
f2910faf4c
Display warning message if Tags is not active to alert the user that BatchTag won't work properly without it.
2010-01-20 18:06:40 -05:00
rWatcher
b4789b45da
Initial commit of export_facebook module.
2010-01-20 16:57:22 -05:00
rWatcher
01326cee20
Display a warning message if the Tags module is not active.
2010-01-19 02:15:34 -05:00
rWatcher
1e08891ebf
Fixed issue where the delete button deletes the whole table instead of just one record.
2010-01-19 01:25:11 -05:00
rWatcher
73f04804f8
Fixed issue with tag links not working.
2010-01-19 01:24:44 -05:00
rWatcher
18c71cbb1e
Merge commit 'gallery3-contrib/master'
2010-01-19 00:54:22 -05: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
b98b1391e9
A further fix for 977. create the user immediately if the policy is visitor w/o a confirmation email.
2010-01-15 08:58:31 -08:00
Tim Almdal
4309f8822c
1) Insure that a group input is always part of the form, either a dropdown or hidden field
...
2) Create a "dummy validation function" in order to have the group and email_validation fields copied from the $_POST array.
2010-01-14 20:16:15 -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
rWatcher
c9f95a5613
Code cleanup in TagFaces.
2010-01-12 15:02:20 -05: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
rWatcher
f4401fa9dd
Fixed another "minor" bug that caused the entire contents of the items_faces table to get deleted whenever a face-tagged photo is deleted.
2010-01-12 03:17:36 -05:00
rWatcher
c53352108b
Hide the delete button when there's nothing to delete.
2010-01-12 03:05:49 -05:00
rWatcher
ae5f3fc8be
Merge commit 'gallery3-contrib/master'
2010-01-12 03:00:50 -05:00
rWatcher
2fa96fe8a9
Fixed "minor" bug that caused the entire contents of the items_faces table to get deleted.
2010-01-12 02:59:25 -05:00
rWatcher
744a6b6cc7
Added option for deleting notes from a photo.
2010-01-11 16:03:05 -05:00
Bharat Mediratta
60238ddfad
Rudimentary Single sign-on module
2010-01-11 11:05:49 -08:00
Bharat Mediratta
3eb4e6920d
Implement Ldap_User::groups() to match K24 APIs.
2010-01-11 11:03:34 -08:00
rWatcher
20328ef8a5
Fix highlight box alignment bug with current git.
2010-01-11 02:26:03 -05:00
Chad Kieffer
01f107826d
Merge branch 'master' of github.com:gallery/gallery3-contrib
2010-01-10 23:11:53 -07:00
rWatcher
d316a1c45f
Fixed weird access::verify_csrf() issue with TagFaces.
2010-01-10 14:43:14 -05:00
rWatcher
5add59a795
Fixed tag url issue in TagFaces.
2010-01-10 02:35:10 -05:00
rWatcher
e4d96261f6
Fix for borken selection box in TagFaces.
2010-01-10 02:28:31 -05:00
rWatcher
cf81ac7085
Updated DisplayTags to fix tag hyperlink issue.
2010-01-10 01:54:22 -05:00
rWatcher
231d9c95fc
Updated to support dynamic sidebar code.
2009-12-30 01:45:47 -05:00
rWatcher
2b12d9b3f5
Validate form before sending and add message header text.
2009-12-30 01:10:55 -05:00
Tim Almdal
ba0794fe91
Allow the register link to be shown on the login page. Fixes ticket #952
2009-12-28 11:36:17 -08:00
Bharat Mediratta
90ef5daa49
Update some database calls.
2009-12-25 13:25:36 -08:00
Bharat Mediratta
fb36d5454c
Do enough CSS fixing to get the dialogs to work inline.
2009-12-24 18:05:14 -08:00
Bharat Mediratta
69baf26b05
Clean up formatting.
2009-12-24 18:03:03 -08:00
Bharat Mediratta
b9cebd25eb
Add validation for the default settings and api key. Set some
...
defaults there, too so that users don't have to know a lat/long to get
started. Use form validation. Bump the version to 2.
2009-12-24 12:53:35 -08:00
Bharat Mediratta
4c9bcf9ad3
Update for paginator changes.
2009-12-24 11:56:49 -08:00
Bharat Mediratta
2fdada73dc
Sentence case the titles.
2009-12-24 11:56:30 -08:00
Bharat Mediratta
c7ad42100b
Convert Kohana::show_404() to throw a Kohana_404_Exception()
2009-12-24 11:55:28 -08:00
Bharat Mediratta
ace00a891d
Updated for the new blocks API.
2009-12-24 11:51:21 -08:00
Bharat Mediratta
0cb6b9e58f
Clean up the code to work with K24 ORM changes, and update it to work
...
with paginator changes. Also fix some minor style issues.
2009-12-24 11:45:44 -08:00
Bharat Mediratta
8658a609fd
Convert Controller::$input -> Input::instance()
2009-12-24 11:09:07 -08:00
Bharat Mediratta
1ed3c46997
Clean up tag display logic
2009-12-24 11:07:03 -08:00
Bharat Mediratta
9a1fc57211
Don't treat objects like strings. Simplify the code.
2009-12-24 11:04:25 -08:00
Bharat Mediratta
30ab3e9420
Check using empty() instead of a comparison to avoid warnings on
...
unused variables.
Clean up the code style.
2009-12-24 10:59:25 -08:00
Bharat Mediratta
7d2297033d
Don't treat objects like strings.
2009-12-24 10:56:26 -08:00
Bharat Mediratta
1a65ded2a6
Don't treat objects like strings
2009-12-24 02:44:13 -08:00
Bharat Mediratta
dde187e88c
Only trigger for items and tags
2009-12-24 01:48:27 -08:00
Bharat Mediratta
2a596af25b
Don't treat an object like a string
2009-12-24 01:48:15 -08:00
Bharat Mediratta
2b00e0a4e9
Don't save dimensions unless it's actually a movie.
2009-12-24 01:47:58 -08:00
Bharat Mediratta
f522643d70
Clean up tag display logic.
2009-12-24 01:47:00 -08:00
Bharat Mediratta
bcc0a1e836
Convert a bunch of left over kohana::show_404 calls to throw
...
Kohana_404_Exception instead.
2009-12-23 20:52:09 -08:00
Bharat Mediratta
a711cb1088
Quote name/descriptions in module.info
2009-12-23 12:56:12 -08:00
Bharat Mediratta
f64442b75c
Add a rule for the "activate" param so that it gets validated properly.
2009-12-23 02:24:55 -08:00
Bharat Mediratta
5f53465bd1
Update format of $hidden variables for new K24 form::open
2009-12-23 00:59:15 -08:00
Bharat Mediratta
1a0dc96e77
First pass at upgrading contrib code to the Kohana 2.4 standards.
...
Here's a summary of the changes I made:
1) html::specialchars --> html::chars
2) ORM::orderby() -> ORM::order_by()
3) ORM::where() now takes 3 parameters including a comparator. So
ORM::where("a", $b) is now ORM::where("a", "=", $b) and the middle
value can be any comparator.
4) ORM::$loaded --> ORM::loaded()
5) Database::instance() --> db::build() (and there are some other
subtle differences, like now you always call execute() at the end
of the chain)
6) form::close() and form::close_fieldset() are now gone. Use
</form> and </fieldset> respectively.
7) Controller::$input is gone. Use Input::instance() instead.
I've done very rudimentary testing so far.
2009-12-22 21:31:03 -08:00
Chad Kieffer
fd724e86f2
Merge branch 'master' of github.com:gallery/gallery3-contrib
2009-12-03 21:37:58 -07:00
Romain LE DISEZ
b78ac358ee
Merge commit 'upstream/master'
2009-12-01 20:37:04 +01:00
Bharat Mediratta
649b7ba7bc
Get rid of the installer code, we don't actually need it yet since
...
there's no need to do any special work when we upgrade.
Change the theme code to only print out the JS if we have a web
property ID.
2009-11-29 11:49:39 -08:00
Romain LE DISEZ
9441bc08bb
Merge commit 'upstream/master'
2009-11-29 20:48:54 +01:00
Matt Rude
29893cf79b
Corrected version number from 1.2 to 2 since 1.2 is an invaild
...
version number.
2009-11-30 03:47:50 +08:00
Chad Kieffer
cb9482299f
Merge branch 'master' of github.com:gallery/gallery3-contrib
2009-11-29 09:29:24 -07:00
Romain LE DISEZ
159fa9c815
Merge commit 'upstream/master'
2009-11-28 15:03:58 +01:00
Bharat Mediratta
6547d54e72
Fix a blown merge and bring calendarview up to date with rWatcher's
...
changes.
2009-11-26 11:21:51 -08:00
Bharat Mediratta
55f806b754
Merge branch 'master' of git://github.com/rWatcher/gallery3-contrib
...
Conflicts:
modules/calendarview/controllers/calendarview.php
modules/calendarview/libraries/Calendar_Breadcrumb.php
modules/calendarview/views/kohana_calendar.php
2009-11-26 11:13:21 -08:00
rWatcher
8ca9f9e780
Added a month view and breadcrumbs to album view.
2009-11-27 03:09:40 +08:00
Chad Kieffer
24ad098f23
Merge branch 'master' of github.com:gallery/gallery3-contrib
2009-11-26 11:12:01 -07:00
Bharat Mediratta
07bb2625df
Beginning framework for the remote module
2009-11-23 22:30:55 -08:00
Chad Kieffer
6d8f000ccc
Merge branch 'master' of github.com:gallery/gallery3-contrib
2009-11-18 19:04:34 -07:00
rWatcher
11153056f1
Code cleanup.
2009-11-18 19:04:47 -05:00
rWatcher
92e97357e5
Translation Fix.
2009-11-18 18:35:31 -05:00
rWatcher
229c488436
Merge commit 'gallery3-contrib/master'
2009-11-18 15:03:53 -05:00
rWatcher
47d1f16b40
Added a month view and breadcrumbs to album view.
2009-11-18 15:03:16 -05:00
Tim Almdal
b1119d82f1
Revert "Add xss_golden files to some modules."
...
This reverts commit e20cfc8494
.
2009-11-18 10:53:02 -08:00
Tim Almdal
e20cfc8494
Add xss_golden files to some modules.
2009-11-18 10:37:31 -08:00
Tim Almdal
984c42edbf
Add quotes around the module name
2009-11-18 08:58:57 -08:00
rWatcher
9f2a08411c
Merge commit 'gallery3-contrib/master'
...
Conflicts:
modules/calendarview/controllers/calendarview.php
2009-11-18 00:33:19 -05:00
Bharat Mediratta
85570acabd
Merge branch 'master' of git@github.com:gallery/gallery3-contrib
...
Conflicts:
modules/calendarview/controllers/calendarview.php
2009-11-17 15:55:19 -08:00
Bharat Mediratta
99ec99a166
Update to use the new page_type and page_subtype designations.
2009-11-17 14:06:04 -08:00
rWatcher
59648ce716
Move the CSS from the view file into a seperate .css file.
2009-11-18 02:11:19 +08:00
rWatcher
72a1019256
Remove "overlap dates" from calendar view.
2009-11-18 02:11:19 +08:00