stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-11 01:33:51 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,362 Commits 4 Branches 0 Tags
bdf2a3e7bcfedf452edcbfc78556518b5976dd4e
Commit Graph

7362 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bharat Mediratta
bdf2a3e7bc Merge branch 'master' of github.com:gallery/gallery3 2013-02-23 01:09:58 -05:00
Bharat Mediratta
9d6ed037bb Merge branch 'jquery_190' 2013-02-23 01:09:30 -05:00
Automatic Build Number Updater
258a0cdae8 Automated update of .build_number to 358 for branch master 
Last update: 2a6896e2a5 (1 commits ago)
 2013-02-22 09:38:58 -07:00
Bharat Mediratta
42878556cf Merge pull request #155 from shadlaws/fix_2008 
#2008 - Add warnings if some active modules are obsolete.
 2013-02-20 10:22:26 -08:00
shadlaws
94aadf03da #2008 - Add warnings if some active modules are obsolete. 
- added module::get_obsolete_modules_message function
- put message on admin/dashboard
- put message on admin/modules
- put message on upgrader
- updated unit test golden file xss_data
 2013-02-20 17:30:27 +01:00
Automatic Build Number Updater
2a6896e2a5 Automated update of .build_number to 357 for branch master 
Last update: 12d68b89fe (1 commits ago)
 2013-02-18 17:23:19 -07:00
Bharat Mediratta
1b6bae2e80 Merge pull request #154 from shadlaws/master 
Follow-on to fd0051dab7 for #2006.
 2013-02-18 16:23:07 -08:00
shadlaws
62035bdbe1 Follow-on to fd0051dab7 for #2006. 
- fix unit tests for watermarks, which check for deleted files.
 2013-02-18 23:30:29 +01:00
Automatic Build Number Updater
12d68b89fe Automated update of .build_number to 356 for branch master 
Last update: f12aaf3c34 (1 commits ago)
 2013-02-18 13:35:05 -07:00
Bharat Mediratta
3e3ed1c819 Fix up some tests: 
- unlink copied files because they confused File_Structure_Test
- update golden files
 2013-02-18 15:31:59 -05:00
Automatic Build Number Updater
f12aaf3c34 Automated update of .build_number to 355 for branch master 
Last update: e950d2f4ef (1 commits ago)
 2013-02-18 11:21:13 -07:00
Bharat Mediratta
97f96bcb48 Merge pull request #150 from shadlaws/fix_zend_guard_loader_issues 
#1749, 1754, 1901 - Eliminate incompatibility with Zend Guard Loader.
 2013-02-18 10:20:52 -08:00
shadlaws
ab920ae360 #1749, 1754, 1901 - Eliminate incompatibility with Zend Guard Loader. 
- added MY_Kohana to provide wrapper for auto_load(), which loads dummy class when none found.
- revised Bootstrap to load MY_Kohana.

This is based on the patch described here: http://blog.teatime.com.tw/1/post/403
 2013-02-18 19:12:45 +01:00
Bharat Mediratta
f95159c0b8 Merge branch 'jquery_190' of github.com:gallery/gallery3 into jquery_190 2013-02-18 13:10:45 -05:00
Automatic Build Number Updater
e950d2f4ef Automated update of .build_number to 354 for branch master 
Last update: afa61f9d0d (1 commits ago)
 2013-02-18 11:08:34 -07:00
Bharat Mediratta
788e966226 Merge pull request #149 from shadlaws/fix_2007 
#2007 - Change search box text when only looking in the current album.
 2013-02-18 10:08:03 -08:00
Bharat Mediratta
195210a2ab Merge branch 'master' into jquery_190 2013-02-18 13:07:53 -05:00
Bharat Mediratta
e3eee27c72 Merge pull request #153 from shadlaws/jquery_autocomplete_compat 
Moved autocomplete CSS to gallery.css to ensure it works for all themes (incl. admin_wind)
 2013-02-18 10:00:14 -08:00
Bharat Mediratta
1bc752d785 Merge pull request #152 from shadlaws/jquery_password_strength 
Password strength indicator fixed for new jQuery.  Also cleaned up formatting.
 2013-02-18 09:59:36 -08:00
Bharat Mediratta
cf25a04653 Merge pull request #151 from shadlaws/jquery_context_menus 
Context menus are fixed!
 2013-02-18 09:58:31 -08:00
shadlaws
58c137c981 #2007 - Change search box text when only looking in the current album. 
- search.html.php - updated to use new labels.
- search_link.html.php - updated to use new labels.  Moved code that determines
current album to top, then used it for both the new label and the hidden album
input.  Resulting form code looks more symmetric to search.html.php.
 2013-02-18 18:55:03 +01:00
shadlaws
4bf41377b8 Moved autocomplete CSS to gallery.css to ensure it works for all themes (including admin_wind). 2013-02-18 18:29:31 +01:00
shadlaws
4f779e9083 Password strength indicator fixed for new jQuery. Also cleaned up formatting. 2013-02-18 18:09:29 +01:00
shadlaws
556d0d40eb Context menus are fixed! This should be fully compatible with older themes 
since only gallery.common.js is modified.

Now that I understand the problem and the fix, I'm not sure I can explain why it
*used* to work with older jQuery...
 2013-02-18 16:15:49 +01:00
Automatic Build Number Updater
afa61f9d0d Automated update of .build_number to 353 for branch master 
Last update: 87d20c63af (1 commits ago)
 2013-02-17 16:47:25 -07:00
Bharat Mediratta
9f02011dac Merge pull request #148 from shadlaws/fix_2006 
#2006 - Add system::mark_file_for_delete API to delete files at shutdown.
 2013-02-17 15:46:52 -08:00
shadlaws
fd0051dab7 #2006 - Add system::mark_file_for_delete API to delete files at shutdown. 
- added system::mark_file_for_delete to be called to mark a file
- added system::delete_marked_files to be called at shutdown to delete the list
- amended system::temp_filename to, by default, add the temp name to the list
- updated a few other places in code where this should be used
 2013-02-17 23:19:35 +01:00
Bharat Mediratta
9345dde83e Fix autocomplete for admin_g2_import. 2013-02-17 00:39:30 -05:00
Bharat Mediratta
a000540565 Updated for the new jQuery tabs API. 2013-02-17 00:30:56 -05:00
Bharat Mediratta
d632ef3e50 Fix up autocomplete for admin_server_add - found and fixed some bugs 
in gallery_autocomplete when "multiple" isn't set.  Fixed some
harmless syntax issues that js2-mode helpfully pointed out.
 2013-02-17 00:23:50 -05:00
Bharat Mediratta
cc45e2e33b Merge branch 'master' into jquery_190 2013-02-16 23:53:58 -05:00
Bharat Mediratta
4203ecc0b3 Merge pull request #147 from shadlaws/fix_jquery_dialog_20130216 
Context menu dialog box problem: better, but still not working.
 2013-02-16 11:46:57 -08:00
Automatic Build Number Updater
87d20c63af Automated update of .build_number to 352 for branch master 
Last update: eb5b99abb4 (1 commits ago)
 2013-02-16 12:42:07 -07:00
Bharat Mediratta
971b56ae09 Merge pull request #145 from shadlaws/revert_zend_guard_check 
#1749, 1754, 1901 - revert two recent commits that check for Zend Guard code obfuscation.
 2013-02-16 11:41:36 -08:00
shadlaws
a8b571cc97 Context menu dialog box problem: better, but still not working. 
- removed fake attr settings (possible compatibility issue with newer jQuery)
- replaced with extra class
- fixed formatting
- still doesn't work: addClass works, but hasClass always returns false when function runs again
 2013-02-16 12:12:16 +01:00
shadlaws
b0180288e0 #1749, 1754, 1901 - revert two recent commits that check for Zend Guard obfuscation level support. 
This is not the root of the problem for all installs, and can trigger false positives
that break previously-working installs... we'll have to find a better way.
 2013-02-16 08:23:36 +01:00
Automatic Build Number Updater
eb5b99abb4 Automated update of .build_number to 351 for branch master 
Last update: 9346503c62 (1 commits ago)
 2013-02-15 17:17:51 -07:00
Bharat Mediratta
96ad7789c8 Follow-on to 7bdccade98 to exclude 
directories for now.
 2013-02-15 19:17:34 -05:00
Automatic Build Number Updater
9346503c62 Automated update of .build_number to 350 for branch master 
Last update: c97fe4bcdd (1 commits ago)
 2013-02-15 17:12:30 -07:00
Bharat Mediratta
0dd12caa6f Follow-on to 7bdccade98 - point out that there's 
duplicated code in gallery_event.
 2013-02-15 19:12:08 -05:00
Automatic Build Number Updater
c97fe4bcdd Automated update of .build_number to 349 for branch master 
Last update: 5b6c138da1 (4 commits ago)
 2013-02-15 17:10:08 -07:00
Bharat Mediratta
346c578f30 Merge branch 'master' of github.com:gallery/gallery3 2013-02-15 19:09:17 -05:00
Bharat Mediratta
7bdccade98 Every 500th request prune a single old file from var/tmp and var/logs. 
Might not be aggressive enough.  Fixes #2005.
 2013-02-15 19:09:06 -05:00
Bharat Mediratta
4523a3a49a Merge pull request #144 from shadlaws/jquery_dialogs 
Jquery dialogs
 2013-02-15 13:08:17 -08:00
shadlaws
7c5d9db61c Fixed formatting in gallery.dialog.js (no functional changes). 2013-02-15 19:32:01 +01:00
shadlaws
4dd7b708b2 Dialog sizing, titles, and z-index. This should ensure the small <500px dialogs 
are correct, all titles are correctly sized, and the dialog boxes go to
the top for older themes, too.
 2013-02-15 19:31:20 +01:00
Automatic Build Number Updater
016335fb89 Automated update of .build_number to 348 for branch master 
Last update: 5b6c138da1 (2 commits ago)
 2013-02-15 11:24:48 -07:00
Bharat Mediratta
1748aae9d1 Create an empty and secure gallery3/bin directory for use with the new 
system::find_binary code.  Fixes #2004.
 2013-02-15 13:23:39 -05:00
Bharat Mediratta
8b0088fd8d Change gallery/bin -> gallery3/bin in the comment since I suspect most 
people don't change the name of the directory.  Follow-on to
1d7f5e3ab1 for #1935
 2013-02-15 13:23:05 -05:00
Bharat Mediratta
96a01c86d9 Merge branch 'master' into jquery_190 2013-02-15 13:00:26 -05:00