Commit Graph

6370 Commits

Author SHA1 Message Date
Automatic Build Number Updater
412f8f73e3 Automated update of .build_number to 57 for branch master
Last update: 2999d38beb (1 commits ago)
2011-01-17 22:38:48 -07:00
Bharat Mediratta
56e6cb998f Change the [x] close box to "(remind me later)". #1605. 2011-01-17 21:37:51 -08:00
Automatic Build Number Updater
2999d38beb Automated update of .build_number to 56 for branch master
Last update: f985adad58 (4 commits ago)
2011-01-17 22:19:03 -07:00
Bharat Mediratta
83bf1d767b Fix typo: upgrade_check -> upgrade_checker
#1605.
2011-01-17 21:18:24 -08:00
Bharat Mediratta
897bf96918 Merge branch 'master' of github.com:gallery/gallery3 2011-01-17 21:16:57 -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
Automatic Build Number Updater
0dfd7eb614 Automated update of .build_number to 55 for branch master
Last update: f985adad58 (1 commits ago)
2011-01-17 21:07:57 -07:00
Bharat Mediratta
df703fbd5c Update installer for #1612 and #1605. 2011-01-17 20:06:54 -08:00
Automatic Build Number Updater
f985adad58 Automated update of .build_number to 54 for branch master
Last update: 2b190c0559 (1 commits ago)
2011-01-17 21:04:41 -07: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
Automatic Build Number Updater
2b190c0559 Automated update of .build_number to 53 for branch master
Last update: 548627a9fd (0 commits ago)
2011-01-17 20:22:37 -07:00
Automatic Build Number Updater
548627a9fd Revert "Automated update of .build_number to 53 for branch master"
the automated script got it wrong.

This reverts commit d5e7e1d521.
2011-01-17 19:17:36 -08:00
Automatic Build Number Updater
d5e7e1d521 Automated update of .build_number to 53 for branch master
Last update: 29be21bb0d (2 commits ago)
2011-01-17 19:05:33 -07:00
Bharat Mediratta
c46d5f3da9 Rename BUILD_NUMBER->.build_number 2011-01-17 17:35:57 -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
Automatic Build Number Updater
c1c67ecf8d Updating BUILD_NUMBER to 52 for branch master
Last update: e22c2e64ba (10 commits ago)
2011-01-17 18:12:15 -07:00
Bharat Mediratta
29efbea12a Merge branch 'master' of github.com:gallery/gallery3 2011-01-17 17:08:15 -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
Automatic Build Number Updater
33c21406eb Updating BUILD_NUMBER to 51 for branch master
Last update: e22c2e64ba (8 commits ago)
2011-01-17 14:22:20 -07:00
Bharat Mediratta
fdb1127d7c Cosmetic improvements to the README 2011-01-17 12:51:36 -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
4f5aed5b55 Merge branch 'master' of github.com:gallery/gallery3 2011-01-16 17:03:47 -08:00
Bharat Mediratta
6849581448 Specify that we don't want the BUILD_NUMBER changes that happen in other branches
by using a custom merge-keep-ours merge algorithm.
2011-01-16 17:01:03 -08:00
Bharat Mediratta
e22c2e64ba Arbitrarily set the build number for master to 50 2011-01-16 17:00:09 -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
3e04535039 Merge branch 'Ticket#1610' of git://github.com/Joe7/gallery3 2011-01-16 14:16:26 -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
Joe7
375e3b1fa4 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-15 21:57:14 +01: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
e4a43c99e4 Mirror .htaccess PHP settings into php.ini for hosts that have
per-dir php.ini support configured, but don't use .htaccess.
Fixes #1603.
2011-01-11 21:41:20 -08:00
Bharat Mediratta
7eabf6c1c2 Use Math.round() instead of Number() to convert floating point numbers
to integer.  Fixes overflow probelm that causes #1490.  Thanks to
nkinkade for the fix.
2011-01-11 21:21:59 -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
Bharat Mediratta
252aba9eae Merge branch 'fix-viewable2_master' of git://github.com/BigMadWolf/gallery3 2011-01-11 15:17:05 -08:00