stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-04-17 19:19:17 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,700 Commits 4 Branches 0 Tags
a19554f96cbec458fb8a009ba4e126bf50cd7a52
Commit Graph

177 Commits

Author SHA1 Message Date
Bharat Mediratta
c07af35a19 Oops, fix broken codex urls. For #1698. 2011-04-23 14:53:39 -07:00
Bharat Mediratta
ba20d5a500 Oops, this is the rest of the modules and themes for #1696 and #1698. 2011-04-23 14:46:07 -07:00
Bharat Mediratta
3312009319 Revive server_add.js which I accidentally removed in 80af9f0f17 
as part of #1686.
 2011-04-23 08:07:58 -07:00
Bharat Mediratta
efa3466a75 Oops, forgot to remove the reference to admin.js. Follow-on for #1686. 2011-04-23 07:13:55 -07:00
Bharat Mediratta
80af9f0f17 Inline admin JS into admin_server_add.html.php. Fixes #1686. 2011-04-23 07:05:15 -07:00
Bharat Mediratta
9d8eef143d Fix an outdated reference to $entry->file which went away in v4 of the 
module.  Fixes #1669.
 2011-04-02 15:36:50 -07:00
Bharat Mediratta
423daa52d5 Update copyright to 2011. 2011-01-21 23:01:06 -08:00
Joe7
6b4ccc56ce Fix: photos get added as albums in case only some photos are selected via server ad 
Fixes #1619
 2011-01-21 09:32:55 -08:00
Bharat Mediratta
029fa606be Fix a bug introduced in the refactor in 
6544854863 for #1547.  By skipping the
staging dirs, we wind up scanning the entire filesystem because the
first model is blank so there's no leading path before the /*.
 2011-01-20 23:42:36 -08:00
Bharat Mediratta
0126a0385d Fix a bug introduced in 65ff2470a5, 
clearly I didn't test this enough.  Further fix for #1460.
 2011-01-19 19:50:50 -08:00
Bharat Mediratta
ee13b934f4 Fix all the head() and admin_head() theme callbacks to return the 
results of the $theme->css() and $theme->script() calls.  This handles
the case where combining scripts/css returns HTML instead of putting
it in the queue for combination.  Fixes #1611.
 2011-01-15 13:14:43 -08:00
Bharat Mediratta
9dfb733ad7 New albums should take the sort order from their parent. Fixes #1599. 2011-01-10 19:24:38 -08:00
Bharat Mediratta
65ff2470a5 Use eeldivad's fallback code from http://gallery.menalto.com/node/96806#comment-358404 
instead of relying solely on preg_quote.  Fixes #1460.
 2011-01-09 22:36:20 -08:00
Bharat Mediratta
6544854863 Move the directory queue into the database as well, otherwise if you 
have too many directories it blows out the task queue and the whole
thing falls over.  Fixes #1547.
 2011-01-09 22:29:26 -08:00
Bharat Mediratta
b7ffb0501e Replace preg_quote with a more targeted regex to fix the problem where 
directories get skipped.  Fixes #1460, I think.
 2011-01-09 18:38:09 -08:00
Bharat Mediratta
dff1a53696 All modules should be named Xxx_Core for extensibility. Fixes #1458. 2010-10-25 21:05:31 -07:00
Bharat Mediratta
d5dbd1677f "Server Add" -> "Server add" 
(Sentence capitalization)
 2010-08-09 21:22:54 -07:00
Bharat Mediratta
7607e1f932 Full pass over all the JSON encoding and JS dialog code. We now abide 
by the following rules:

1) An initial dialog or panel load can take either HTML or JSON, but
   the mime type must accurately reflect its payload.

2) dialog form submits can handle a pure HTML response, but the mime
   type must also be correct.  This properly resolves the problem
   where the reauth code gets a JSON response first from the reauth
   code, and then an HTML response when you reauth and continue on to
   a given form -- try it out with Admin > Settings > Advanced.

3) All JSON replies must set the mime type correctly.  The json::reply
   convenience function does this for us.

4) By default, any HTML content sent back in the JSON response should be
   in the "html" field, no longer the "form" field.

The combination of these allows us to stop doing boilerplate code like
this in our controllers:

  // Print our view, JSON encoded
  json::reply(array("form" => (string) $view));

instead, controllers can just return HTML, eg:

  // Print our view
  print $view;

That's much more intuitive for developers.
 2010-07-31 21:16:17 -07:00
Tim Almdal
91a2c04a24 More patches as part of #1225. Change the 'core' modules to use the json::reply 
method to set the content type header and encode the response as a json object
 2010-07-31 15:44:55 -07:00
Tim Almdal
329abfe539 Merge branch 'master' into talmdal_dev 2010-07-11 09:09:52 -07:00
Bharat Mediratta
fe8cb89ac4 Cast the status message to a string so that it gets sent down as a string in the json blob. 
Fixes ticket #1198.
 2010-07-10 14:03:46 -07:00
Romain LE DISEZ
39962eaddc Accept extension .m4v as video/mp4 2010-07-10 08:09:04 -07:00
Tim Almdal
dbf3199e46 Fix for ticket #1181. Use $.getJSON to retrieve the json contents of the dialog. Convert all the controllers 
that create the data to go into a dialog to return the html as part of a json object.
 2010-07-06 14:12:01 -07:00
ckieffer
f1076590f1 Add page_title to admin views. Closes #1038. 2010-04-30 00:08:37 -06:00
Bharat Mediratta
c82d24d475 preg_quote() the pattern we use for directory globs to avoid letting 
the filename be treated as a regexp.  Fixes #1086.
 2010-04-04 14:28:09 -07: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
Andy Staudacher
ed0f93a965 Fix typo, thanks cajun100 for reporting! 2010-02-25 18:26:20 -08:00
Andy Staudacher
f7b39e7db7 Fix server-add for German and other locales that use comma as decimal separator. 2010-02-22 12:31:46 -08:00
Bharat Mediratta
2253596379 Remove debug code. 2010-01-31 15:03:53 -08:00
Bharat Mediratta
56d04b1ed8 cast $task->done to bool so that it doesn't show up as "0" to the JS, 
which will interpret that as a true value, when it's not.
 2010-01-28 20:38:48 -08:00
Bharat Mediratta
4b32a71afc Convert back to using ORM::factory(..., $id) instead of calling where(). 2010-01-27 22:34:11 -08:00
Bharat Mediratta
7096c29124 Switch to model based validation. 2010-01-23 17:07:09 -08:00
Bharat Mediratta
5b84919d6e First pass at converting server add to model based validation. 2010-01-24 14:21:57 -08:00
Tim Almdal
a11bf29507 Fix for ticket #972 and more. In Kohana 2.4, ORM::delete_all ignores any where 
clauses and deletes all the entries in the table unless an array of id's are
passed as the parameter.  This fix used the Database_builder to specify any where
conditions. Thanks psvo for find the first one. :-)
 2010-01-09 23:57:16 -08:00
Tim Almdal
7af844606d The problem occurs because the square brackets are treated as special characters in the glob to find the children. This patch escapes the square brackets. Fixes ticket #855 2009-12-30 15:33:22 -08:00
Bharat Mediratta
c50c2d135c Fix uses of count_records() and use ORM to count instead. 2009-12-25 12:39:09 -08:00
Bharat Mediratta
8b9a02084a Updates for the latest version of Kohana 2.4: 
1) Controller::$input is gone -- use Input::instance() now
2) Handle new 'database.<default>.connection.params' parameter
3) Handle new 'cache.<default>.prefix' parameter
 2009-12-21 21:27:43 -08:00
Bharat Mediratta
9af0a4e59c Convert a database call. 2009-12-18 13:36:43 -08:00
Bharat Mediratta
94411b3658 Fix a bunch of places where we were using "= null" instead of "IS NULL". 2009-12-02 10:02:08 -08:00
Bharat Mediratta
1fd0e14359 Convert all DB where() calls to take 3 arguments. 
Convert all open_paren() calls to and_open() or or_open() as appropriate.
 2009-11-26 12:09:04 -08:00
Bharat Mediratta
0121bfd585 ORM::orderby -> ORM::order_by 2009-11-25 19:26:52 -08:00
Bharat Mediratta
2e420522ec Preliminary work to cut over to Kohana 2.4 
- Kohana::log() -> Kohana_Log::add()
- Kohana::config_XXX -> Kohana_Config::instance()->XXX
- Implement View::set_global in MY_View
- Updated Cache_Database_Driver to latest APIs
- ORM::$loaded -> ORM::loaded()
- Updated item::viewable() to use K2.4 parenthesization
 2009-11-25 13:22:24 -08:00
Chad Kieffer
03b4b27498 Add type attribute to rest of our script tags. 2009-10-30 00:14:57 -06:00
Tim Almdal
7ea13b3869 Normalize capitalization ticket #596 2009-10-28 12:15:52 -07:00
Chad Kieffer
4241e03d75 Breadcrumb updates. Apply g-first and g-active consistently, use ems instead of px for nicer proportions, make font-size the same whether on the page or in a dialog. 2009-10-27 23:03:43 -06:00
Tim Almdal
0a6b540092 Merge branch 'master' into talmdal_dev 
Conflicts:
	modules/server_add/helpers/server_add_theme.php
 2009-10-24 07:28:22 -07:00
Chad Kieffer
e3f90a889d Adjust order of items on server_add admin page. Restore autocomplete to the add form. Created a server_add.css file. 2009-10-23 22:24:06 -06:00
Tim Almdal
3c936d661a Change the name of identity library from Identity to IdentityProvider. Create a helper class called identity to simplify call the Identity Provider. Move the contents of MY_Session.php to the new helper class and remove the MY_Session class 2009-10-22 13:11:03 -07:00
Tim Almdal
1b530e4680 Merge branch 'master' into talmdal_dev 
Conflicts:
	modules/user/views/admin_users.html.php
 2009-10-19 06:27:18 -07:00
Chad Kieffer
5f56cbf997 Wrap all admin views in g-block and g-block content. This provides the means to visually separate the view's title and description from everything else. Primary admin view title should always be h1, and only one h1 per view. Removed some unused admin CSS id's. 2009-10-18 20:22:10 -06:00