summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-06-29Merge branch 'master' of git@github.com:gallery/gallery3Bharat Mediratta
2009-06-29Don't repeat the default locale in the installed locales list.Andy Staudacher
2009-06-29Fix permissions for files to remove executable bit.Bharat Mediratta
2009-06-29Fix some bugs in the combined JS/CSS code (most of which I introducedBharat Mediratta
in my last refactor): 1) Actually combine the JS (I was only combining the CSS) 2) Add line breaks between the files and comment them so that we can find a specific file inside the blob. 3) Add an HTML comment to help developers figure out why they can't find their CSS/JS.
2009-06-29Add a media type using the most common media type from our CSS. ThisBharat Mediratta
doesn't fix the problem that we need to support multiple media types (the original code had superfish using just "screen", and some other deviations). There's no code yet to support multiple media types, but it would not be too difficult to create buckets based on media.
2009-06-29Refactor combine_xxx() functions together into combine_files() and useBharat Mediratta
html functions to generate the resulting elements. Add phpdoc.
2009-06-29Refactor combined controller a bitBharat Mediratta
1) Create public javascript() and css() functions and turn __call() into a private function to protect us against having some random type show up in there. Otherwise anything you put in the 2nd argument gets emitted in the header which is a security hole. 2) Fix a bug ("$key = $key[0]") which was breaking functionality. Eliminate the hex check, it's not really necessary in the majority case and doesn't hurt us in edge cases. 3) Convert some empty() calls to !, no need for a function call there. 4) Add phpDoc.
2009-06-29Combine the Combined::javascript and Combined::css into a single method ↵Tim Almdal
implemented by the magic method __call. The first parameter is the content type for text/xxxx and the 2nd parameter is the key of the combined file.
2009-06-29Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2009-06-29admin dashboard blocks can now be moved from left to right sidebarjhilden
fix for bug report #92 removed containment parameter for the jQuery sortable plugin seems to work in Firefox, Chrome and IE 8
2009-06-29Merge branch 'master' of git@github.com:gallery/gallery3jhilden
2009-06-29added textual description of upload progressjhilden
moved the cancel link to above the upload queue (where the textual upload progress also is)
2009-06-29A Combined javascript seems to work.Tim Almdal
1) CSS files are added to the combined version by use of $theme->css() or $theme->css_theme() methods 2) url references in the css are converted to full paths as opposed to relative 3) @import statements in the css are resolved as well. 4) need to move the [if IE] statements into the css files so the will be honored in the browser. currently the ie fix css are always included.
2009-06-29Merge branch 'master' of git@github.com:gallery/gallery3Bharat Mediratta
2009-06-29Remove unused $theme_relative arg from theme_script().Bharat Mediratta
2009-06-29*Note* work in progress.Tim Almdal
Implement the combined css functionality. Local url references and replace with absolute urls instead of relative.
2009-06-29Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
Conflicts: modules/gallery/libraries/Theme_View.php themes/admin_default/views/admin.html.php
2009-06-29Temporary checkin to allow merge with trunk... don't integrateTim Almdal
2009-06-28Rename $theme->url() to $theme->theme_url() for consistency wihtBharat Mediratta
$theme->theme_script().
2009-06-28Clean up the combined javascript change and refactor out theBharat Mediratta
Gallery_View base class from Theme_View and Admin_View. 1) Move all the theme specific jquery stuff from gallery_theme::head() and admin_head() into the theme files. Use $theme->script() as appropriate. 2) Get rid of the extra boolean on $theme->url() that we were using so that we could call $theme->script($theme->url(...)) -- add $theme->theme_script() instead (poorly named, but still clearer than what we had before) 3) Fix the bug that combined scripts didn't work at all in the admin theme. 4) Get rid of $theme->display() in favor of new View(...)
2009-06-28Use Number() instead of toFixed().. FF 3.x doesn't seem to like toFixed() on ↵Bharat Mediratta
native types.
2009-06-28Get rid of references to vestigial check.html.php page.Bharat Mediratta
2009-06-28Move the mysql_xxx() override function definitions insideBharat Mediratta
installer::connect(), otherwise they're defined before we call check_environment, then we think we have mysql_query when we really don't.
2009-06-28Undo my last change; it's not the right fix for the problem.Bharat Mediratta
2009-06-28Pass the item into the block.Bharat Mediratta
2009-06-28Set the gallery module version to 6 in install() (missed this in my last ↵Bharat Mediratta
change). Refresh the install.sql.
2009-06-28Merge branch 'master' of git@github.com:gallery/gallery3Bharat Mediratta
2009-06-28use jquery.scrollTo to scroll the active upload into view.Bharat Mediratta
2009-06-28Rename the combined javascript controller from javascript/combined to ↵Tim Almdal
combined/javascript.
2009-06-28Merge branch 'master' of git@github.com:gallery/gallery3Chad Kieffer
2009-06-28Convert info module's block to use a list instead of a table. Addresses ↵Chad Kieffer
request in ticket #441.
2009-06-28Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2009-06-28Use $theme->script() method to render module javascript filesTim Almdal
2009-06-28Modify the cache table to make id the primary key for consistency withBharat Mediratta
other gallery 3 tables. Update the driver to match, add more upgrader code, update the installer block and change the gallery module version to 6.
2009-06-28Tweak the cache implementationBharat Mediratta
1) Drop the *_modified key, we don't really need it. The modification date is not relevant to our browser caching strategy. 2) Fix multiple issues with the Expires header and just hardcode it to the biggest possibly value for code clarity. 3) print the $content out directly instead of using fwrite 4) Minor cleanups in the installer.
2009-06-28Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2009-06-28Change the combined javascript to use the new caching functionality and ↵Tim Almdal
respect the HTTP_IF_MODIFIED_SINCE header request.
2009-06-29Change the cache column of the caches table to a large blob. This fixes ↵Tim Almdal
ticket #485 and gives us the extra adavantage of not having to serialize the data (as the database driver handles that for us) Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-28Change the cache column of the caches table to a large blob. This fixes ↵Tim Almdal
ticket #485 and gives us the extra adavantage of not having to serialize the data (as the database driver handles that for us)
2009-06-28Clean up code (i.e. preamble, tabs) from the caching implementation so the ↵Tim Almdal
unit tests pass Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-28Clean up code (i.e. preamble, tabs) from the caching implementation so the ↵Tim Almdal
unit tests pass
2009-06-27Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2009-06-28The rest of the caching driver implementation that i somehow forgot.Tim Almdal
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-28Update the version number and upgrade method for gallery to reflect the ↵Tim Almdal
addition of the cache table. Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-28Implemented a Database driver for the Kohana Cache library. Rather then ↵Tim Almdal
writing our own caching algorithm, we can leverage the Kohana library. This has the added advantage of allowing the administrator to replace the default caching with a 3rd party caching algorithm. Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
2009-06-27The rest of the caching driver implementation that i somehow forgot.Tim Almdal
2009-06-27Update the version number and upgrade method for gallery to reflect the ↵Tim Almdal
addition of the cache table.
2009-06-27Merge branch 'master' of git@github.com:gallery/gallery3Tim Almdal
2009-06-27Implemented a Database driver for the Kohana Cache library. Rather then ↵Tim Almdal
writing our own caching algorithm, we can leverage the Kohana library. This has the added advantage of allowing the administrator to replace the default caching with a 3rd party caching algorithm.
2009-06-27Try to disable the parts of mod_security that interfere with the Flash uploaderBharat Mediratta