stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-08-06 15:10:44 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,677 Commits 4 Branches 0 Tags
46da011bf69bbc4e45757feda8f0d28e91e7fb6a
Commit Graph
6677 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Chad Parry 46da011bf6 Remove a newline I accidentally introduced. 2011-05-04 17:51:00 -06:00
Chad Parry 5c6c71ffcd Merge branch 'master' into tempnam 2011-05-04 17:49:42 -06:00
Chad Parry d2331bf434 Simplified the temp_filename implementation and removed the mocks. 2011-05-04 17:48:25 -06:00
Automatic Build Number Updater 05ecfda36b Automated update of .build_number to 148 for branch master 
Last update: 97400b7815 (2 commits ago)
 2011-05-02 21:38:50 -07:00
Bharat Mediratta 229bfc5c7c Track and redirect core.DownloadItem requests properly. This can 
happen if the G2 was imported with rewrite on, so the g2_url in the
g2_map table has a shortened url, but then rewrite is disabled and the
.htaccess mod_rewrite rules are sending over a &g2_view=core.DownloadItem
request.  Fixes #1728.
 2011-05-02 21:37:04 -07:00
Bharat Mediratta 68370b92f5 Map the G2 album highlight thumbnail derivative id to the G3 album's 
thumbnail.  Fixes #1729.
 2011-05-02 21:36:17 -07:00
Chad Parry 0e844766ba Change the signature of system::tempnam to something more appropriate for Gallery. 2011-04-30 17:45:44 -06:00
Chad Parry 5c9a3b3f39 Create a tempnam substitute that safely creates files with a given extension. 2011-04-30 17:45:44 -06:00
Automatic Build Number Updater 97400b7815 Automated update of .build_number to 147 for branch master 
Last update: c2f20c0c4a (1 commits ago)
 2011-04-30 15:44:54 -07:00
Bharat Mediratta 9e080efff3 Differentiate between invalid, missing and broken G2 configs and 
present the user with feedback in the form.  Fixes #1727.
 2011-04-30 15:44:24 -07:00
Automatic Build Number Updater c2f20c0c4a Automated update of .build_number to 146 for branch master 
Last update: 4060640876 (1 commits ago)
 2011-04-28 11:36:19 -07:00
Chad Kieffer a486ce9f98 Merged pull request #50 from mamouneyya/master. 
As of ckieffer request
 2011-04-28 11:36:10 -07:00
mamouneyya 4ca2c5fbad remove .rtl class from properties as they're now separated in a different file that is being called after screen.css. Also reset the left margin for list elements 2011-04-28 19:46:01 +03:00
Automatic Build Number Updater 4060640876 Automated update of .build_number to 145 for branch master 
Last update: b57dd202db (2 commits ago)
 2011-04-27 19:30:28 -07:00
Tim Almdal 4e20e71d03 Merge branch 'master' of git@github.com:gallery/gallery3 2011-04-27 19:30:00 -07:00
Automatic Build Number Updater 7577d02fe2 Automated update of .build_number to 144 for branch master 
Last update: 192cb124aa (3 commits ago)
 2011-04-26 21:45:28 -07:00
Chad Kieffer 77d5c86699 Merge branch 'master' of github.com:gallery/gallery3 2011-04-26 22:44:50 -06:00
Chad Kieffer 2e6967e8a0 Add right padding to list elements in the new g-text class. 2011-04-26 22:44:21 -06:00
Automatic Build Number Updater b7bc8f4818 Automated update of .build_number to 143 for branch master 
Last update: 192cb124aa (1 commits ago)
 2011-04-26 21:39:14 -07:00
Chad Kieffer 4fa46d6a04 Move wind and admin_wind RTL style definitions out to their own file. Call that file when an RTL language is selected. 2011-04-26 22:38:53 -06:00
Automatic Build Number Updater 192cb124aa Automated update of .build_number to 142 for branch master 
Last update: c6d1d6a6ae (5 commits ago)
 2011-04-26 21:05:12 -07:00
Bharat Mediratta cd166c2070 Merge branch 'master' of github.com:gallery/gallery3 2011-04-26 21:04:56 -07:00
Bharat Mediratta 743e2f88d8 Overhaul the Admin > Content > Comments page. Use a tabbed interface 
for consistency with other parts of the admin UI (ie: G2 import).

The UI is now Ajax driven because that's how jQuery tabs works best in
this case.  This requires a little finagling in JS to get the
paginator links to load properly.  While I'm in there, add a paginator
at the top of the table, make the buttons in the delete tab sane and
smooth scroll back to the top of the tab when switching pages.

Fixes #1702
 2011-04-26 21:02:43 -07:00
Bharat Mediratta 77875e2fab Include jquery.scrollTo.js. Fixes #1720. 2011-04-26 21:01:58 -07:00
Bharat Mediratta 466b24307c Hide the paginator when there are no children. #1721. 2011-04-26 21:01:36 -07:00
Automatic Build Number Updater ebdc97b140 Automated update of .build_number to 141 for branch master 
Last update: c6d1d6a6ae (1 commits ago)
 2011-04-26 09:49:52 -07:00
Bharat Mediratta 5cf38ed816 Stop using Pagination() and instead use $theme->pager() in views. 
Move the pager() function up to Gallery_View and replace
themes/admin_wind/views/pager.html.php (Pagination based) with a
modified version from the wind theme in
themes/admin_wind/views/paginator.html.php.  Fixes #1718.
 2011-04-26 09:48:21 -07:00
Automatic Build Number Updater c6d1d6a6ae Automated update of .build_number to 140 for branch master 
Last update: 10f117238a (10 commits ago)
 2011-04-25 23:27:54 -07:00
Bharat Mediratta 0b37e442ce Merge branch 'master' of github.com:gallery/gallery3 2011-04-25 23:27:25 -07:00
Bharat Mediratta cbd04e1ae0 Move random::string() to be test::random_string() and have it return a 
random string of any length.  Also introduce test::lorem_ipsum() and
use that in places where we want strings of words.  Fixes #1713.
 2011-04-25 23:26:43 -07:00
Automatic Build Number Updater 8665988ff3 Automated update of .build_number to 139 for branch master 
Last update: 10f117238a (8 commits ago)
 2011-04-25 22:16:29 -07:00
Bharat Mediratta 8814d7742d Merge branch 'master' of github.com:gallery/gallery3 2011-04-25 22:15:58 -07:00
Bharat Mediratta 91c83874e5 Fix a bug introduced in 526859d960 where 
we changed the behavior of the slug code and included the file
extension, not just the name.  This broke
Item_Model_Test::move_photo_with_conflicting_target_gets_uniqified_test
so yay for unit tests!  #1668
 2011-04-25 22:15:34 -07:00
Automatic Build Number Updater b2327f97b4 Automated update of .build_number to 138 for branch master 
Last update: 10f117238a (6 commits ago)
 2011-04-25 22:09:12 -07:00
Bharat Mediratta 858e3a15b9 Merge branch 'master' of github.com:gallery/gallery3 2011-04-25 22:08:48 -07:00
Bharat Mediratta 11af2bc93f Update test golden files. 2011-04-25 22:07:56 -07:00
Bharat Mediratta b0285f770e Add appropriate preamble. #1696, #1698 2011-04-25 22:07:47 -07:00
Automatic Build Number Updater 3c63494a2e Automated update of .build_number to 137 for branch master 
Last update: 10f117238a (3 commits ago)
 2011-04-24 23:08:19 -07:00
Bharat Mediratta 27bfa6a338 Merge branch 'master' of github.com:gallery/gallery3 2011-04-24 23:07:47 -07:00
Bharat Mediratta 4e7524664a Show the tabs after the page has loaded to prevent Firefox from rendering the 
unstyled page and then flashing.  Fixes #1705.
 2011-04-24 23:04:50 -07:00
Automatic Build Number Updater 4ad94639a6 Automated update of .build_number to 136 for branch master 
Last update: 10f117238a (1 commits ago)
 2011-04-24 22:59:55 -07:00
Bharat Mediratta 41bc967808 Merge branch 'master' of git://github.com/ckieffer/gallery3 2011-04-24 22:57:24 -07:00
Automatic Build Number Updater 10f117238a Automated update of .build_number to 135 for branch master 
Last update: 15f4657452 (5 commits ago)
 2011-04-24 22:55:59 -07:00
Bharat Mediratta 751b9be674 Merge branch 'master' of github.com:gallery/gallery3 2011-04-24 22:55:31 -07:00
Bharat Mediratta 8533420f5d Look for and return embed.php files in the autocomplete list if we can 
find them.  Fixes #1708.
 2011-04-24 22:55:08 -07:00
Automatic Build Number Updater 84407648fe Automated update of .build_number to 134 for branch master 
Last update: 15f4657452 (3 commits ago)
 2011-04-24 22:52:02 -07:00
Bharat Mediratta 729b62abec Merge branch 'master' of github.com:gallery/gallery3 2011-04-24 22:51:54 -07:00
Bharat Mediratta 953be781dc Refactor the meat of g2_import::import_album() off into a separate 
function so taht we can call it on the root album as well.  Fixes
 2011-04-24 22:51:14 -07:00
Automatic Build Number Updater ded13a931a Automated update of .build_number to 133 for branch master 
Last update: 15f4657452 (1 commits ago)
 2011-04-24 22:46:26 -07:00
Bharat Mediratta 701c1fb12f Ignore the presort when transferring over sort orders. Fixes #1710. 2011-04-24 22:45:45 -07:00