stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-05-20 11:29:24 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,867 Commits 4 Branches 0 Tags
10b4eda6f0cbb44fde9fb3158bd174c82467f2ee
Commit Graph

1358 Commits

Author SHA1 Message Date
Tim Almdal
10b4eda6f0 Merge branch 'master' of git@github.com:gallery/gallery3 
Conflicts:
	modules/gallery/libraries/Theme_View.php
	themes/admin_default/views/admin.html.php
 2009-06-29 06:44:05 -07:00
Tim Almdal
42c82ef7f0 Temporary checkin to allow merge with trunk... don't integrate 2009-06-29 06:08:50 -07:00
Bharat Mediratta
6e8a8c53e6 Rename $theme->url() to $theme->theme_url() for consistency wiht 
$theme->theme_script().
 2009-06-28 19:49:48 -07:00
Bharat Mediratta
c4f991bb7d Clean up the combined javascript change and refactor out the 
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-28 19:45:11 -07:00
Bharat Mediratta
24f0c4bd19 Undo my last change; it's not the right fix for the problem. 2009-06-28 18:10:42 -07:00
Bharat Mediratta
b235fd6e5f Pass the item into the block. 2009-06-28 18:00:00 -07:00
Bharat Mediratta
5b2c08d797 Set the gallery module version to 6 in install() (missed this in my last change). 
Refresh the install.sql.
 2009-06-28 17:37:14 -07:00
Bharat Mediratta
df37b5ce70 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-28 17:09:45 -07:00
Bharat Mediratta
9bdc84733d use jquery.scrollTo to scroll the active upload into view. 2009-06-28 17:07:41 -07:00
Tim Almdal
d90e30c378 Rename the combined javascript controller from javascript/combined to combined/javascript. 2009-06-28 17:07:12 -07:00
Chad Kieffer
bf79d4372c Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-28 17:57:23 -06:00
Chad Kieffer
2b804ebdce Convert info module's block to use a list instead of a table. Addresses request in ticket #441. 2009-06-28 17:53:20 -06:00
Tim Almdal
ce6d453b3f Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-28 16:51:57 -07:00
Tim Almdal
5e83ebd6d0 Use $theme->script() method to render module javascript files 2009-06-28 16:50:55 -07:00
Bharat Mediratta
fcc57a4182 Modify the cache table to make id the primary key for consistency with 
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-28 16:48:29 -07:00
Bharat Mediratta
aa31e1f009 Tweak the cache implementation 
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-28 16:24:51 -07:00
Tim Almdal
bf26ca727e Change the combined javascript to use the new caching functionality and respect the HTTP_IF_MODIFIED_SINCE header request. 2009-06-28 15:30:13 -07:00
Tim Almdal
7a3310e91b Change the cache column of the caches table to a large blob. This fixes 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-28 13:14:47 -07:00
Tim Almdal
1c44537097 Clean up code (i.e. preamble, tabs) from the caching implementation so the unit tests pass 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-06-28 22:52:35 +08:00
Tim Almdal
a0c07d4b54 Clean up code (i.e. preamble, tabs) from the caching implementation so the unit tests pass 2009-06-28 07:49:35 -07:00
Tim Almdal
067e9f8ef7 The rest of the caching driver implementation that i somehow forgot. 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-06-28 14:37:50 +08:00
Tim Almdal
aa6bc97c7c Update the version number and upgrade method for gallery to reflect the addition of the cache table. 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-06-28 14:37:49 +08:00
Tim Almdal
5bfdd6e328 Implemented a Database driver for the Kohana Cache library. Rather then 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-28 14:37:47 +08:00
Tim Almdal
2d38370ec4 The rest of the caching driver implementation that i somehow forgot. 2009-06-27 23:34:07 -07:00
Tim Almdal
3000c78998 Update the version number and upgrade method for gallery to reflect the addition of the cache table. 2009-06-27 23:30:02 -07:00
Tim Almdal
52ecdcdff2 Implemented a Database driver for the Kohana Cache library. Rather then 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-27 23:24:23 -07:00
Tim Almdal
4707a97b82 Merge branch 'master' of git@github.com:gallery/gallery3 2009-06-27 16:57:38 -07:00
Bharat Mediratta
76f688a070 Clean up poor english. Use the latest recaptcha info from their website. Fixes ticket #470. 2009-06-27 16:41:05 -07:00
Bharat Mediratta
aad0dd357f Create a new thumb_menu() and convert Digibug over to use it. 
1) Eliminate digibug_album.html

2) Get rid of the $(document).ready() in digibug.js and rename popUp() to
   digibug_popup() then just make direct calls to digibug_popup() in the
   menu urls.
 2009-06-27 16:29:09 -07:00
Bharat Mediratta
2fbc03437a Digibug simplification cleanup. Upgrade digibug module to version 2. 
1) Simplify the admin settings page to what most of our users
   want. Eliminate basic_ and default_ ids.  We just have company_id
   and default_id.  Advanced users can use advanced settings for now.

2) Fix security in print_photos (didn't get it right in my last commit)

3) Use the regular thumb and full urls if the images are publicly
   available to reduce load on the proxy.

4) Simplify proxy expiration code.

5) Eliminate all specialized styles from the admin theme.
 2009-06-27 15:55:47 -07:00
Bharat Mediratta
f98b7dc631 Require view_full to print photos. 2009-06-27 14:43:40 -07:00
Bharat Mediratta
6a8dc91f9f Remove empty upgrade(). 2009-06-27 14:35:53 -07:00
Bharat Mediratta
3ab6f2ed4b Remove unnecessary curly braces. 2009-06-27 14:35:16 -07:00
Bharat Mediratta
e78f91c91a Fix XSS vulnerability, get rid of unnecessary curly braces. 2009-06-27 14:29:58 -07:00
Bharat Mediratta
bbba0a67c2 Fix formatting. 2009-06-27 14:29:24 -07:00
Tim Almdal
11f08ee439 Implement the combined javascript controller. 2009-06-26 21:42:02 -07:00
Tim Almdal
4cec020163 Create a theme_view function script which allows modules in the head or admin_head functions to specify javascript files that are required for this page. 
In this commit, these script files are expressed at the end of the head or admin_head calls and appended to the beginning of the block stack.  In a future commit these will be combined and gzipped for download.
 2009-06-26 14:37:15 -07:00
Tim Almdal
84e98e830c Move the inclusion of photo and movie specific javascript into gallery_theme 2009-06-26 08:25:24 -07:00
Tim Almdal
f3e45d49a3 Change the movie controller to set the page type to "movie". Ticket #467 
Signed-off-by: Tim Almdal <tnalmdal@shaw.ca>
 2009-06-26 23:19:42 +08:00
Tim Almdal
f4778699fc Change the movie controller to set the page type to "movie". Ticket #467 2009-06-26 08:19:06 -07:00
Tim Almdal
42a5bd20a5 1) Move the generation of script tags to gallery_theme::head and gallery_theme::admin_head. This allows us to potentially manage the scripts like we do in g2 (single file and compressed) 
2) Change Theme_View::_call to always call the gallery_theme::$function first.
 2009-06-26 07:51:29 -07:00
Tim Almdal
eee8dbe511 No longer need to set the digibug mode in the installer. 2009-06-25 21:53:47 -07:00
Tim Almdal
3b873a98d7 Oops changed my mind... when setting to the default just set the value 
to null and let the cpmapny and event ids be set in the print_photo controller.
 2009-06-25 21:50:37 -07:00
Tim Almdal
e2e1aa0683 1) Rename the basic_company_id and basic_event_id to default_*_id 
2) Removed the tabs on the digibug admin page word count is now at 35.
3) Added a default link which resets the event and company id's to gallery's ids
 2009-06-25 21:41:54 -07:00
Tim Almdal
1552f0fff7 Add XSS clean up on the title that is sent to digibug as part of the print 
request
 2009-06-25 21:41:09 -07:00
Tim Almdal
5d4d87e957 Remove the digibug maintenance task. Expired imges will be removed when the 
print_proxy is run.
 2009-06-25 19:58:14 -07:00
Tim Almdal
93e4f14c85 1) Fix potential XSS in digibug_album.html.php 
2) Fix case of text
 2009-06-25 19:04:45 -07:00
Tim Almdal
28f496924f Fix indentation in digibug_form.html.php 2009-06-25 18:38:43 -07:00
Tim Almdal
4d191b5e92 Refactor the digibug installer to the new structure of install and upgrade methods 2009-06-25 18:35:02 -07:00
Tim Almdal
4502a13a5b 1) rename the model proxy to digibug proxy 
2) corresponding table name change to digibug_proxies
3) change the generate of a unique id to md5(rand())
3) Remove the helper function as digibug::uuid is no longer required.
 2009-06-25 08:47:16 -07:00