Commit Graph
1629 Commits
Author SHA1 Message Date
Tim Almdal 67223fc43d Revert "Make the trailing slash on the url optional. Sometimes it is not there, so the regex doesn't match"
This reverts commit e4d397d301.
2010-07-05 08:59:08 -07:00
Tim Almdal 226d1f7146 Revert "If the admin request originates as a dialog link, don't display the entire page when reauthenticating the administrator. Just put the form in the dialog."
This reverts commit 8493a3d36f.
2010-07-05 08:58:36 -07:00
Tim Almdal 8493a3d36f If the admin request originates as a dialog link, don't display the entire page when reauthenticating the administrator. Just put the form in the dialog. 2010-07-05 08:23:17 -07:00
Tim Almdal e4d397d301 Make the trailing slash on the url optional. Sometimes it is not there, so the regex doesn't match 2010-07-05 08:21:14 -07:00
Bharat Mediratta 60126adc7e In the site menu, say "Delete album", "Delete photo" or "Delete movie"
as appropriate for the item type.  Fixes ticket #1175.
2010-07-04 20:40:50 -07:00
Bharat Mediratta 0d424a635d When we delete an item, make sure that we scrub it from any other
items that may have it in the album_cover_item_id column.  Fixes ticket #1172.
2010-07-03 14:25:33 -07:00
Bharat Mediratta e5ae2c91bc Style cleanup. 2010-06-26 12:14:02 -07:00
Bharat Mediratta 5767971f43 Sentence casing. 2010-06-26 12:00:55 -07:00
Bharat Mediratta 6b619e1098 Differentiate in our logs between missing site and admin theme overrides. 2010-06-26 12:00:14 -07:00
Bharat Mediratta 87d09bcd2e Merge branch 'master' of github.com:gallery/gallery3 2010-06-26 11:57:18 -07:00
Tim Almdal 8ecf28d3ef Better fix for the problem that a preview of an admin theme was not showing up. 2010-06-25 10:23:11 -07:00
Tim Almdal e380f19ee2 Fix an issue where a preview of the admin view would not work. 2010-06-25 10:17:06 -07:00
Bharat Mediratta 8bc7eec60f Add a <h1> title saying that this is a preview. 2010-06-25 09:56:44 -07:00
Tim Almdal d66c496fb1 Change the theme option page to display using tabs if the site theme has an admin page. 2010-06-25 06:45:09 -07:00
mamouneyyaandTim Almdal ca09e98890 centerize the group labels in Edit Permission window.. i think it's much cleaner this way 2010-06-23 23:33:13 +08:00
Tim Almdal a804c11513 1) revert e468ed7bd3
2) Add the padding to both the button and flash object so they always line up
3) Add some top padding to the uploadifyQueue panel  to seprate it from the button.
2010-06-21 10:11:38 -07:00
Bharat Mediratta d82863421d Rename "simple_uploader" to "flash_uploader" to make room for an HTML
uploader.
2010-06-20 21:10:22 -07:00
Bharat Mediratta 48af5e6b50 Rename "children" to "items" in our feed view because it makes more
semantic sense.
2010-06-20 17:25:23 -07:00
Bharat Mediratta 261da7b1c3 Set the focus on the username field (and the name field when we reset
the password) properly on IE7 using a setTimeout() hack.  Fixes ticket
#807.
2010-06-20 17:18:11 -07:00
Bharat Mediratta 7bdb9a49e5 Focus on the username field by default. 2010-06-20 16:58:38 -07:00
Bharat Mediratta 892727830d Add a loading indicator to the delete form by tagging some JS on at
the end which triggers .gallery_show_loading().  Not a complete fix
for #817 but it's a start and it takes care of one place where we have
a long running process.
2010-06-20 16:52:10 -07:00
Bharat Mediratta 4a7b41c5a4 Merge branch 'master' of git://github.com/mamouneyya/gallery3
Conflicts:
	lib/gallery.common.css
2010-06-20 10:25:03 -07:00
Bharat Mediratta 6ebbb4fbf5 Updated golden files. 2010-06-20 09:51:39 -07:00
Bharat Mediratta 2e01685553 Add "comments" relationship support. 2010-06-20 09:40:35 -07:00
Bharat Mediratta ec052d7130 Assert how many files we analyze so that we can tell if we're suddenly
analzying too many or too few.
2010-06-20 09:36:56 -07:00
Bharat Mediratta 9f9d3866e8 Exclude the .git directory. 2010-06-20 09:28:36 -07:00
Bharat Mediratta ab9049d531 Remove trailing ?> 2010-06-20 09:05:25 -07:00
Bharat Mediratta 1a210dd270 Add "json" as a valid view suffix. 2010-06-20 09:03:23 -07:00
Bharat Mediratta 719328a5a7 If we use <?= .. ?> on the last line, it looks like we've got a
trailing ?> and that causes File_Structure_Test to be sad.  So instead
use echo and tack on our own newline.  But this also requires a
semicolon.  Weird, I know but still easier than fixing up the test.
2010-06-20 09:02:59 -07:00
Bharat Mediratta d86d1a32e8 Updated for comment REST relationships. 2010-06-19 15:12:58 -07:00
Bharat Mediratta 41ca2b0195 Rework our exception framework to fit into Kohana's model better.
Instead of overwriting Kohana_Exception::handle() (which we were doing
in MY_Kohana_Exception) we instead use their existing template system.

gallery/views/kohana/error.php overrides system/views/kohana/error.php
and is the standard error template for all exceptions.  Our version of
error.php figures out the appropriate view based on context (cli,
authenticated admin, guest viewing a 404, guest viewing a system
error) and delegates appropriately.  Each delegated view has a narrow
responsibility.

This paves the way for us to add new error views per module.  For
example, the rest module will define its own template in
Rest_Exception and then its exceptions can be rendered the way that it
wants (json encoded, in that case).
2010-06-19 14:07:32 -07:00
Bharat Mediratta 5736698b4b single -> double quotes. 2010-06-19 10:51:05 -07:00
Bharat Mediratta bc70ff498d Use request::protocol() 2010-06-18 15:25:33 -07:00
mamouneyya 562fb174a7 Flip some margin/padding values for RTL 2010-06-18 14:08:08 +03:00
Tim Almdal e82aa6dcd8 Update the xss gold file with changes to views in the last couple of commits. 2010-06-17 10:22:19 -07:00
Tim Almdal a03e3d1dc1 Fix for ticket #1110. Need to use the encode_path with a movie extension to find the item. Thanks to samdavidoff for the initial fix. 2010-06-17 09:38:36 -07:00
Tim Almdal 2bbce8dddb Fix for ticket #1117 align videos to the center. 2010-06-17 09:10:01 -07:00
Tim Almdal 38d09c5d1a Scale a movie to the resize size so that it doesn't overflow into the sidebar. 2010-06-17 08:03:08 -07:00
Bharat Mediratta 35bbffcc29 Merge branch 'master' of github.com:gallery/gallery3 2010-06-16 14:25:13 -07:00
Jan KoprowskiandTim Almdal 1fb3339326 Fix issue1068. Fill from_id field in photo with indetificator 2010-06-16 22:51:39 +08:00
Bharat Mediratta e3535349ab Revert "Add a "convert_ids" parameter to Item_Model::as_restful_array(), which"
This reverts commit 98fce83de5.

Conflicts:

	modules/gallery/tests/Item_Model_Test.php
2010-06-15 20:25:35 -07:00
Bharat Mediratta a432a43b3b Revert "Change the item rest update processing to call the
item::move(source, target) helper when the parent member has changed.
Using the move method insures that names and slugs that could conflict
in the target album are resolved properly.  Changed the item::move
method so it returns a message to be displayed if the caller chooses.
And changed the move controller to display the message returned by the
move if the item name was renamed as part of the move."

Rolling this back for a couple of reasons:

1) Bug in move.php ("message.info" is not a function name)

2) Having the message come back from the API call as a side-effect is
sloppy.  We should find a cleaner way to do this checking.

3) having item::move() call save() on any changed values in the ORM
is counter-intuitive.  Move should move, save should save.

I think the right approach here is to roll the move() code properly into
save().

This reverts commit 2492280cc0.
2010-06-15 17:18:22 -07:00
Bharat Mediratta 48dc07dbc8 Revert "Fix for ticket #1118. Create a item::save_with_retries helper
method, which encapsulates saving an item and handling name and slug
conflicts. Call this instead of doing a save directly."

Rolled this back because it fails KISS.  We already have an API for
saving models with Item_Model::save() that's consistent with all of
our other model code.  Adding a new way to save items is confusing and
inconsistent.

This reverts commit 9504f71efc.
2010-06-15 17:17:25 -07:00
Bharat Mediratta 1df752a2f2 Make the "name" column a little wider. 2010-06-15 16:11:21 -07:00
Bharat Mediratta ae6af2f9b6 Install the rest module by default. 2010-06-15 16:01:41 -07:00
Bharat Mediratta 4d40cf62e9 Sort files by path in _dump_var() for consistent output.
Skip . and .. (PHP 5.3 iterators seem to include those now).
2010-06-15 15:50:10 -07:00
Tim Almdal 9504f71efc Fix for ticket #1118. Create a item::save_with_retries helper method, which encapsulates saving an item and handling name and slug conflicts. Call this instead of doing a save directly. 2010-06-15 14:18:23 -07:00
Tim Almdal 2492280cc0 Change the item rest update processing to call the item::move(source, target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Changed the item::move method so it returns a message to be displayed if the caller chooses. And changed the move controller to display the message returned by the move if the item name was renamed as part of the move. 2010-06-15 12:52:28 -07:00
Tim Almdal 207f6beb61 Only change the weights of the album children if the item sort_column is set to weight. 2010-06-15 11:40:01 -07:00
Tim Almdal 00c4cb3f63 Revert "Change the item rest update processing to call the itemm::move(source, target) helper when the parent member has changed. Using the move method insures that names and slugs that could conflict in the target album are resolved properly. Also, only change the weights of the album children if the item sort_column is set to weight."
This reverts commit 603d464014.
2010-06-15 11:38:46 -07:00