Commit Graph
3568 Commits
Author SHA1 Message Date
Bharat Mediratta ea43c5f06f Merge branch 'master' of github.com:gallery/gallery3 2010-03-28 21:04:44 -07:00
Tim Almdal 0c1595d7e8 Clean up the organize_dialog file of some cruft and add the organize.swf file to the organize module. 2010-03-27 15:55:42 -07:00
Tim Almdal 67a8ef4277 Convert the old organize to the new flex based organize 2010-03-27 11:16:41 -07:00
Tim Almdal 7b35091b47 If the access token is not set, then look in the post data. 2010-03-21 20:45:22 -07:00
Tim Almdal 846a835e13 Merge branch 'master' into talmdal_dev 2010-03-17 14:25:20 -07:00
Chad Kieffer 0e9c626684 Add more padding to the top of the add-photos-canvas to avoid overlap with selected photos. 2010-03-16 23:10:15 -06:00
Tim Almdal 99c1c2a6b1 Changes to the example client to test updating the members of an album. 2010-03-13 23:12:40 -08:00
Tim Almdal 48b8b4f689 Merge branch 'master' into talmdal_dev 2010-03-13 23:11:53 -08:00
Tim Almdal 13f5d3aa33 Whitespace correction 2010-03-13 23:11:33 -08:00
Tim Almdal 5467e21e8b Changes to support updating the child elements within an album. In this change the urls of the children are sent up asan array of post fields children[0].... children[n]. If an existing child is not included it is deleted. Including a url to an child in another album will move the child. Changing the order of the children will respect the order of the children, if the sort column is 'weight' 2010-03-13 08:39:06 -08:00
Bharat MedirattaandTim Almdal 9314533048 Update tests to reflect the fact that you have to be logged in to do anything. 2010-03-13 08:39:05 -08:00
Bharat MedirattaandTim Almdal c69f5f4906 Guests don't get access to the REST API. 2010-03-13 08:39:05 -08:00
Florent PaternoandTim Almdal 08f11ce90e Fix bug #1015 : repeated ids are prohibited 2010-03-13 08:39:04 -08:00
Bharat Mediratta be580c9554 Update tests to reflect the fact that you have to be logged in to do anything. 2010-03-05 21:42:39 -08:00
Bharat Mediratta 6429110cd0 Merge branch 'master' of git://github.com/fpaterno/gallery3 2010-03-05 21:25:22 -08:00
Tim Almdal 1c022a5c84 Merge branch 'master' into talmdal_dev 2010-03-05 06:54:12 -08:00
Bharat Mediratta 05d345e16d Guests don't get access to the REST API. 2010-03-03 10:17:48 -08:00
Bharat Mediratta c3c2b45280 Update the copyright to 2010. It's only 3 months into the year :-) 2010-03-03 10:15:34 -08:00
Tim Almdal fd82bcfc0a Merge branch 'master' into talmdal_dev 2010-03-03 08:47:54 -08:00
Andy Staudacher 109c390f25 Ignore fetchItemViewCount errors during import and default to 0. The error is still logged to the G3 syslog. 2010-03-02 13:53:09 -08:00
Tim Almdal d1b8589ea4 Merge branch 'master' into talmdal_dev 2010-03-02 07:10:22 -08:00
Florent Paterno e4ed7e983d Fix bug #1015 : repeated ids are prohibited 2010-03-01 17:23:56 +01:00
Chad Kieffer aff40d2d78 Merge branch 'master' of github.com:gallery/gallery3 2010-02-28 22:10:30 -07:00
Chad Kieffer dc00373404 Apply ui-helper-clearfix to the breadcrumb in the upload dialog to ensure it clears the upload canvas in webkit-based browsers. 2010-02-28 22:09:40 -07:00
Andy Staudacher b0ef46b5fa Merge commit 'upstream/master' 2010-02-28 19:31:55 -08:00
Andy Staudacher 1077477a90 G2 importer stability improvements:
- Log which validation rule was violated if there's an ORM validation error.
 - Add more try / catch blocks to avoid abortion where possible.
2010-02-28 19:29:41 -08:00
Chad Kieffer 5f985b3e2a Updates to upload CSS to make it themeable and RTL compatible. Use absolute positioning to handle upload button positioning. Remove color definitions to allow jQuery UI theme to set button colors. Consolidate upload dialog CSS to modules/css/gallery.css. Closes #885. 2010-02-28 18:46:43 -07:00
Tim Almdal e3e72ca4da Merge branch 'master' into talmdal_dev 2010-02-28 15:38:39 -08:00
Andy Staudacher a19b97f8d6 First step towards fixing ticket #1038: Allowing for custom page <title> in admin pages, just like in non-admin pages.
TODO: Set $view->page_title in the many admin controllers we have. I just set it for admin_maintenance.php to show how it's intended to be used. I copied the title from views/admin_maintenance.html.php to the controller.
2010-02-28 13:35:58 -08:00
Andy Staudacher 107909043a Fix profiler display: It looks like it was broken by an API change in the latest kohana upgrade. 2010-02-28 13:09:57 -08:00
Andy Staudacher 70837b5212 Fix for ticket #1035: Make .htaccess access rules work for the case when index.php isn't part of generated URLs. 2010-02-27 21:26:38 -08:00
Andy Staudacher 74113f869a Fix for ticket #1037: Only show language drop-down when there's actually a choice. 2010-02-27 20:21:22 -08:00
Andy Staudacher dacb58ceed Additional fixes for plural handling when deleting translations / marking them as untranslated. 2010-02-27 20:06:37 -08:00
Andy Staudacher caf9ae88ba Fix l10n client, copy of existing plural translation to form fields.
I think this was broken in a recent jQuery update. It used to allow matching the HTML "name" attribute with #name_value, now you need to match by elementName[name=name_value].
2010-02-27 19:47:08 -08:00
Andy Staudacher 8366f58ef9 Client (UI) side fix for ticket #1042, based on a patch from fpaterno (Florent Paterno). Mark message as untranslated if the translation is empty. 2010-02-27 19:13:22 -08:00
Andy Staudacher 48193371e4 Incremental fix for ticket #1042: Delete translation from outgoing_translations when the user submits a form with an empty translation. 2010-02-27 18:54:36 -08:00
Andy Staudacher a18ddd2fe9 Add more randomness to reset password mechanism. 2010-02-27 15:39:36 -08:00
Andy Staudacher d9707ae749 Fix for ticket #1036 - Don't echo any sensitive information such as passwords, hashes or personally identifiable information. 2010-02-27 02:37:39 -08:00
Tim Almdal f28b80fcf4 Merge branch 'master' into talmdal_dev 2010-02-26 09:58:57 -08:00
Andy Staudacher ed0f93a965 Fix typo, thanks cajun100 for reporting! 2010-02-25 18:26:20 -08:00
Andy Staudacher 39b8810c3b Fix multi-column layout of language admin. 2010-02-24 16:39:18 -08:00
Andy Staudacher c38bee203b Add Faroese to the language list. Verified that it uses the default plural rules, thus no changes in Gallery_I18n.php or on the server side required. 2010-02-24 16:21:54 -08:00
Tim Almdal 7d7da6eb0a Remove redundant print statement. rest::reply() does the print so having the extra print statement could lead to problems. 2010-02-24 11:49:53 -08:00
Andy Staudacher 1d8862d957 Fix for ticket #1034: Fix db cache driver delete() call which was missed in a recent refactoring / fix. 2010-02-24 01:28:38 -08:00
Bharat Mediratta 2eea7b874a Specify the type for movie Item_Models correctly. Fixes ticket #1033. 2010-02-23 21:08:52 -08:00
Bharat Mediratta d4423eb349 Reset the active user to admin in all test cases where we change the
user to something else.
2010-02-23 13:50:57 -08:00
Bharat Mediratta de1785d9fa Merge branch 'master' of github.com:gallery/gallery3 2010-02-23 12:58:30 -08:00
Andy Staudacher 212da35cdc Fix Cache tests for recent Cache/Database.php driver fix.
Cache::delete($arg) allows for scalars and arrays, but Cache drivers' delete($arg) function always expects an array.
2010-02-23 12:48:03 -08:00
Bharat Mediratta 8ab580cec1 Verified 2010-02-23 11:50:39 -08:00
Bharat Mediratta 16bf1d18ad Merge branch 'master' of github.com:gallery/gallery3 2010-02-23 11:11:11 -08:00