Commit Graph
4215 Commits
Author SHA1 Message Date
Bharat Mediratta fa6f233603 Centralize our encoding code into a new helpers and use
mb_convert_encoding if possible.  Build on the work in
c791ae96d5 by momo-i.  Fixes #1660.
2011-03-27 11:31:34 -07:00
Bharat Mediratta 65825c572a Merge branch 'master' of github.com:gallery/gallery3 2011-03-27 11:25:27 -07:00
Bharat Mediratta 06d1a5221c Merge branch 'master' of git://github.com/ckieffer/gallery3 2011-03-27 11:20:10 -07:00
Bharat Mediratta 3fd7debd2f Fix a bug where the placeholder %hide-url didn't match the variable in the assoc. array. Follow on for #1624 2011-03-15 00:53:35 -07:00
Bharat Mediratta 451ef39d58 PATH_INFO mangles apostrophe (and other symbols, I'm sure) into a
question mark, so any tags containing an apostrophe won't display
their contents.

Take the simple fix here and change the tag urls to also contain the
tag id, which avoids having to add a slug for the tag and all kinds of
validation code.

Fixes #1636.
2011-03-05 16:51:20 -08:00
Bharat Mediratta c38d4695a0 Add missing phpDoc for the extra Item_Model argument to graphics calls
and make the param optional.  #1646.
2011-03-05 15:46:04 -08:00
Bharat Mediratta 5ff6409a08 Merge branch 'master' of git://github.com/colings/gallery3 2011-03-05 15:31:16 -08:00
Chad Kieffer e90493aab3 Translate user Web Site label. Link web site on user profile page. 2011-03-02 21:11:49 -07:00
colings ca47b887f5 Added extra arg to gallery_graphics calls and updated users 2011-02-23 20:31:07 -06:00
colings 68edb2454d Added 'item' to parameters passed to graphics rules 2011-02-21 15:40:58 -06:00
colings d759d47ef9 Merge remote branch 'upstream/master' 2011-02-13 10:46:43 -06:00
momo-i c791ae96d5 fixed tag broken 2011-02-01 07:32:44 +09:00
Bharat Mediratta 8437a85ac8 AUTO_CHECK_INTERVAL --> upgrade_checker::AUTO_CHECK_INTERVAL
Fixes #1624
2011-01-29 08:37:12 -08:00
Bharat Mediratta bc49680938 Update XSS golden file 2011-01-21 23:09:27 -08: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 08c41f2976 Add "html_attributes" theme callback to allow modules to inject attributes into
the <html> element, including things like namespaces.   Fixes #1615.
2011-01-21 00:07:00 -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 b78fd8eeff Create a hidden anchor containing the tag cloud autocomplete url. This way validates. Fix for #1577. 2011-01-18 21:25:58 -08:00
Bharat Mediratta c060179916 Revert "Temporarily removed ref tag to get the page validated. (Was also pointing at a rather semi-finished looking page)"
This was breaking the tag autocomplete code, which depends on this value.

This reverts commit 5e8d92552b.
2011-01-18 21:22:24 -08:00
Bharat Mediratta f657a05d7e Get rid of the "organize needs rest" message when upgrading to the
new organize; it may be hanging around from a prior version.  Reinstate
the installer for this.  Bump organize module to v4.  Follow-on for #1584.
2011-01-18 10:08:38 -08:00
Bharat Mediratta 56e6cb998f Change the [x] close box to "(remind me later)". #1605. 2011-01-17 21:37:51 -08:00
Bharat Mediratta 83bf1d767b Fix typo: upgrade_check -> upgrade_checker
#1605.
2011-01-17 21:18:24 -08:00
Bharat Mediratta 20ae106c22 Display a message in the "Check for Gallery upgrades" block when
there's a newer version available, even if the user has dismissed the
site status message.  #1605.
2011-01-17 21:16:43 -08:00
Bharat Mediratta 45caba09f8 Move the code that clears the upgrade_check site status message to the
upgrader so that it's cleared any time we run an upgrade.  Part of
2011-01-17 20:03:11 -08:00
Bharat Mediratta 76411d7d6d Rename BUILD_NUMBER to .build_number so it's not so loud. 2011-01-17 17:34:19 -08:00
Bharat Mediratta 29be21bb0d Add BUILD_NUMBER to the security check in .htaccess
Change BUILD_NUMBER to be .ini format and add a big "do not edit" comment.
2011-01-17 17:27:16 -08:00
Bharat Mediratta 14ae5d8544 Update version checking code to expect "branch_" as the prefix for
all branch related lines.  For #1605.
2011-01-17 17:07:32 -08:00
Bharat Mediratta 66bb496b6c If the logged in user is an admin and it's been more than 7 days since
the last check and auto upgrade checking is enabled, fire off an XHR
to check for a possible upgrade.  Finishes off #1605.
2011-01-16 23:14:57 -08:00
Bharat Mediratta 167f635a6c Add arguments to random::int() to match mt_rand(). Follow on to cd48b89f31
for #1527.
2011-01-16 23:06:19 -08:00
Bharat Mediratta 70abfb2a20 Upgrade checking code is now here, along with a bump of the Gallery
module to v46.  There's a new block in the admin dashboard which
controls whether automatic checking happens, and lets you check
immediately.  If a newer version is detected, a site status message
appears for admins providing upgrade instructions.

Automatic checking is not yet implemented (even though the UI claims
that it exists).  This is all for #1605.
2011-01-16 22:16:09 -08:00
Bharat Mediratta 84d576606d Change the value column of the messages table from a varchar(255) to a
text.  Fixes #1612.
2011-01-16 21:46:03 -08:00
Bharat Mediratta b78b109018 Fix indentation. 2011-01-16 17:10:30 -08:00
Bharat Mediratta ac44e9c930 First step in setting up version checking.
We now have two types of packages (release, git).  Instead of using
constants, we now have gallery::version_string() which returns the
current version string.  If you're on a release package, then the
version string looks like:

  3.0 (Santa Fe)

If you're on a git package, then the version string looks like this:

  3.0.1 (branch 3.0.x build 3)

We track the build number in a new file in the gallery3 root called
BUILD_NUMBER which we will update periodically with the latest
build number for each branch.
2011-01-16 16:58:58 -08:00
Joe7 0020f87d6a Fixed paging for albums ordered by random.
MySql has problems when comparing float values against -seemingly same- float input, see http://dev.mysql.com/doc/refman/5.0/en/problems-with-float.html for details.
Fixes #1610
2011-01-16 16:58:58 -08:00
Bharat Mediratta 44da46abd4 Golden file updates for xss and controller authentication. 2011-01-15 15:11:37 -08:00
Bharat Mediratta 8583c1d259 Style fixes. 2011-01-15 15:10:27 -08:00
Bharat Mediratta f0dd16efc4 Revive the code from Cache_Driver::exists and put it into a helper
function in the test so that we can keep our tests functioning.
Follow on to 66fd8c7518 for #1559.
2011-01-15 14:59:25 -08:00
Bharat Mediratta 02f30b91bf Follow on to 966dee8628 for #1586 --
don't try to update the tag item count if we didn't change any items
with this change (ie: a tag rename).  In that case, we haven't loaded
the related items so we don't have any idea what the count is going to
be.
2011-01-15 14:20:26 -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 38b7493287 whitespace fix. 2011-01-15 13:07:14 -08:00
Bharat Mediratta 376f09c4e1 Reorganize the url() function out from in the middle of the script/css combining functions. 2011-01-15 12:47:15 -08:00
Bharat Mediratta d511fc77ad Tweake Joe's change to admin_users to revert the code that joins against the items
table; it's not clear that this is going to be efficient for large data sets.
2011-01-15 12:33:51 -08:00
Bharat Mediratta a7d4f87bde Merge branch 'Ticket#1557' of git://github.com/Joe7/gallery3 2011-01-15 11:31:43 -08:00
Bharat Mediratta 09d34696a1 Update comments to annotate what data is where during the process.
Follow-on for #1518.
2011-01-11 17:54:33 -08:00
Bharat Mediratta e3df9c1611 Merge branch 'Ticket#1518' of git://github.com/Joe7/gallery3 2011-01-11 17:53:16 -08:00
Bharat Mediratta ee53744aa7 Two improvements to Joe's fix for #1504:
1) Trap all exceptions, eg dns or connectivity issues and
   report back in the form (but put the stack trace in the logs)
2) Rename "noconn" to "no_connection"
2011-01-11 16:59:57 -08:00
Bharat Mediratta f80b5959f1 Merge branch 'Ticket#1504' of git://github.com/Joe7/gallery3 2011-01-11 15:38:03 -08:00
Bharat Mediratta 92db7f4218 Update some comments. 2011-01-11 15:24:40 -08:00